[vlc-commits] extras: fix PATH variable for contrib executables in macOS build script
vlc/vlc-3.0 | branch: master | Felix Paul Kühne | Fri Dec 4
07:21:34 2020 +0100| [e2561ffde991a0b96e3618cdc6aa0bd68ecaf885] | committer:
Felix Paul Kühne
extras: fix PATH variable for contrib executables in macOS build script
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=e2561ffde991a0b96e3618cdc6aa0bd68ecaf885
---
extras/package/macosx/build.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/extras/package/macosx/build.sh b/extras/package/macosx/build.sh
index 625438a048..c89b8d582b 100755
--- a/extras/package/macosx/build.sh
+++ b/extras/package/macosx/build.sh
@@ -151,7 +151,7 @@ export RANLIB="`xcrun --find ranlib`"
export STRINGS="`xcrun --find strings`"
export STRIP="`xcrun --find strip`"
export SDKROOT
-export
PATH="${vlcroot}/extras/tools/build/bin:${vlcroot}/contrib/${TRIPLET}/bin:$python3Path:${VLC_PATH}:/bin:/sbin:/usr/bin:/usr/sbin"
+export
PATH="${vlcroot}/extras/tools/build/bin:${vlcroot}/contrib/${BUILD_TRIPLET}/bin:$python3Path:${VLC_PATH}:/bin:/sbin:/usr/bin:/usr/sbin"
# Select avcodec flavor to compile contribs with
export USE_FFMPEG=1
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] extras: macOS build script cosmetics
vlc/vlc-3.0 | branch: master | Felix Paul Kühne | Fri Dec 4
07:20:44 2020 +0100| [c9048edc4aba2eaa8f5b92baa8b8daf411128ce9] | committer:
Felix Paul Kühne
extras: macOS build script cosmetics
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=c9048edc4aba2eaa8f5b92baa8b8daf411128ce9
---
extras/package/macosx/build.sh | 13 +
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/extras/package/macosx/build.sh b/extras/package/macosx/build.sh
index d836a324c8..625438a048 100755
--- a/extras/package/macosx/build.sh
+++ b/extras/package/macosx/build.sh
@@ -123,7 +123,11 @@ if [ "$QUIET" = "yes" ]; then
out="/dev/null"
fi
-info "Building VLC for the Mac OS X"
+BUILD_TRIPLET=$BUILD_ARCH-apple-darwin$OSX_KERNELVERSION
+HOST_TRIPLET=$ARCH-apple-darwin$OSX_KERNELVERSION
+ACTUAL_ARCH=`get_actual_arch $ARCH`
+
+info "Building VLC for macOS for architecture ${ACTUAL_ARCH} on a
${BUILD_ARCH} device"
spushd `dirname $0`/../../..
vlcroot=`pwd`
@@ -133,10 +137,6 @@ builddir=`pwd`
info "Building in \"$builddir\""
-BUILD_TRIPLET=$BUILD_ARCH-apple-darwin$OSX_KERNELVERSION
-HOST_TRIPLET=$ARCH-apple-darwin$OSX_KERNELVERSION
-ACTUAL_ARCH=`get_actual_arch $ARCH`
-
python3Path=$(echo /Library/Frameworks/Python.framework/Versions/3.*/bin | awk
'{print $1;}')
if [ ! -d "$python3Path" ]; then
python3Path=""
@@ -153,7 +153,6 @@ export STRIP="`xcrun --find strip`"
export SDKROOT
export
PATH="${vlcroot}/extras/tools/build/bin:${vlcroot}/contrib/${TRIPLET}/bin:$python3Path:${VLC_PATH}:/bin:/sbin:/usr/bin:/usr/sbin"
-
# Select avcodec flavor to compile contribs with
export USE_FFMPEG=1
@@ -310,7 +309,6 @@ if [ "${vlcroot}/configure" -nt Makefile ]; then
$VLC_CONFIGURE_ARGS > $out
fi
-
#
# make
#
@@ -326,7 +324,6 @@ make -j$JOBS
info "Preparing VLC.app"
make VLC.app
-
if [ "$PACKAGETYPE" = "u" ]; then
info "Copying app with debug symbols into VLC-debug.app and stripping"
rm -rf VLC-debug.app
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] ftp: fix handling of NLST response
vlc/vlc-3.0 | branch: master | Ilya Yanok | Wed Dec 2
22:42:27 2020 +0100| [28bfc8c49581456c8e3ca4410691d6230cdc554d] | committer:
Thomas Guillem
ftp: fix handling of NLST response
Commit e1508444 broke the NLST response handling: getting
1xx response is what we actually expect, not a reason to fail.
This was reported as Android-specific bug:
https://code.videolan.org/videolan/vlc-android/-/issues/644
two years ago and is still not fixed.
This is invisible if FTP server supports MSLT feature.
(cherry picked from commit bd1ded483a180ca093a003c080b75d2fa72131aa)
Signed-off-by: Thomas Guillem
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=28bfc8c49581456c8e3ca4410691d6230cdc554d
---
modules/access/ftp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/access/ftp.c b/modules/access/ftp.c
index cda4d67014..0aea13ac95 100644
--- a/modules/access/ftp.c
+++ b/modules/access/ftp.c
@@ -1154,7 +1154,7 @@ static int ftp_StartStream( vlc_object_t *p_access,
access_sys_t *p_sys,
}
else
if( ftp_SendCommand( p_access, p_sys, "NLST" ) < 0 ||
-ftp_RecvCommandInit( p_access, p_sys ) == 1 )
+ftp_RecvCommandInit( p_access, p_sys ) != 1 )
{
msg_Err( p_access, "cannot list directory contents" );
return VLC_EGENERIC;
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] ftp: fix handling of NLST response
vlc | branch: master | Ilya Yanok | Wed Dec 2 22:42:27
2020 +0100| [bd1ded483a180ca093a003c080b75d2fa72131aa] | committer: Thomas
Guillem
ftp: fix handling of NLST response
Commit e1508444 broke the NLST response handling: getting
1xx response is what we actually expect, not a reason to fail.
This was reported as Android-specific bug:
https://code.videolan.org/videolan/vlc-android/-/issues/644
two years ago and is still not fixed.
This is invisible if FTP server supports MSLT feature.
Signed-off-by: Thomas Guillem
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=bd1ded483a180ca093a003c080b75d2fa72131aa
---
modules/access/ftp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/access/ftp.c b/modules/access/ftp.c
index 553e5b5ddb..d1de89ac13 100644
--- a/modules/access/ftp.c
+++ b/modules/access/ftp.c
@@ -1146,7 +1146,7 @@ static int ftp_StartStream( vlc_object_t *p_access,
access_sys_t *p_sys,
}
else
if( ftp_SendCommand( p_access, p_sys, "NLST" ) < 0 ||
-ftp_RecvCommandInit( p_access, p_sys ) == 1 )
+ftp_RecvCommandInit( p_access, p_sys ) != 1 )
{
msg_Err( p_access, "cannot list directory contents" );
return VLC_EGENERIC;
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] python: fix README.module example
vlc/python | branch: master | Olivier Aubert | Thu
Nov 19 23:31:40 2020 +0100| [22be2147440761f870514e3d473bae23abd7f89e] |
committer: Olivier Aubert
python: fix README.module example
Close #159
> http://git.videolan.org/gitweb.cgi/vlc/python.git/?a=commit;h=22be2147440761f870514e3d473bae23abd7f89e
---
README.module | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.module b/README.module
index e01f02c..e21a11f 100644
--- a/README.module
+++ b/README.module
@@ -49,9 +49,9 @@ You also can use wrapper methods closer to the original
libvlc API:
>>> import vlc
>>> i=vlc.Instance('--no-audio', '--fullscreen')
- >>> i.audio_get_volume()
- 50
>>> p=i.media_player_new()
+ >>> p.audio_get_volume()
+ 50
>>> m=i.media_new('file:///tmp/foo.avi')
>>> m.get_mrl()
'file:///tmp/foo.avi'
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] python: updates for macOS 11 Big Sur and PyCocoa 20.11.30. #163
vlc/python | branch: master | mrJean1 <22154337+mrje...@users.noreply.github.com> | Thu Dec 3 03:39:24 2020 -0500| [e919a30d3d706507e932f04378179d9361296e47] | committer: GitHub python: updates for macOS 11 Big Sur and PyCocoa 20.11.30. #163 > http://git.videolan.org/gitweb.cgi/vlc/python.git/?a=commit;h=e919a30d3d706507e932f04378179d9361296e47 --- examples/cocoavlc.py | 227 ++- 1 file changed, 154 insertions(+), 73 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/python.git/?a=commitdiff;h=e919a30d3d706507e932f04378179d9361296e47 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
