[vlc-commits] On the road to 2.1.6

2014-08-02 Thread Jean-Baptiste Kempf 
vlc/vlc-2.1 | branch: master | Jean-Baptiste Kempf  | Sat 
Aug  2 22:40:08 2014 +0200| [154eecbc3b5bd0e3fcba520309382190051487a6] | 
committer: Jean-Baptiste Kempf

On the road to 2.1.6

Prepare one, just in case

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

 NEWS |3 +++
 configure.ac |4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 91085d2..14c3b77 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+Changes between 2.1.5 and 2.1.6:
+
+
 Changes between 2.1.4 and 2.1.5:
 
 
diff --git a/configure.ac b/configure.ac
index 2407d3b..35b50a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,10 +2,10 @@ dnl Autoconf settings for vlc
 
 AC_COPYRIGHT([Copyright 2002-2014 VLC authors and VideoLAN])
 
-AC_INIT(vlc, 2.1.5)
+AC_INIT(vlc, 2.1.6)
 VERSION_MAJOR=2
 VERSION_MINOR=1
-VERSION_REVISION=5
+VERSION_REVISION=6
 VERSION_EXTRA=0
 VERSION_DEV=
 

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

[vlc-commits] macosx: use input changed event to update bookmarks dialog

2014-08-02 Thread David Fuhrmann 
vlc/vlc-2.2 | branch: master | David Fuhrmann  | Wed 
Jul 30 12:14:51 2014 +0200| [c5ec1dcdda7e9bd171843a00f9af648715bc3162] | 
committer: Jean-Baptiste Kempf

macosx: use input changed event to update bookmarks dialog

This allows lazy loading of the bookmarks window.

(cherry picked from commit ee503a8ffe8acadaef0f9a3dbe28196778cc1aa7)
Signed-off-by: Jean-Baptiste Kempf 

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

 modules/gui/macosx/bookmarks.h |1 -
 modules/gui/macosx/bookmarks.m |9 -
 modules/gui/macosx/intf.m  |1 -
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/modules/gui/macosx/bookmarks.h b/modules/gui/macosx/bookmarks.h
index dedba7e..809c112 100644
--- a/modules/gui/macosx/bookmarks.h
+++ b/modules/gui/macosx/bookmarks.h
@@ -64,6 +64,5 @@
 - (IBAction)edit_ok:(id)sender;
 
 - (void)showBookmarks;
-- (void)refresh;
 - (id)dataTable;
 @end
diff --git a/modules/gui/macosx/bookmarks.m b/modules/gui/macosx/bookmarks.m
index adb1b6a..0115db1 100644
--- a/modules/gui/macosx/bookmarks.m
+++ b/modules/gui/macosx/bookmarks.m
@@ -71,6 +71,11 @@ static VLCBookmarks *_o_sharedInstance = nil;
 [o_bookmarks_window setCollectionBehavior: 
NSWindowCollectionBehaviorFullScreenAuxiliary];
 
 [self initStrings];
+
+[[NSNotificationCenter defaultCenter] addObserver:self
+ 
selector:@selector(inputChangedEvent:)
+ 
name:VLCInputChangedNotification
+   object:nil];
 }
 
 - (void)dealloc
@@ -78,6 +83,8 @@ static VLCBookmarks *_o_sharedInstance = nil;
 if (p_old_input)
 vlc_object_release(p_old_input);
 
+[[NSNotificationCenter defaultCenter] removeObserver:self];
+
 [super dealloc];
 }
 
@@ -121,7 +128,7 @@ static VLCBookmarks *_o_sharedInstance = nil;
 [o_bookmarks_window makeKeyAndOrderFront:nil];
 }
 
-- (void)refresh
+-(void)inputChangedEvent:(NSNotification *)o_notification
 {
 [o_tbl_dataTable reloadData];
 }
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index d35be88..a931573 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -1303,7 +1303,6 @@ static bool f_appExit = false;
 [o_mainwindow updateWindow];
 [self updateDelays];
 [self updateMainMenu];
-[[self bookmarks] refresh];
 [self playlistUpdated];
 
 /*

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

[vlc-commits] macosx: video effects: increase crop stepper max value

2014-08-02 Thread David Fuhrmann 
vlc/vlc-2.2 | branch: master | David Fuhrmann  | Wed 
Jul 30 10:37:26 2014 +0200| [7cd8acc91665e4f3a40e61096dfca19c27a17b11] | 
committer: Jean-Baptiste Kempf

macosx: video effects: increase crop stepper max value

(cherry picked from commit 1f06d03e05b5eb9251d71d4590511adfbc182171)
Signed-off-by: Jean-Baptiste Kempf 

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

 .../Resources/English.lproj/VideoEffects.xib   |   71 
 1 file changed, 58 insertions(+), 13 deletions(-)

Diff:   
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=7cd8acc91665e4f3a40e61096dfca19c27a17b11
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] macosx: add retina graphics for native fullscreen button in dark mode

2014-08-02 Thread Damien Erambert 
vlc/vlc-2.2 | branch: master | Damien Erambert  | Tue 
Jul 29 21:08:13 2014 +0200| [f17e4cf2691a372bcd60fdf5fcc06fe1aec7ea47] | 
committer: Jean-Baptiste Kempf

macosx: add retina graphics for native fullscreen button in dark mode

Signed-off-by: David Fuhrmann 
(cherry picked from commit 62e4118e66ed8676cd2829a7843cf2bc45d58c6e)
Signed-off-by: Jean-Baptiste Kempf 

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

 .../Resources/mainwindow_dark/window-fullscreen-on.png |  Bin 6368 -> 344 
bytes
 .../Resources/mainwindow_dark/window-fullscreen...@2x.png  |  Bin 0 -> 568 
bytes
 .../Resources/mainwindow_dark/window-fullscreen-over.png   |  Bin 6368 -> 355 
bytes
 .../mainwindow_dark/window-fullscreen-o...@2x.png  |  Bin 0 -> 567 
bytes
 .../macosx/Resources/mainwindow_dark/window-fullscreen.png |  Bin 6367 -> 360 
bytes
 .../Resources/mainwindow_dark/window-fullscr...@2x.png |  Bin 0 -> 569 
bytes
 extras/package/macosx/vlc.xcodeproj/project.pbxproj|   12 
 7 files changed, 12 insertions(+)

diff --git 
a/extras/package/macosx/Resources/mainwindow_dark/window-fullscreen-on.png 
b/extras/package/macosx/Resources/mainwindow_dark/window-fullscreen-on.png
index 83ea28c..6f8e846 100644
Binary files 
a/extras/package/macosx/Resources/mainwindow_dark/window-fullscreen-on.png and 
b/extras/package/macosx/Resources/mainwindow_dark/window-fullscreen-on.png 
differ
diff --git 
a/extras/package/macosx/Resources/mainwindow_dark/window-fullscreen...@2x.png 
b/extras/package/macosx/Resources/mainwindow_dark/window-fullscreen...@2x.png
new file mode 100644
index 000..310ed47
Binary files /dev/null and 
b/extras/package/macosx/Resources/mainwindow_dark/window-fullscreen...@2x.png 
differ
diff --git 
a/extras/package/macosx/Resources/mainwindow_dark/window-fullscreen-over.png 
b/extras/package/macosx/Resources/mainwindow_dark/window-fullscreen-over.png
index 0c3eebe..4051f1b 100644
Binary files 
a/extras/package/macosx/Resources/mainwindow_dark/window-fullscreen-over.png 
and 
b/extras/package/macosx/Resources/mainwindow_dark/window-fullscreen-over.png 
differ
diff --git 
a/extras/package/macosx/Resources/mainwindow_dark/window-fullscreen-o...@2x.png 
b/extras/package/macosx/Resources/mainwindow_dark/window-fullscreen-o...@2x.png
new file mode 100644
index 000..f08c46e
Binary files /dev/null and 
b/extras/package/macosx/Resources/mainwindow_dark/window-fullscreen-o...@2x.png 
differ
diff --git 
a/extras/package/macosx/Resources/mainwindow_dark/window-fullscreen.png 
b/extras/package/macosx/Resources/mainwindow_dark/window-fullscreen.png
index 0a84d4b..e0d8bee 100644
Binary files 
a/extras/package/macosx/Resources/mainwindow_dark/window-fullscreen.png and 
b/extras/package/macosx/Resources/mainwindow_dark/window-fullscreen.png differ
diff --git 
a/extras/package/macosx/Resources/mainwindow_dark/window-fullscr...@2x.png 
b/extras/package/macosx/Resources/mainwindow_dark/window-fullscr...@2x.png
new file mode 100644
index 000..33732b6
Binary files /dev/null and 
b/extras/package/macosx/Resources/mainwindow_dark/window-fullscr...@2x.png 
differ
diff --git a/extras/package/macosx/vlc.xcodeproj/project.pbxproj 
b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
index cdd5476..5ff28eb 100644
--- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
@@ -7,6 +7,9 @@
objects = {
 
 /* Begin PBXBuildFile section */
+   1CC6EB6819882782004335BD /* window-fullscreen...@2x.png in 
Resources */ = {isa = PBXBuildFile; fileRef = 1CC6EB6719882782004335BD /* 
window-fullscreen...@2x.png */; };
+   1CC6EB6A19882789004335BD /* window-fullscreen-o...@2x.png in 
Resources */ = {isa = PBXBuildFile; fileRef = 1CC6EB6919882789004335BD /* 
window-fullscreen-o...@2x.png */; };
+   1CC6EB6C19882794004335BD /* window-fullscr...@2x.png in 
Resources */ = {isa = PBXBuildFile; fileRef = 1CC6EB6B19882794004335BD /* 
window-fullscr...@2x.png */; };
7D3F6525188051F2005776C4 /* BWQuincyMain.xib in Resources */ = 
{isa = PBXBuildFile; fileRef = 7D3F6523188051F2005776C4 /* BWQuincyMain.xib */; 
};
7D8BB0B71830311300FAE9B7 /* DebugMessageVisualizer.xib in 
Resources */ = {isa = PBXBuildFile; fileRef = 7D8BB0B51830311300FAE9B7 /* 
DebugMessageVisualizer.xib */; };
7D8BB0BA1830367200FAE9B7 /* PlaylistMenu.xib in Resources */ = 
{isa = PBXBuildFile; fileRef = 7D8BB0B81830367200FAE9B7 /* PlaylistMenu.xib */; 
};
@@ -463,6 +466,9 @@
089C1672FE841209C02AAC07 /* Foundation.framework */ = {isa = 
PBXFileReference; lastKnownFileType = wrapper.framework; name = 
Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; 
sourceTree = ""; };
089C167FFE841241C02AAC07 /* AppKit.framework */ = {isa = 
PBXFileReference; lastKnownFileType = wrapper.framework; name = 
AppKi

[vlc-commits] macosx: remove outdated and unneeded bookmarks table reload

2014-08-02 Thread David Fuhrmann 
vlc/vlc-2.2 | branch: master | David Fuhrmann  | Wed 
Jul 30 12:20:47 2014 +0200| [6f19979607a8b43b6065ef8f1d179ab4913ec4af] | 
committer: Jean-Baptiste Kempf

macosx: remove outdated and unneeded bookmarks table reload

(cherry picked from commit ef9b397618ca1e8cb7312cd47844bf501fa19dd8)
Signed-off-by: Jean-Baptiste Kempf 

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

 modules/gui/macosx/bookmarks.h |2 +-
 modules/gui/macosx/bookmarks.m |9 -
 modules/gui/macosx/playlist.m  |1 -
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/modules/gui/macosx/bookmarks.h b/modules/gui/macosx/bookmarks.h
index 809c112..dbeec5c 100644
--- a/modules/gui/macosx/bookmarks.h
+++ b/modules/gui/macosx/bookmarks.h
@@ -64,5 +64,5 @@
 - (IBAction)edit_ok:(id)sender;
 
 - (void)showBookmarks;
-- (id)dataTable;
+
 @end
diff --git a/modules/gui/macosx/bookmarks.m b/modules/gui/macosx/bookmarks.m
index 0115db1..b593434 100644
--- a/modules/gui/macosx/bookmarks.m
+++ b/modules/gui/macosx/bookmarks.m
@@ -357,15 +357,6 @@ clear:
 }
 
 /*
- * callback stuff
- */
-
--(id)dataTable
-{
-return o_tbl_dataTable;
-}
-
-/*
  * data source methods
  */
 
diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index d3a71ef..b41ef77 100644
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -608,7 +608,6 @@
 //[o_outline_dict removeAllObjects];
 [o_outline_view reloadData];
 VLCMain sharedInstance] wizard] playlistWizard] reloadOutlineView];
-VLCMain sharedInstance] bookmarks] dataTable] reloadData];
 
 [o_outline_view selectRowIndexes:[NSIndexSet 
indexSetWithIndex:retainedRowSelection] byExtendingSelection:NO];
 

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

[vlc-commits] macosx: add input changed event and reset shown crop values for new input

2014-08-02 Thread David Fuhrmann 
vlc/vlc-2.2 | branch: master | David Fuhrmann  | Wed 
Jul 30 12:10:45 2014 +0200| [5048ad23b9827f4a5c0416eb2e81a77094f896a9] | 
committer: Jean-Baptiste Kempf

macosx: add input changed event and reset shown crop values for new input

(cherry picked from commit 84d73bcd127eaf259f358a2b823802c93732ac55)
Signed-off-by: Jean-Baptiste Kempf 

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

 modules/gui/macosx/VideoEffects.m |   23 +++
 modules/gui/macosx/intf.h |1 +
 modules/gui/macosx/intf.m |6 ++
 3 files changed, 30 insertions(+)

diff --git a/modules/gui/macosx/VideoEffects.m 
b/modules/gui/macosx/VideoEffects.m
index 0090a95..6a78478 100644
--- a/modules/gui/macosx/VideoEffects.m
+++ b/modules/gui/macosx/VideoEffects.m
@@ -208,9 +208,22 @@ static VLCVideoEffects *_o_sharedInstance = nil;
 
 [o_tableView selectFirstTabViewItem:self];
 
+[[NSNotificationCenter defaultCenter] addObserver:self
+ 
selector:@selector(inputChangedEvent:)
+ 
name:VLCInputChangedNotification
+   object:nil];
+
+
 [self resetValues];
 }
 
+- (void)dealloc
+{
+[[NSNotificationCenter defaultCenter] removeObserver:self];
+
+[super dealloc];
+}
+
 - (void)updateCocoaWindowLevel:(NSInteger)i_level
 {
 if (o_window && [o_window isVisible] && [o_window level] != i_level)
@@ -219,6 +232,16 @@ static VLCVideoEffects *_o_sharedInstance = nil;
 
 #pragma mark -
 #pragma mark internal functions
+
+-(void)inputChangedEvent:(NSNotification *)o_notification
+{
+// reset crop values when input changed
+[self setCropBottomValue:0];
+[self setCropTopValue:0];
+[self setCropLeftValue:0];
+[self setCropRightValue:0];
+}
+
 - (void)resetProfileSelector
 {
 NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index c51094e..8afc5bb 100644
--- a/modules/gui/macosx/intf.h
+++ b/modules/gui/macosx/intf.h
@@ -57,6 +57,7 @@ vout_thread_t *getVout(void);
 vout_thread_t *getVoutForActiveWindow(void);
 audio_output_t *getAout(void);
 
+static NSString * VLCInputChangedNotification = @"VLCInputChangedNotification";
 
 /*
  * VLCMain interface
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 880219b..d35be88 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -1274,6 +1274,9 @@ static bool f_appExit = false;
 p_current_input = NULL;
 
 [o_mainmenu setRateControlsEnabled: NO];
+
+[[NSNotificationCenter defaultCenter] 
postNotificationName:VLCInputChangedNotification
+object:nil];
 }
 else if (!p_current_input) {
 // object is hold here and released then it is dead
@@ -1290,6 +1293,9 @@ static bool f_appExit = false;
 p_input_changed = vlc_object_hold(p_current_input);
 
 [[self playlist] continuePlaybackWhereYouLeftOff:p_current_input];
+
+[[NSNotificationCenter defaultCenter] 
postNotificationName:VLCInputChangedNotification
+object:nil];
 }
 }
 

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

[vlc-commits] macosx: video effects: add brightness-threshold to the profiles string

2014-08-02 Thread David Fuhrmann 
vlc/vlc-2.2 | branch: master | David Fuhrmann  | Wed 
Jul 30 11:09:41 2014 +0200| [691c2d312a2ddea0b212c138b1dbba27879d20e8] | 
committer: Jean-Baptiste Kempf

macosx: video effects: add brightness-threshold to the profiles string

This is done in a backward-compatible manner: Once an existing profile is saved,
the new format is used.

Opening the new format with an old VLC version will work, too, but you will
lose changes from the new format.

refs #11643

(cherry picked from commit 32693a7ecb132ce10ffe2d64f2d04806be60b861)
Signed-off-by: Jean-Baptiste Kempf 

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

 modules/gui/macosx/VideoEffects.m |   18 --
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/modules/gui/macosx/VideoEffects.m 
b/modules/gui/macosx/VideoEffects.m
index af14317..0090a95 100644
--- a/modules/gui/macosx/VideoEffects.m
+++ b/modules/gui/macosx/VideoEffects.m
@@ -321,6 +321,7 @@ static VLCVideoEffects *_o_sharedInstance = nil;
 [o_adjust_contrast_sld setFloatValue: config_GetFloat(p_intf, "contrast")];
 [o_adjust_brightness_sld setFloatValue: config_GetFloat(p_intf, 
"brightness")];
 [o_adjust_saturation_sld setFloatValue: config_GetFloat(p_intf, 
"saturation")];
+[o_adjust_brightness_ckb setState:(config_GetInt(p_intf, 
"brightness-threshold") != 0 ? NSOnState : NSOffState)];
 [o_adjust_gamma_sld setFloatValue: config_GetFloat(p_intf, "gamma")];
 [o_adjust_brightness_sld setToolTip: [NSString stringWithFormat:@"%0.3f", 
config_GetFloat(p_intf, "brightness")]];
 [o_adjust_contrast_sld setToolTip: [NSString stringWithFormat:@"%0.3f", 
config_GetFloat(p_intf, "contrast")]];
@@ -711,7 +712,7 @@ static VLCVideoEffects *_o_sharedInstance = nil;
 
 - (NSString *)generateProfileString
 {
-return [NSString 
stringWithFormat:@"%@;%@;%@;%lli;%f;%f;%f;%f;%f;%lli;%f;%@;%lli;%lli;%lli;%lli;%lli;%lli;%@;%lli;%lli;%lli;%lli;%lli;%@;%lli;%@;%lli;%lli;%lli;%lli;%lli",
+return [NSString 
stringWithFormat:@"%@;%@;%@;%lli;%f;%f;%f;%f;%f;%lli;%f;%@;%lli;%lli;%lli;%lli;%lli;%lli;%@;%lli;%lli;%lli;%lli;%lli;%@;%lli;%@;%lli;%lli;%lli;%lli;%lli;%lli",
 B64EncAndFree(config_GetPsz(p_intf, "video-filter")),
 B64EncAndFree(config_GetPsz(p_intf, "sub-source")),
 B64EncAndFree(config_GetPsz(p_intf, "video-splitter")),
@@ -743,7 +744,9 @@ static VLCVideoEffects *_o_sharedInstance = nil;
 config_GetInt(p_intf, "logo-opacity"),
 config_GetInt(p_intf, "clone-count"),
 config_GetInt(p_intf, "wall-rows"),
-config_GetInt(p_intf, "wall-cols")
+config_GetInt(p_intf, "wall-cols"),
+// version 2 of profile string:
+config_GetInt(p_intf, "brightness-threshold") // index: 32
 ];
 }
 
@@ -801,6 +804,13 @@ static VLCVideoEffects *_o_sharedInstance = nil;
 /* fetch preset */
 NSArray *items = [[[defaults objectForKey:@"VideoEffectProfiles"] 
objectAtIndex:selectedProfile] componentsSeparatedByString:@";"];
 
+// version 1 of profile string has 32 entries
+if ([items count] < 32) {
+msg_Err(p_intf, "Error in parsing profile string");
+[self resetValues];
+return;
+}
+
 /* filter handling */
 NSString *tempString = B64DecNSStr([items objectAtIndex:0]);
 NSArray *tempArray;
@@ -866,6 +876,10 @@ static VLCVideoEffects *_o_sharedInstance = nil;
 [self setVideoFilterProperty:"wall-rows" forFilter:"wall" integer:[[items 
objectAtIndex:30] intValue]];
 [self setVideoFilterProperty:"wall-cols" forFilter:"wall" integer:[[items 
objectAtIndex:31] intValue]];
 
+if ([items count] >= 33) { // version >=2 of profile string
+[vci_si setVideoFilterProperty: "brightness-threshold" forFilter: 
"adjust" boolean: [[items objectAtIndex:32] intValue]];
+}
+
 [defaults setInteger:selectedProfile forKey:@"VideoEffectSelectedProfile"];
 [defaults synchronize];
 

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

[vlc-commits] Require libdvdnav > 4.9.0

2014-08-02 Thread Jean-Baptiste Kempf 
vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf  | Sat 
Aug  2 22:20:06 2014 +0200| [e4fb72a931b8c28917affe745b2057306589e1c5] | 
committer: Jean-Baptiste Kempf

Require libdvdnav > 4.9.0

Anything older will crash a lot.

(cherry picked from commit 9d51e27b52f241f495c171ebfafc35583dd22e11)
Signed-off-by: Jean-Baptiste Kempf 

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

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 953a58a..5daf954 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1699,7 +1699,7 @@ PKG_ENABLE_MODULES_VLC([DVDREAD], [], [dvdread > 4.9.0], 
[dvdread input module],
 dnl
 dnl libdvdnav plugin
 dnl
-PKG_ENABLE_MODULES_VLC([DVDNAV], [], [dvdnav >= 4.2.1], [DVD with navigation 
input module (dvdnav)], [auto])
+PKG_ENABLE_MODULES_VLC([DVDNAV], [], [dvdnav > 4.9.0], [DVD with navigation 
input module (dvdnav)], [auto])
 
 dnl
 dnl  Blu-ray Disc Support with libbluray

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

[vlc-commits] contrib: jpeg: remove OS X patch

2014-08-02 Thread Sean McGovern 
vlc/vlc-2.2 | branch: master | Sean McGovern  | Mon Jul 28 
19:59:21 2014 -0400| [c2acfbdd52edb27ee929ededf2c4149bdde321e3] | committer: 
Jean-Baptiste Kempf

contrib: jpeg: remove OS X patch

It has been resolved differently as of jpeglib v9a.

Signed-off-by: Felix Paul Kühne 
(cherry picked from commit 6299f6fcce8f70e57b50e89b0c35f9354805d73c)
Signed-off-by: Jean-Baptiste Kempf 

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

 contrib/src/jpeg/osx.patch |   14 --
 contrib/src/jpeg/rules.mak |1 -
 2 files changed, 15 deletions(-)

diff --git a/contrib/src/jpeg/osx.patch b/contrib/src/jpeg/osx.patch
deleted file mode 100644
index 0346b20..000
--- a/contrib/src/jpeg/osx.patch
+++ /dev/null
@@ -1,14 +0,0 @@
 jpeg/jconfig.cfg.orig  2013-12-25 22:16:42.133723909 +0100
-+++ jpeg/jconfig.cfg   2013-12-25 22:16:33.087314469 +0100
-@@ -25,6 +25,11 @@
- #define HAVE_BOOLEAN  /* prevent jmorecfg.h from redefining it */
- #endif
- 
-+#ifdef __APPLE__
-+typedef unsigned char boolean;
-+#define HAVE_BOOLEAN
-+#endif
-+
- #ifdef JPEG_INTERNALS
- 
- #undef RIGHT_SHIFT_IS_UNSIGNED
diff --git a/contrib/src/jpeg/rules.mak b/contrib/src/jpeg/rules.mak
index be80435..9f94e41 100644
--- a/contrib/src/jpeg/rules.mak
+++ b/contrib/src/jpeg/rules.mak
@@ -13,7 +13,6 @@ jpeg: jpegsrc.v$(JPEG_VERSION).tar.gz .sum-jpeg
$(UNPACK)
mv jpeg-$(JPEG_VERSION) jpegsrc.v$(JPEG_VERSION)
$(UPDATE_AUTOCONFIG)
-   $(APPLY) $(SRC)/jpeg/osx.patch
$(MOVE)
 
 .jpeg: jpeg

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

[vlc-commits] Contribs: use predefined variable for VideoLAN server

2014-08-02 Thread Jean-Baptiste Kempf 
vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf  | Sat 
Aug  2 22:18:48 2014 +0200| [f9dfb5608d11b479865846738895684863367385] | 
committer: Jean-Baptiste Kempf

Contribs: use predefined variable for VideoLAN server

(cherry picked from commit eca4d24a3457a34613d55da2ec4520156dd330c4)
Signed-off-by: Jean-Baptiste Kempf 

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

 contrib/src/dvdnav/rules.mak  |2 +-
 contrib/src/dvdread/rules.mak |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/src/dvdnav/rules.mak b/contrib/src/dvdnav/rules.mak
index 2b2bf79..87a4f79 100644
--- a/contrib/src/dvdnav/rules.mak
+++ b/contrib/src/dvdnav/rules.mak
@@ -1,7 +1,7 @@
 # DVDNAV
 
 LIBDVDNAV_VERSION := 5.0.0
-LIBDVDNAV_URL := 
http://download.videolan.org/pub/videolan/libdvdnav/$(LIBDVDNAV_VERSION)/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
+LIBDVDNAV_URL := 
$(VIDEOLAN)/libdvdnav/$(LIBDVDNAV_VERSION)/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
 
 ifdef BUILD_DISCS
 ifdef GPL
diff --git a/contrib/src/dvdread/rules.mak b/contrib/src/dvdread/rules.mak
index 058abe3..66c1f66 100644
--- a/contrib/src/dvdread/rules.mak
+++ b/contrib/src/dvdread/rules.mak
@@ -1,6 +1,6 @@
 # DVDREAD
 LIBDVDREAD_VERSION := 5.0.0
-LIBDVDREAD_URL := 
http://download.videolan.org/pub/videolan/libdvdread/$(LIBDVDREAD_VERSION)/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
+LIBDVDREAD_URL := 
$(VIDEOLAN)/libdvdread/$(LIBDVDREAD_VERSION)/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
 
 ifdef BUILD_DISCS
 ifdef GPL

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

[vlc-commits] Contribs: update dvdnav to 5.0.0 release

2014-08-02 Thread Jean-Baptiste Kempf 
vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf  | Sat 
Aug  2 22:16:38 2014 +0200| [4a00f1b233cafd7d79eb68a2224a163609a21365] | 
committer: Jean-Baptiste Kempf

Contribs: update dvdnav to 5.0.0 release

(cherry picked from commit acb6a96407495ebaad1c9797257b0c43cb80c394)
Signed-off-by: Jean-Baptiste Kempf 

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

 contrib/src/dvdnav/SHA512SUMS |2 +-
 contrib/src/dvdnav/rules.mak  |   21 +++--
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/contrib/src/dvdnav/SHA512SUMS b/contrib/src/dvdnav/SHA512SUMS
index 9f79b1d..3286568 100644
--- a/contrib/src/dvdnav/SHA512SUMS
+++ b/contrib/src/dvdnav/SHA512SUMS
@@ -1 +1 @@
-f9b9c52af870bc088bc8bbc7a64285dc55906dcfd11d6849d8a7b4046b083472c3e898609ec399a45059e10cffce0ef67ec2dec2ec4f0a1c904b9b6d2a85185f
  libdvdnav-4.2.0.tar.bz2
+f7e7977bf2c502ce88e7c3bc6c9f04ab176e3e613be8375074c19c536ecb57675ae6719d035797570c4a9123d207e4152adb23ef0a69eea8cad40e1aca397b6b
  libdvdnav-5.0.0.tar.bz2
diff --git a/contrib/src/dvdnav/rules.mak b/contrib/src/dvdnav/rules.mak
index 9a4fc7b..2b2bf79 100644
--- a/contrib/src/dvdnav/rules.mak
+++ b/contrib/src/dvdnav/rules.mak
@@ -1,30 +1,23 @@
 # DVDNAV
 
-# LIBDVDNAV_VERSION := 4.2.0
-# LIBDVDNAV_URL := 
http://dvdnav.mplayerhq.hu/releases/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
-DVDNAV_GITURL := git://git.videolan.org/libdvdnav.git
-LIBDVDNAV_VERSION := git
+LIBDVDNAV_VERSION := 5.0.0
+LIBDVDNAV_URL := 
http://download.videolan.org/pub/videolan/libdvdnav/$(LIBDVDNAV_VERSION)/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
 
 ifdef BUILD_DISCS
 ifdef GPL
 PKGS += dvdnav
 endif
 endif
-ifeq ($(call need_pkg,"dvdnav"),)
+ifeq ($(call need_pkg,"dvdnav > 4.9.9"),)
 PKGS_FOUND += dvdnav
 endif
 
-$(TARBALLS)/libdvdnav-git.tar.xz:
-   $(call download_git,$(DVDNAV_GITURL))
+$(TARBALLS)/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2:
+   $(call download,$(LIBDVDNAV_URL))
 
-# $(TARBALLS)/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2:
-#  $(call download,$(LIBDVDNAV_URL))
+.sum-dvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
 
-.sum-dvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.xz
-   $(warning $@ not implemented)
-   touch $@
-
-dvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.xz .sum-dvdnav
+dvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2 .sum-dvdnav
$(UNPACK)
cd $(UNPACK_DIR) && sed -i -e 's,Requires.private,Requires,g' 
misc/*.pc.in
cd $(UNPACK_DIR) && autoreconf -ivf

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

[vlc-commits] Contribs: update dvdread to 5.0.0

2014-08-02 Thread Jean-Baptiste Kempf 
vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf  | Sat 
Aug  2 22:12:07 2014 +0200| [3d5a1abc51370c1927ddeef6e048deda4d58d1b4] | 
committer: Jean-Baptiste Kempf

Contribs: update dvdread to 5.0.0

(cherry picked from commit b01cf05ec740851d10686163d61818acbbca2613)
Signed-off-by: Jean-Baptiste Kempf 

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

 contrib/src/dvdread/SHA512SUMS |2 +-
 contrib/src/dvdread/rules.mak  |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/src/dvdread/SHA512SUMS b/contrib/src/dvdread/SHA512SUMS
index e7fb247..4e0e837 100644
--- a/contrib/src/dvdread/SHA512SUMS
+++ b/contrib/src/dvdread/SHA512SUMS
@@ -1 +1 @@
-ff304009808e7697a88c7bc4249484668f05bcc58e560d255a7c6d1320bb40bf81a289b58d287d9f14b4df7c37456902957133e589763ad282812521905048b9
  libdvdread-4.9.9.tar.bz2
+bc6d71b6d71642ef92c4b9eec5732892f25ca53434edf0febf62797ebb85d2e5489109528c8e5b11cc71706b87c5ceedf458ed950b60efe6f2350ce4f09b
  libdvdread-5.0.0.tar.bz2
diff --git a/contrib/src/dvdread/rules.mak b/contrib/src/dvdread/rules.mak
index 6d536e5..058abe3 100644
--- a/contrib/src/dvdread/rules.mak
+++ b/contrib/src/dvdread/rules.mak
@@ -1,6 +1,6 @@
 # DVDREAD
-LIBDVDREAD_VERSION := 4.9.9
-LIBDVDREAD_URL := 
http://download.videolan.org/pub/videolan/libdvdread/4.9.9/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
+LIBDVDREAD_VERSION := 5.0.0
+LIBDVDREAD_URL := 
http://download.videolan.org/pub/videolan/libdvdread/$(LIBDVDREAD_VERSION)/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
 
 ifdef BUILD_DISCS
 ifdef GPL

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

[vlc-commits] misc: acoustid: set NO_INTERACT

2014-08-02 Thread Francois Cartegnie 
vlc/vlc-2.2 | branch: master | Francois Cartegnie  | Fri Aug  
1 11:09:43 2014 +0900| [fc7008e936d1ef77169464d3d4acc5f723ff5ab1] | committer: 
Jean-Baptiste Kempf

misc: acoustid: set NO_INTERACT

(cherry picked from commit 6dfc9301c5791bad9e85078b025cd5f20174aa6a)
Signed-off-by: Jean-Baptiste Kempf 

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

 modules/misc/webservices/acoustid.c |3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/misc/webservices/acoustid.c 
b/modules/misc/webservices/acoustid.c
index 3c16110..f23be5a 100644
--- a/modules/misc/webservices/acoustid.c
+++ b/modules/misc/webservices/acoustid.c
@@ -180,7 +180,10 @@ int DoAcoustIdWebRequest( vlc_object_t *p_obj, 
acoustid_fingerprint_t *p_data )
 vlc_cleanup_push( cancelDoAcoustIdWebRequest, &request );
 
 msg_Dbg( p_obj, "Querying AcoustID from %s", request.psz_url );
+int i_saved_flags = p_obj->i_flags;
+p_obj->i_flags |= OBJECT_FLAGS_NOINTERACT;
 request.p_stream = stream_UrlNew( p_obj, request.psz_url );
+p_obj->i_flags = i_saved_flags;
 if ( !request.p_stream )
 {
 i_status = VLC_EGENERIC;

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

[vlc-commits] addons: installer/fetcher: set NO_INTERACT

2014-08-02 Thread Francois Cartegnie 
vlc/vlc-2.2 | branch: master | Francois Cartegnie  | Fri Aug  
1 11:10:29 2014 +0900| [7efb8d22a16eee045e577eda4e2bb8e86c42eb26] | committer: 
Jean-Baptiste Kempf

addons: installer/fetcher: set NO_INTERACT

(cherry picked from commit 2adca6f5ca17fb94dda68831381f466572d2e163)
Signed-off-by: Jean-Baptiste Kempf 

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

 src/misc/addons.c |4 
 1 file changed, 4 insertions(+)

diff --git a/src/misc/addons.c b/src/misc/addons.c
index 6a99ed7..5c2ed3d 100644
--- a/src/misc/addons.c
+++ b/src/misc/addons.c
@@ -301,6 +301,7 @@ static void LoadLocalStorage( addons_manager_t *p_manager )
 {
 addons_finder_t *p_finder =
 vlc_custom_create( p_manager->p_priv->p_parent, sizeof( *p_finder ), 
"entries finder" );
+p_finder->i_flags |= OBJECT_FLAGS_NOINTERACT;
 
 module_t *p_module = module_need( p_finder, "addons finder",
   "addons.store.list", true );
@@ -339,6 +340,7 @@ static void *FinderThread( void *p_data )
 
 addons_finder_t *p_finder =
 vlc_custom_create( p_manager->p_priv->p_parent, sizeof( 
*p_finder ), "entries finder" );
+p_finder->i_flags |= OBJECT_FLAGS_NOINTERACT;
 
 i_cancel = vlc_savecancel();
 if( p_finder != NULL )
@@ -379,6 +381,7 @@ static int addons_manager_WriteCatalog( addons_manager_t 
*p_manager )
 
 addons_storage_t *p_storage =
 vlc_custom_create( p_manager->p_priv->p_parent, sizeof( *p_storage ), 
"entries storage" );
+p_storage->i_flags |= OBJECT_FLAGS_NOINTERACT;
 
 module_t *p_module = module_need( p_storage, "addons storage",
   "addons.store.install", true );
@@ -407,6 +410,7 @@ static int installOrRemoveAddon( addons_manager_t 
*p_manager, addon_entry_t *p_e
 
 addons_storage_t *p_storage =
 vlc_custom_create( p_manager->p_priv->p_parent, sizeof( *p_storage ), 
"entries storage" );
+p_storage->i_flags |= OBJECT_FLAGS_NOINTERACT;
 
 module_t *p_module = module_need( p_storage, "addons storage",
   "addons.store.install", true );

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

[vlc-commits] auhal: rework locking and avoid potential deadlock

2014-08-02 Thread David Fuhrmann 
vlc/vlc-2.2 | branch: master | David Fuhrmann  | Wed 
Jul 30 18:45:04 2014 +0200| [cca33e15fcac5a7d597eacdb2084beca4983fb69] | 
committer: Jean-Baptiste Kempf

auhal: rework locking and avoid potential deadlock

hopefully closes #11675

(cherry picked from commit 2034ba88d6e1779f6717a16520d1a8b07759b2aa)
Signed-off-by: Jean-Baptiste Kempf 

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

 modules/audio_output/auhal.c |   72 +++---
 1 file changed, 47 insertions(+), 25 deletions(-)

diff --git a/modules/audio_output/auhal.c b/modules/audio_output/auhal.c
index 6253052..9bdd4fd 100644
--- a/modules/audio_output/auhal.c
+++ b/modules/audio_output/auhal.c
@@ -106,8 +106,12 @@ struct aout_sys_t
 int i_bytes_per_sample;
 
 CFArrayRef  device_list;
+vlc_mutex_t device_list_lock;/* protects access to 
device_list */
 
-vlc_mutex_t var_lock;   /* protects access to 
device_list and i_selected_dev */
+vlc_mutex_t selected_device_lock;/* Synchronizes access to 
i_selected_dev. This is only needed
+between VLCs audio 
thread and the core audio callback thread.
+The value is only 
changed in Start, further access to this variable
+within the audio 
thread (start, stop, close) needs no protection. */
 
 float   f_volume;
 boolb_mute;
@@ -186,7 +190,8 @@ static int Open(vlc_object_t *obj)
 
 OSStatus err = noErr;
 
-vlc_mutex_init(&p_sys->var_lock);
+vlc_mutex_init(&p_sys->device_list_lock);
+vlc_mutex_init(&p_sys->selected_device_lock);
 vlc_mutex_init(&p_sys->lock);
 vlc_cond_init(&p_sys->cond);
 p_sys->b_digital = false;
@@ -263,13 +268,21 @@ static void Close(vlc_object_t *obj)
 if (err != noErr)
 msg_Err(p_aout, "failed to remove listener for default audio device 
[%4.4s]", (char *)&err);
 
-vlc_mutex_lock(&p_sys->var_lock);
+/*
+ * StreamsChangedListener can rebuild the device list and thus held the 
device_list_lock.
+ * To avoid a possible deadlock, an array copy is created here.
+ * In rare cases, this can lead to missing StreamsChangedListener callback 
deregistration (TODO).
+ */
+vlc_mutex_lock(&p_sys->device_list_lock);
+CFArrayRef device_list_cpy = CFArrayCreateCopy(NULL, p_sys->device_list);
+vlc_mutex_unlock(&p_sys->device_list_lock);
+
 /* remove streams callbacks */
-CFIndex count = CFArrayGetCount(p_sys->device_list);
+CFIndex count = CFArrayGetCount(device_list_cpy);
 if (count > 0) {
 for (CFIndex x = 0; x < count; x++) {
 AudioDeviceID deviceId = 0;
-CFNumberRef cfn_device_id = 
CFArrayGetValueAtIndex(p_sys->device_list, x);
+CFNumberRef cfn_device_id = 
CFArrayGetValueAtIndex(device_list_cpy, x);
 if (!cfn_device_id)
 continue;
 
@@ -280,14 +293,15 @@ static void Close(vlc_object_t *obj)
 }
 }
 
+CFRelease(device_list_cpy);
 CFRelease(p_sys->device_list);
-vlc_mutex_unlock(&p_sys->var_lock);
 
 char *psz_device = aout_DeviceGet(p_aout);
 config_PutPsz(p_aout, "auhal-audio-device", psz_device);
 free(psz_device);
 
-vlc_mutex_destroy(&p_sys->var_lock);
+vlc_mutex_destroy(&p_sys->selected_device_lock);
+vlc_mutex_destroy(&p_sys->device_list_lock);
 vlc_mutex_destroy(&p_sys->lock);
 vlc_cond_destroy(&p_sys->cond);
 
@@ -318,7 +332,7 @@ static int Start(audio_output_t *p_aout, 
audio_sample_format_t *restrict fmt)
 p_sys->b_paused = false;
 p_sys->i_device_latency = 0;
 
-vlc_mutex_lock(&p_sys->var_lock);
+vlc_mutex_lock(&p_sys->selected_device_lock);
 p_sys->i_selected_dev = p_sys->i_new_selected_dev;
 
 aout_FormatPrint(p_aout, "VLC is looking for:", fmt);
@@ -365,7 +379,7 @@ static int Start(audio_output_t *p_aout, 
audio_sample_format_t *restrict fmt)
 err = AudioObjectGetPropertyData(kAudioObjectSystemObject, 
&defaultDeviceAddress, 0, NULL, &propertySize, &defaultDeviceID);
 if (err != noErr) {
 msg_Err(p_aout, "could not get default audio device [%4.4s]", 
(char *)&err);
-vlc_mutex_unlock(&p_sys->var_lock);
+vlc_mutex_unlock(&p_sys->selected_device_lock);
 goto error;
 }
 else
@@ -374,7 +388,7 @@ static int Start(audio_output_t *p_aout, 
audio_sample_format_t *restrict fmt)
 p_sys->i_selected_dev = defaultDeviceID;
 p_sys->b_selected_dev_is_digital = var_InheritBool(p_aout, "spdif");
 }
-vlc_mutex_unlock(&p_sys->var_lock);
+vlc_mutex_unlock(&p_sys->selected_device_lock);
 
 // recheck if device still supports digita

[vlc-commits] input: fix use after free

2014-08-02 Thread Tristan Matthews 
vlc/vlc-2.2 | branch: master | Tristan Matthews  | 
Fri Aug  1 11:55:11 2014 -0400| [acd2b4efb51f5358feb980e86155eecc58027fc7] | 
committer: Jean-Baptiste Kempf

input: fix use after free

(cherry picked from commit e345ccc4ed2ed312793ff00efdd2bc572d845461)
Signed-off-by: Jean-Baptiste Kempf 

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

 src/input/input.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/input/input.c b/src/input/input.c
index 7e71d4e..917eec4 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -2415,7 +2415,6 @@ static int InputSourceInit( input_thread_t *p_input,
 
 if( in->p_demux == NULL )
 {
-stream_Delete( p_stream );
 if( vlc_object_alive( p_input ) )
 {
 msg_Err( p_input, "no suitable demux module for `%s/%s://%s'",
@@ -2426,6 +2425,7 @@ static int InputSourceInit( input_thread_t *p_input,
   _("The format of '%s' cannot be detected. "
 "Have a look at the log for details."), 
psz_mrl );
 }
+stream_Delete( p_stream );
 goto error;
 }
 assert( in->p_demux->pf_demux != NULL );

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

[vlc-commits] Win32: Correctly layout the files for the XPI

2014-08-02 Thread Jean-Baptiste Kempf 
vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf  | Sat 
Aug  2 21:26:08 2014 +0200| [cce683f71728cf2a39d97665e3b5dc30a24734ee] | 
committer: Jean-Baptiste Kempf

Win32: Correctly layout the files for the XPI

Close #11856

(cherry picked from commit 70e212146138688b9cb5c4df1f545ea91c2cac2a)
Signed-off-by: Jean-Baptiste Kempf 

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

 extras/package/win32/package.mak |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/extras/package/win32/package.mak b/extras/package/win32/package.mak
index 0b7abf8..489024c 100644
--- a/extras/package/win32/package.mak
+++ b/extras/package/win32/package.mak
@@ -106,12 +106,12 @@ package-win-strip: package-win-common
 
 
 package-win32-webplugin-common: package-win-strip
-   mkdir -p "$(win32_xpi_destdir)/"
-   cp -r $(win32_destdir)/plugins/ "$(win32_xpi_destdir)/"
-   find $(prefix) -maxdepth 4 -name "*$(LIBEXT)" -exec cp {} 
"$(win32_xpi_destdir)/" \;
+   mkdir -p "$(win32_xpi_destdir)/plugins/"
+   cp -r $(win32_destdir)/plugins/ "$(win32_xpi_destdir)/plugins/"
+   cp "$(win32_destdir)/libvlc.dll" "$(win32_destdir)/libvlccore.dll" 
"$(win32_destdir)/npvlc.dll" "$(win32_xpi_destdir)/plugins/"
cp $(top_builddir)/npapi-vlc/npapi/package/npvlc.dll.manifest 
"$(win32_xpi_destdir)/plugins/"
cp "$(top_srcdir)/extras/package/win32/libvlc.dll.manifest" 
"$(win32_xpi_destdir)/plugins/"
-   rm -rf "$(win32_xpi_destdir)/plugins/gui/"
+   rm -rf "$(win32_xpi_destdir)/plugins/plugins/gui/"
 
 
 package-win32-xpi: package-win32-webplugin-common

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

[vlc-commits] demux: rar: set NO_INTERACT flags for probing

2014-08-02 Thread Francois Cartegnie 
vlc/vlc-2.2 | branch: master | Francois Cartegnie  | Fri Aug  
1 10:49:09 2014 +0900| [7014a4c127223322f848cddb5c749e7289302bda] | committer: 
Jean-Baptiste Kempf

demux: rar: set NO_INTERACT flags for probing

(cherry picked from commit cbd645e461eb56b6ff4fcde56495b1fff8491d58)
Signed-off-by: Jean-Baptiste Kempf 

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

 modules/access/rar/rar.c |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/access/rar/rar.c b/modules/access/rar/rar.c
index c644c4a..3edb793 100644
--- a/modules/access/rar/rar.c
+++ b/modules/access/rar/rar.c
@@ -397,8 +397,7 @@ int RarParse(stream_t *s, int *count, rar_file_t ***file, 
bool b_extonly)
 return VLC_SUCCESS;
 
 const int s_flags = s->i_flags;
-if (has_next < 0)
-s->i_flags |= OBJECT_FLAGS_NOINTERACT;
+s->i_flags |= OBJECT_FLAGS_NOINTERACT;
 vol = stream_UrlNew(s, volume_mrl);
 s->i_flags = s_flags;
 

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

[vlc-commits] Qt: use QX11Info on Qt5 when present

2014-08-02 Thread Rafaël Carré 
vlc/vlc-2.2 | branch: master | Rafaël Carré  | Wed Jul 30 
12:16:52 2014 +0200| [ba49030bcc2f4f3fb48fea1cf73a2058eb34c140] | committer: 
Jean-Baptiste Kempf

Qt: use QX11Info on Qt5 when present

(cherry picked from commit 96d10f508bb9fb59f6396329f692923eb266ff0d)
(cherry picked from commit 70b074a2d175458f1d4cac79726c1921507da7de)
Signed-off-by: Jean-Baptiste Kempf 

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

 configure.ac |6 ++
 modules/gui/qt4/Makefile.am  |4 ++--
 modules/gui/qt4/components/interface_widgets.cpp |4 
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index e5e4fcd..953a58a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3709,6 +3709,12 @@ AC_ARG_ENABLE(qt, [
 ])
 AS_IF([test "${enable_qt}" != "no"], [
   PKG_CHECK_MODULES([QT], [Qt5Core >= 5.1.0 Qt5Widgets Qt5Gui], [
+  PKG_CHECK_MODULES([QTX11], [Qt5X11Extras], [
+  VLC_ADD_LIBS([qt4],[${QTX11_LIBS}])
+  VLC_ADD_CXXFLAGS([qt4],[${QTX11_CFLAGS} -DQT5_HAS_X11])
+  ],[
+  AC_MSG_WARN([Not building Qt Interface with X11 helpers.])
+  ])
   QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix Qt5Core)"
   QT_HOST_PATH="$(eval $PKG_CONFIG --variable=host_bins Qt5Core)"
   AC_PATH_PROGS(MOC, [moc-qt5 moc], moc, [${QT_HOST_PATH} ${QT_PATH}/bin 
${CONTRIB_DIR}/bin])
diff --git a/modules/gui/qt4/Makefile.am b/modules/gui/qt4/Makefile.am
index a4fec79..c608999 100644
--- a/modules/gui/qt4/Makefile.am
+++ b/modules/gui/qt4/Makefile.am
@@ -14,8 +14,8 @@ guidir = $(pluginsdir)/gui
 
 SUFFIXES += .ui .h .hpp .moc.cpp
 
-libqt4_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(QT_CFLAGS)
-libqt4_plugin_la_LIBADD = $(QT_LIBS)
+libqt4_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(QT_CFLAGS) $(CXXFLAGS_qt4)
+libqt4_plugin_la_LIBADD = $(QT_LIBS) $(LIBS_qt4)
 libqt4_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(guidir)'
 if HAVE_OS2
 else
diff --git a/modules/gui/qt4/components/interface_widgets.cpp 
b/modules/gui/qt4/components/interface_widgets.cpp
index 84babdb..aaf1975 100644
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -52,6 +52,10 @@
 #include 
 #include 
 
+#ifdef QT5_HAS_X11
+# define Q_WS_X11
+#endif
+
 #ifdef Q_WS_X11
 #   include 
 #   include 

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

[vlc-commits] auhal: Added more debug logs and removed invalid memory access due to wrong range

2014-08-02 Thread David Fuhrmann 
vlc/vlc-2.2 | branch: master | David Fuhrmann  | Wed 
Jul 30 17:04:37 2014 +0200| [4d0af56a834682765ff1c59ee421aa9817d2a8c2] | 
committer: Jean-Baptiste Kempf

auhal: Added more debug logs and removed invalid memory access due to wrong 
range

Search range for the new devices array was wrong, which led to nonworking
detection of removed devices, up to strange deadlocks when quitting VLC.

(cherry picked from commit a9863cf8276cb76804e4c1923aa2f0417c65402a)
Signed-off-by: Jean-Baptiste Kempf 

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

 modules/audio_output/auhal.c |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/modules/audio_output/auhal.c b/modules/audio_output/auhal.c
index a81c2b3..6253052 100644
--- a/modules/audio_output/auhal.c
+++ b/modules/audio_output/auhal.c
@@ -1086,6 +1086,8 @@ static void Stop(audio_output_t *p_aout)
 OSStatuserr = noErr;
 UInt32  i_param_size = 0;
 
+msg_Dbg(p_aout, "Stopping the auhal module");
+
 if (p_sys->au_unit) {
 verify_noerr(AudioOutputUnitStop(p_sys->au_unit));
 verify_noerr(AudioUnitUninitialize(p_sys->au_unit));
@@ -1185,6 +1187,8 @@ static void RebuildDeviceList(audio_output_t * p_aout)
 
 struct aout_sys_t   *p_sys = p_aout->sys;
 
+msg_Dbg(p_aout, "Rebuild device list");
+
 ReportDevice(p_aout, 0, _("System Sound Output Device"));
 
 /* setup local array */
@@ -1286,16 +1290,18 @@ static void RebuildDeviceList(audio_output_t * p_aout)
 CFIndex count = 0;
 if (p_sys->device_list)
 count = CFArrayGetCount(p_sys->device_list);
+CFRange newListSearchRange = CFRangeMake(0, 
CFArrayGetCount(currentListOfDevices));
 
 if (count > 0) {
+msg_Dbg(p_aout, "Looking for removed devices");
 CFNumberRef cfn_device_id;
 int i_device_id = 0;
 for (CFIndex x = 0; x < count; x++) {
-if (!CFArrayContainsValue(currentListOfDevices, CFRangeMake(0, 
count), CFArrayGetValueAtIndex(p_sys->device_list, x))) {
+if (!CFArrayContainsValue(currentListOfDevices, 
newListSearchRange, CFArrayGetValueAtIndex(p_sys->device_list, x))) {
 cfn_device_id = CFArrayGetValueAtIndex(p_sys->device_list, x);
-
 if (cfn_device_id) {
 CFNumberGetValue(cfn_device_id, kCFNumberSInt32Type, 
&i_device_id);
+msg_Dbg(p_aout, "Device ID %i is not found in new array, 
deleting.", i_device_id);
 ReportDevice(p_aout, i_device_id, NULL);
 }
 }

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

[vlc-commits] qt4: fix embedding on unix

2014-08-02 Thread Rafaël Carré 
vlc/vlc-2.2 | branch: master | Rafaël Carré  | Wed Jul 30 
12:16:11 2014 +0200| [760cb7ec214f994f2967c8d07ed1081f8a1b2692] | committer: 
Jean-Baptiste Kempf

qt4: fix embedding on unix

(cherry picked from commit 15d85d8bc2370e31dec315eda804d8196c0acb93)
Signed-off-by: Jean-Baptiste Kempf 

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

 modules/gui/qt4/qt4.cpp |   16 +++-
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index a156366..ea6fd01 100644
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -42,7 +42,7 @@
 #include "util/qvlcapp.hpp" /* QVLCApplication definition */
 #include "components/playlist/playlist_model.hpp" /* for ~PLModel() */
 
-#ifdef Q_WS_X11
+#if defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN)
  #include 
 #endif
 
@@ -298,20 +298,18 @@ vlc_module_begin ()
 
 set_callbacks( OpenDialogs, Close )
 
-#if defined (Q_WS_X11) || (defined (Q_WS_QPA) && defined (__unix__))
-add_submodule ()
-set_capability( "vout window xid", 0 )
-set_callbacks( WindowOpen, WindowClose )
-#endif
 #if (defined (Q_OS_WIN) && !defined (_WIN32_X11_)) || defined (Q_OS_OS2)
 add_submodule ()
 set_capability( "vout window hwnd", 0 )
 set_callbacks( WindowOpen, WindowClose )
-#endif
-#if defined (Q_OS_DARWIN)
+#elif defined (Q_OS_DARWIN)
 add_submodule ()
 set_capability( "vout window nsobject", 0 )
 set_callbacks( WindowOpen, WindowClose )
+#elif defined (Q_OS_UNIX)
+add_submodule ()
+set_capability( "vout window xid", 0 )
+set_callbacks( WindowOpen, WindowClose )
 #endif
 
 vlc_module_end ()
@@ -351,7 +349,7 @@ static int Open( vlc_object_t *p_this, bool 
isDialogProvider )
 {
 intf_thread_t *p_intf = (intf_thread_t *)p_this;
 
-#ifdef Q_WS_X11
+#if defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN)
 if( !vlc_xlib_init( p_this ) )
 return VLC_EGENERIC;
 

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

[vlc-commits] Require libdvdnav > 4.9.0

2014-08-02 Thread Jean-Baptiste Kempf 
vlc | branch: master | Jean-Baptiste Kempf  | Sat Aug  2 
22:20:06 2014 +0200| [9d51e27b52f241f495c171ebfafc35583dd22e11] | committer: 
Jean-Baptiste Kempf

Require libdvdnav > 4.9.0

Anything older will crash a lot.

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

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 9560bee..4852f2c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1716,7 +1716,7 @@ PKG_ENABLE_MODULES_VLC([DVDREAD], [], [dvdread > 4.9.0], 
[dvdread input module],
 dnl
 dnl libdvdnav plugin
 dnl
-PKG_ENABLE_MODULES_VLC([DVDNAV], [], [dvdnav >= 4.2.1], [DVD with navigation 
input module (dvdnav)], [auto])
+PKG_ENABLE_MODULES_VLC([DVDNAV], [], [dvdnav > 4.9.0], [DVD with navigation 
input module (dvdnav)], [auto])
 
 dnl
 dnl  Blu-ray Disc Support with libbluray

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

[vlc-commits] Contribs: use predefined variable for VideoLAN server

2014-08-02 Thread Jean-Baptiste Kempf 
vlc | branch: master | Jean-Baptiste Kempf  | Sat Aug  2 
22:18:48 2014 +0200| [eca4d24a3457a34613d55da2ec4520156dd330c4] | committer: 
Jean-Baptiste Kempf

Contribs: use predefined variable for VideoLAN server

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

 contrib/src/dvdnav/rules.mak  |2 +-
 contrib/src/dvdread/rules.mak |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/src/dvdnav/rules.mak b/contrib/src/dvdnav/rules.mak
index 2b2bf79..87a4f79 100644
--- a/contrib/src/dvdnav/rules.mak
+++ b/contrib/src/dvdnav/rules.mak
@@ -1,7 +1,7 @@
 # DVDNAV
 
 LIBDVDNAV_VERSION := 5.0.0
-LIBDVDNAV_URL := 
http://download.videolan.org/pub/videolan/libdvdnav/$(LIBDVDNAV_VERSION)/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
+LIBDVDNAV_URL := 
$(VIDEOLAN)/libdvdnav/$(LIBDVDNAV_VERSION)/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
 
 ifdef BUILD_DISCS
 ifdef GPL
diff --git a/contrib/src/dvdread/rules.mak b/contrib/src/dvdread/rules.mak
index 058abe3..66c1f66 100644
--- a/contrib/src/dvdread/rules.mak
+++ b/contrib/src/dvdread/rules.mak
@@ -1,6 +1,6 @@
 # DVDREAD
 LIBDVDREAD_VERSION := 5.0.0
-LIBDVDREAD_URL := 
http://download.videolan.org/pub/videolan/libdvdread/$(LIBDVDREAD_VERSION)/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
+LIBDVDREAD_URL := 
$(VIDEOLAN)/libdvdread/$(LIBDVDREAD_VERSION)/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
 
 ifdef BUILD_DISCS
 ifdef GPL

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

[vlc-commits] Contribs: update dvdnav to 5.0.0 release

2014-08-02 Thread Jean-Baptiste Kempf 
vlc | branch: master | Jean-Baptiste Kempf  | Sat Aug  2 
22:16:38 2014 +0200| [acb6a96407495ebaad1c9797257b0c43cb80c394] | committer: 
Jean-Baptiste Kempf

Contribs: update dvdnav to 5.0.0 release

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

 contrib/src/dvdnav/SHA512SUMS |2 +-
 contrib/src/dvdnav/rules.mak  |   21 +++--
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/contrib/src/dvdnav/SHA512SUMS b/contrib/src/dvdnav/SHA512SUMS
index 9f79b1d..3286568 100644
--- a/contrib/src/dvdnav/SHA512SUMS
+++ b/contrib/src/dvdnav/SHA512SUMS
@@ -1 +1 @@
-f9b9c52af870bc088bc8bbc7a64285dc55906dcfd11d6849d8a7b4046b083472c3e898609ec399a45059e10cffce0ef67ec2dec2ec4f0a1c904b9b6d2a85185f
  libdvdnav-4.2.0.tar.bz2
+f7e7977bf2c502ce88e7c3bc6c9f04ab176e3e613be8375074c19c536ecb57675ae6719d035797570c4a9123d207e4152adb23ef0a69eea8cad40e1aca397b6b
  libdvdnav-5.0.0.tar.bz2
diff --git a/contrib/src/dvdnav/rules.mak b/contrib/src/dvdnav/rules.mak
index 9a4fc7b..2b2bf79 100644
--- a/contrib/src/dvdnav/rules.mak
+++ b/contrib/src/dvdnav/rules.mak
@@ -1,30 +1,23 @@
 # DVDNAV
 
-# LIBDVDNAV_VERSION := 4.2.0
-# LIBDVDNAV_URL := 
http://dvdnav.mplayerhq.hu/releases/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
-DVDNAV_GITURL := git://git.videolan.org/libdvdnav.git
-LIBDVDNAV_VERSION := git
+LIBDVDNAV_VERSION := 5.0.0
+LIBDVDNAV_URL := 
http://download.videolan.org/pub/videolan/libdvdnav/$(LIBDVDNAV_VERSION)/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
 
 ifdef BUILD_DISCS
 ifdef GPL
 PKGS += dvdnav
 endif
 endif
-ifeq ($(call need_pkg,"dvdnav"),)
+ifeq ($(call need_pkg,"dvdnav > 4.9.9"),)
 PKGS_FOUND += dvdnav
 endif
 
-$(TARBALLS)/libdvdnav-git.tar.xz:
-   $(call download_git,$(DVDNAV_GITURL))
+$(TARBALLS)/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2:
+   $(call download,$(LIBDVDNAV_URL))
 
-# $(TARBALLS)/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2:
-#  $(call download,$(LIBDVDNAV_URL))
+.sum-dvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
 
-.sum-dvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.xz
-   $(warning $@ not implemented)
-   touch $@
-
-dvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.xz .sum-dvdnav
+dvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2 .sum-dvdnav
$(UNPACK)
cd $(UNPACK_DIR) && sed -i -e 's,Requires.private,Requires,g' 
misc/*.pc.in
cd $(UNPACK_DIR) && autoreconf -ivf

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

[vlc-commits] Contribs: update dvdread to 5.0.0

2014-08-02 Thread Jean-Baptiste Kempf 
vlc | branch: master | Jean-Baptiste Kempf  | Sat Aug  2 
22:12:07 2014 +0200| [b01cf05ec740851d10686163d61818acbbca2613] | committer: 
Jean-Baptiste Kempf

Contribs: update dvdread to 5.0.0

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

 contrib/src/dvdread/SHA512SUMS |2 +-
 contrib/src/dvdread/rules.mak  |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/src/dvdread/SHA512SUMS b/contrib/src/dvdread/SHA512SUMS
index e7fb247..4e0e837 100644
--- a/contrib/src/dvdread/SHA512SUMS
+++ b/contrib/src/dvdread/SHA512SUMS
@@ -1 +1 @@
-ff304009808e7697a88c7bc4249484668f05bcc58e560d255a7c6d1320bb40bf81a289b58d287d9f14b4df7c37456902957133e589763ad282812521905048b9
  libdvdread-4.9.9.tar.bz2
+bc6d71b6d71642ef92c4b9eec5732892f25ca53434edf0febf62797ebb85d2e5489109528c8e5b11cc71706b87c5ceedf458ed950b60efe6f2350ce4f09b
  libdvdread-5.0.0.tar.bz2
diff --git a/contrib/src/dvdread/rules.mak b/contrib/src/dvdread/rules.mak
index 6d536e5..058abe3 100644
--- a/contrib/src/dvdread/rules.mak
+++ b/contrib/src/dvdread/rules.mak
@@ -1,6 +1,6 @@
 # DVDREAD
-LIBDVDREAD_VERSION := 4.9.9
-LIBDVDREAD_URL := 
http://download.videolan.org/pub/videolan/libdvdread/4.9.9/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
+LIBDVDREAD_VERSION := 5.0.0
+LIBDVDREAD_URL := 
http://download.videolan.org/pub/videolan/libdvdread/$(LIBDVDREAD_VERSION)/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
 
 ifdef BUILD_DISCS
 ifdef GPL

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

[vlc-commits] NPAPI: accept fullscreenenabled as param

2014-08-02 Thread Jean-Baptiste Kempf 
npapi-vlc | branch: master | Jean-Baptiste Kempf  | Sat Aug  
2 21:30:29 2014 +0200| [50faeb01554f949fca32e4e2c1c7907eb7ba33a5] | committer: 
Jean-Baptiste Kempf

NPAPI: accept fullscreenenabled as param

Ref #11487

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

 npapi/vlcplugin_base.cpp |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/npapi/vlcplugin_base.cpp b/npapi/vlcplugin_base.cpp
index c240249..9c7ea17 100644
--- a/npapi/vlcplugin_base.cpp
+++ b/npapi/vlcplugin_base.cpp
@@ -167,7 +167,8 @@ NPError VlcPluginBase::init(int argc, char* const argn[], 
char* const argv[])
 set_autoplay(boolValue(argv[i]));
 }
 else if( !strcmp( argn[i], "fullscreen" )
-  || !strcmp( argn[i], "allowfullscreen" ) )
+  || !strcmp( argn[i], "allowfullscreen" )
+  || !strcmp( argn[i], "fullscreenenabled" ) )
 {
 set_enable_fs( boolValue(argv[i]) );
 }

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

[vlc-commits] ActiveX: accept some tags like NPAPI

2014-08-02 Thread Jean-Baptiste Kempf 
npapi-vlc | branch: master | Jean-Baptiste Kempf  | Sat Aug  
2 21:28:39 2014 +0200| [fa985c4353fe2972caa046a3f0ee64ff11680d72] | committer: 
Jean-Baptiste Kempf

ActiveX: accept some tags like NPAPI

Notably controls and target

Ref #11487

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

 activex/persistpropbag.cpp |   42 ++
 1 file changed, 42 insertions(+)

diff --git a/activex/persistpropbag.cpp b/activex/persistpropbag.cpp
index f0f842e..eb0be5c 100644
--- a/activex/persistpropbag.cpp
+++ b/activex/persistpropbag.cpp
@@ -79,6 +79,15 @@ STDMETHODIMP VLCPersistPropertyBag::Load(LPPROPERTYBAG 
pPropBag, LPERRORLOG pErr
 _p_instance->setMRL(V_BSTR(&value));
 VariantClear(&value);
 }
+else
+{
+V_VT(&value) = VT_BSTR;
+if( S_OK == pPropBag->Read(OLESTR("target"), &value, 
pErrorLog) )
+{
+_p_instance->setMRL(V_BSTR(&value));
+VariantClear(&value);
+}
+}
 }
 }
 
@@ -107,6 +116,18 @@ STDMETHODIMP VLCPersistPropertyBag::Load(LPPROPERTYBAG 
pPropBag, LPERRORLOG pErr
 _p_instance->setShowToolbar(V_BOOL(&value) != VARIANT_FALSE);
 VariantClear(&value);
 }
+else
+{
+/*
+** try alternative syntax
+*/
+V_VT(&value) = VT_BOOL;
+if( S_OK == pPropBag->Read(OLESTR("controls"), &value, pErrorLog) )
+{
+_p_instance->setShowToolbar(V_BOOL(&value) != VARIANT_FALSE);
+VariantClear(&value);
+}
+}
 
 SIZEL size = _p_instance->getExtent();
 V_VT(&value) = VT_I4;
@@ -218,6 +239,27 @@ STDMETHODIMP VLCPersistPropertyBag::Load(LPPROPERTYBAG 
pPropBag, LPERRORLOG pErr
 _p_instance->get_options().set_enable_fs(V_BOOL(&value) != 
VARIANT_FALSE);
 VariantClear(&value);
 }
+else
+{
+/*
+** try alternative syntax
+*/
+V_VT(&value) = VT_BOOL;
+if( S_OK == pPropBag->Read(OLESTR("allowfullscreen"), &value, 
pErrorLog) )
+{
+_p_instance->get_options().set_enable_fs(V_BOOL(&value) != 
VARIANT_FALSE);
+VariantClear(&value);
+}
+else
+{
+V_VT(&value) = VT_BOOL;
+if( S_OK == pPropBag->Read(OLESTR("fullscreen"), &value, 
pErrorLog) )
+{
+_p_instance->get_options().set_enable_fs(V_BOOL(&value) != 
VARIANT_FALSE);
+VariantClear(&value);
+}
+}
+}
 
 return _p_instance->onLoad();
 };

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

[vlc-commits] XPI: use unpack for the dll

2014-08-02 Thread Jean-Baptiste Kempf 
npapi-vlc | branch: master | Jean-Baptiste Kempf  | Sat Aug  
2 21:23:58 2014 +0200| [8103f00ebc36075c81328647a36c235aefa507a7] | committer: 
Jean-Baptiste Kempf

XPI: use unpack for the dll

See #11856

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

 npapi/package/install.rdf.in |1 +
 1 file changed, 1 insertion(+)

diff --git a/npapi/package/install.rdf.in b/npapi/package/install.rdf.in
index 1fbe12a..50002fd 100644
--- a/npapi/package/install.rdf.in
+++ b/npapi/package/install.rdf.in
@@ -3,6 +3,7 @@
 vlc-plu...@videolan.org
 VLC Web Plugin
 
@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_REVISION@@VERSION_EXTRA@
+true
 
   
 {ec8030f7-c20a-464f-9b0e-13a3a9e97384}

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

[vlc-commits] Win32: Correctly layout the files for the XPI

2014-08-02 Thread Jean-Baptiste Kempf 
vlc | branch: master | Jean-Baptiste Kempf  | Sat Aug  2 
21:26:08 2014 +0200| [70e212146138688b9cb5c4df1f545ea91c2cac2a] | committer: 
Jean-Baptiste Kempf

Win32: Correctly layout the files for the XPI

Close #11856

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

 extras/package/win32/package.mak |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/extras/package/win32/package.mak b/extras/package/win32/package.mak
index 0b7abf8..489024c 100644
--- a/extras/package/win32/package.mak
+++ b/extras/package/win32/package.mak
@@ -106,12 +106,12 @@ package-win-strip: package-win-common
 
 
 package-win32-webplugin-common: package-win-strip
-   mkdir -p "$(win32_xpi_destdir)/"
-   cp -r $(win32_destdir)/plugins/ "$(win32_xpi_destdir)/"
-   find $(prefix) -maxdepth 4 -name "*$(LIBEXT)" -exec cp {} 
"$(win32_xpi_destdir)/" \;
+   mkdir -p "$(win32_xpi_destdir)/plugins/"
+   cp -r $(win32_destdir)/plugins/ "$(win32_xpi_destdir)/plugins/"
+   cp "$(win32_destdir)/libvlc.dll" "$(win32_destdir)/libvlccore.dll" 
"$(win32_destdir)/npvlc.dll" "$(win32_xpi_destdir)/plugins/"
cp $(top_builddir)/npapi-vlc/npapi/package/npvlc.dll.manifest 
"$(win32_xpi_destdir)/plugins/"
cp "$(top_srcdir)/extras/package/win32/libvlc.dll.manifest" 
"$(win32_xpi_destdir)/plugins/"
-   rm -rf "$(win32_xpi_destdir)/plugins/gui/"
+   rm -rf "$(win32_xpi_destdir)/plugins/plugins/gui/"
 
 
 package-win32-xpi: package-win32-webplugin-common

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

[vlc-commits] contrib: jpeg: remove OS X patch

2014-08-02 Thread Sean McGovern 
vlc | branch: master | Sean McGovern  | Mon Jul 28 19:59:21 
2014 -0400| [6299f6fcce8f70e57b50e89b0c35f9354805d73c] | committer: Felix Paul 
Kühne

contrib: jpeg: remove OS X patch

It has been resolved differently as of jpeglib v9a.

Signed-off-by: Felix Paul Kühne 

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

 contrib/src/jpeg/osx.patch |   14 --
 contrib/src/jpeg/rules.mak |1 -
 2 files changed, 15 deletions(-)

diff --git a/contrib/src/jpeg/osx.patch b/contrib/src/jpeg/osx.patch
deleted file mode 100644
index 0346b20..000
--- a/contrib/src/jpeg/osx.patch
+++ /dev/null
@@ -1,14 +0,0 @@
 jpeg/jconfig.cfg.orig  2013-12-25 22:16:42.133723909 +0100
-+++ jpeg/jconfig.cfg   2013-12-25 22:16:33.087314469 +0100
-@@ -25,6 +25,11 @@
- #define HAVE_BOOLEAN  /* prevent jmorecfg.h from redefining it */
- #endif
- 
-+#ifdef __APPLE__
-+typedef unsigned char boolean;
-+#define HAVE_BOOLEAN
-+#endif
-+
- #ifdef JPEG_INTERNALS
- 
- #undef RIGHT_SHIFT_IS_UNSIGNED
diff --git a/contrib/src/jpeg/rules.mak b/contrib/src/jpeg/rules.mak
index be80435..9f94e41 100644
--- a/contrib/src/jpeg/rules.mak
+++ b/contrib/src/jpeg/rules.mak
@@ -13,7 +13,6 @@ jpeg: jpegsrc.v$(JPEG_VERSION).tar.gz .sum-jpeg
$(UNPACK)
mv jpeg-$(JPEG_VERSION) jpegsrc.v$(JPEG_VERSION)
$(UPDATE_AUTOCONFIG)
-   $(APPLY) $(SRC)/jpeg/osx.patch
$(MOVE)
 
 .jpeg: jpeg

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