from:"Felix Paul Kühne"

[vlc-commits] package/apple: fix compilation on ARM-64

2021-02-16 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Mon Feb 15 13:48:17 
2021 +0100| [a089d8b795d5b77650f697eec9c8192ed6ada906] | committer: Felix Paul 
Kühne

package/apple: fix compilation on ARM-64

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

 extras/package/apple/build.sh | 16 
 1 file changed, 16 insertions(+)

diff --git a/extras/package/apple/build.sh b/extras/package/apple/build.sh
index 1868c8f1f4..4190938f86 100755
--- a/extras/package/apple/build.sh
+++ b/extras/package/apple/build.sh
@@ -57,6 +57,7 @@ VLC_HOST_ARCH="x86_64"
 # Host platform information
 VLC_HOST_PLATFORM=
 VLC_HOST_TRIPLET=
+VLC_BUILD_TRIPLET=
 # Set to "1" when building for simulator
 VLC_HOST_PLATFORM_SIMULATOR=
 # The host OS name (without the simulator suffix)
@@ -232,6 +233,18 @@ set_host_triplet()
 VLC_HOST_TRIPLET="${triplet_arch}-apple-darwin"
 }
 
+# Set the VLC_BUILD_TRIPLET based on the architecture
+# that we run on.
+# Globals:
+#   VLC_BUILD_TRIPLET
+# Arguments:
+#   None
+set_build_triplet()
+{
+local build_arch="$(uname -m | cut -d. -f1)"
+VLC_BUILD_TRIPLET="$(cc -arch "${build_arch}" -dumpmachine)"
+}
+
 # Take SDK name, verify it exists and populate
 # VLC_HOST_*, VLC_APPLE_SDK_PATH variables based
 # on the SDK and calls the set_deployment_target
@@ -490,6 +503,7 @@ validate_architecture "$VLC_HOST_ARCH"
 
 # Set triplet (needs to be called after validating the arch)
 set_host_triplet "$VLC_HOST_ARCH"
+set_build_triplet
 
 # Set pseudo-triplet
 # FIXME: This should match the actual clang triplet and should be used for 
compiler invocation too!
@@ -603,6 +617,7 @@ write_config_mak "-Werror=partial-availability"
 # Bootstrap contribs
 ../bootstrap \
 --host="$VLC_HOST_TRIPLET" \
+--build="$VLC_BUILD_TRIPLET" \
 --prefix="$VLC_CONTRIB_INSTALL_DIR" \
 "${VLC_CONTRIB_OPTIONS[@]}" \
 || abort_err "Bootstrapping contribs failed"
@@ -680,6 +695,7 @@ mkdir -p "$VLC_INSTALL_DIR"
 hostenv ../../configure \
 --with-contrib="$VLC_CONTRIB_INSTALL_DIR" \
 --host="$VLC_HOST_TRIPLET" \
+--build="$VLC_BUILD_TRIPLET" \
 --prefix="$VLC_INSTALL_DIR" \
 "${VLC_CONFIG_OPTIONS[@]}" \
  || abort_err "Configuring VLC failed"

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

[vlc-commits] lib: add libvlc_video_get_spu_text_scale API

2021-01-26 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Tue Oct 27 10:27:06 
2020 +0100| [f86b34707976b963270c781267378d0693abcd90] | committer: Felix Paul 
Kühne

lib: add libvlc_video_get_spu_text_scale API

This complements 67c4ffd5.

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

 include/vlc/libvlc_media_player.h | 11 +++
 lib/libvlc.sym|  1 +
 lib/video.c   | 12 
 3 files changed, 24 insertions(+)

diff --git a/include/vlc/libvlc_media_player.h 
b/include/vlc/libvlc_media_player.h
index 8dd85d1604..77cebe6d57 100644
--- a/include/vlc/libvlc_media_player.h
+++ b/include/vlc/libvlc_media_player.h
@@ -1788,6 +1788,17 @@ LIBVLC_API int libvlc_video_update_viewpoint( 
libvlc_media_player_t *p_mi,
  */
 LIBVLC_API int64_t libvlc_video_get_spu_delay( libvlc_media_player_t *p_mi );
 
+/**
+ * Get the current subtitle text scale
+ *
+ * The scale factor is expressed as a percentage of the default size, where
+ * 1.0 represents 100 percent.
+ *
+ * \param p_mi media player
+ * \version LibVLC 4.0.0 or later
+ */
+LIBVLC_API float libvlc_video_get_spu_text_scale( libvlc_media_player_t *p_mi 
);
+
 /**
  * Set the subtitle text scale.
  *
diff --git a/lib/libvlc.sym b/lib/libvlc.sym
index f30d67f3a9..2c145c59d3 100644
--- a/lib/libvlc.sym
+++ b/lib/libvlc.sym
@@ -245,6 +245,7 @@ libvlc_video_get_spu
 libvlc_video_get_spu_count
 libvlc_video_get_spu_delay
 libvlc_video_get_spu_description
+libvlc_video_get_spu_text_scale
 libvlc_video_get_teletext
 libvlc_video_get_track
 libvlc_video_get_track_count
diff --git a/lib/video.c b/lib/video.c
index e06adf143b..d3cba035d8 100644
--- a/lib/video.c
+++ b/lib/video.c
@@ -368,6 +368,18 @@ int libvlc_video_set_spu_delay( libvlc_media_player_t 
*p_mi,
 return 0;
 }
 
+float libvlc_video_get_spu_text_scale( libvlc_media_player_t *p_mi )
+{
+vlc_player_t *player = p_mi->player;
+vlc_player_Lock(player);
+
+unsigned scale = vlc_player_GetSubtitleTextScale(player);
+
+vlc_player_Unlock(player);
+
+return scale / 100.f;
+}
+
 void libvlc_video_set_spu_text_scale( libvlc_media_player_t *p_mi,
   float f_scale )
 {

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

[vlc-commits] extras/tools: remove yasm

2021-01-24 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Sun Jan 24 17:00:18 
2021 +0100| [2893809229ee93e763202b3c416b9ed7198abaf5] | committer: Felix Paul 
Kühne

extras/tools: remove yasm

This tool is no longer used by any contrib library.

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

 extras/tools/SHA512SUMS   |  1 -
 extras/tools/bootstrap|  1 -
 extras/tools/packages.mak |  3 ---
 extras/tools/tools.mak| 17 +
 4 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/extras/tools/SHA512SUMS b/extras/tools/SHA512SUMS
index 4f5979cbc9..cacaa2cd7a 100644
--- a/extras/tools/SHA512SUMS
+++ b/extras/tools/SHA512SUMS
@@ -11,7 +11,6 @@ 
f09440681e0c414f5ca669f3aebad09e0642f30a2e12c3199e7fb3da95a7dd17994fc54475c4
 
dbbb0bb348fac54612d29182c09c88bda7096dea03bd94f03c580c24146e65a06db12808c6a1a9adc94548fa3843511e3e80b251cb07142110cf149eab23f573
  sed-4.2.2.tar.bz2
 
3bc12441bebfc388017ad0632fb3e777ceaf62be82fb19ce771df8bbb765eb094dad336110189f49f5eaaebd4d6ced586098e1e3c8b9f7f775dc483d5513f209
  tar-1.26.tar.bz2
 
83c50b8949b7215ab650fc9bf335e684d4bb2738357e1d002f31cfe4c77f96072e45767a0126016363e0272db880c4a5bd35b280e6f5074a466882137a477c79
  xz-5.2.2.tar.bz2
-e80ace766e145f6486e76da1a5a9819221b7f406745a02529b4ad220ef7f51ddd67f23d0d8b187bffc9725d9f9742ae5f3a0bb23ee5b2a61153332fb3e286b77
  yasm-1.2.0.tar.gz
 
bbdc23e7772e49da1c7c47e66d4e4efbfbfe9b21dbc59bf3ad9a6e573eecac6c9f52c7f11a64be9897e8deb99ef7ba015164aa8232aa391b901dd7db03632412
  bison-3.0.4.tar.xz
 
e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdbd09bfd17d3452e6b9ef953a8c1137862ff671c97132a082e
  flex-2.6.4.tar.gz
 
611e573756e3e936ce16b456df9583eb9acae51a0fbd28212444ddc0c1c5ec21e893d7a666bd77ef53423024939291a31dcf86d129126fa707b729d80b24184d
  nasm-2.13.03.tar.gz
diff --git a/extras/tools/bootstrap b/extras/tools/bootstrap
index 8e3e035123..60e6a2f43b 100755
--- a/extras/tools/bootstrap
+++ b/extras/tools/bootstrap
@@ -134,7 +134,6 @@ check m4 1.4.16
 check libtool 2.4
 check pkg-config
 check cmake 3.17.0
-check yasm
 check_tar
 check ragel
 check_sed
diff --git a/extras/tools/packages.mak b/extras/tools/packages.mak
index 5a0e6e9537..74acd10793 100644
--- a/extras/tools/packages.mak
+++ b/extras/tools/packages.mak
@@ -3,9 +3,6 @@ APACHE=http://mir2.ovh.net/ftp.apache.org/dist
 SF= http://downloads.sourceforge.net/project
 VIDEOLAN=http://downloads.videolan.org/pub/contrib
 
-YASM_VERSION=1.2.0
-YASM_URL=http://www.tortall.net/projects/yasm/releases/yasm-$(YASM_VERSION).tar.gz
-
 NASM_VERSION=2.14
 
NASM_URL=http://www.nasm.us/pub/nasm/releasebuilds/$(NASM_VERSION)/nasm-$(NASM_VERSION).tar.gz
 
diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak
index c74e86bcf5..9b59470b99 100644
--- a/extras/tools/tools.mak
+++ b/extras/tools/tools.mak
@@ -53,22 +53,7 @@ MOVE = mv $(UNPACK_DIR) $@ && touch $@
 # package rules
 #
 
-# yasm
-
-yasm-$(YASM_VERSION).tar.gz:
-   $(call download_pkg,$(YASM_URL),yasm)
-
-yasm: yasm-$(YASM_VERSION).tar.gz
-   $(UNPACK)
-   $(MOVE)
-
-.buildyasm: yasm
-   (cd $<; ./configure --prefix=$(PREFIX) && $(MAKE) && $(MAKE) install)
-   touch $@
-
-CLEAN_FILE += .buildyasm
-CLEAN_PKG += yasm
-DISTCLEAN_PKG += yasm-$(YASM_VERSION).tar.gz
+# nasm
 
 nasm-$(NASM_VERSION).tar.gz:
$(call download_pkg,$(NASM_URL),nasm)

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

[vlc-commits] contrib/rust: disable compilation for macOS ARM-64

2020-12-17 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Mon Dec 14 06:58:58 
2020 +0100| [adc4d84607fa743b6e48f4888aba7b799788674e] | committer: Felix Paul 
Kühne

contrib/rust: disable compilation for macOS ARM-64

With the currently used version neither native nor cross-compilation appears to 
be supported.

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

 contrib/src/main-rust.mak | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/contrib/src/main-rust.mak b/contrib/src/main-rust.mak
index fe2be82724..104656ea3c 100644
--- a/contrib/src/main-rust.mak
+++ b/contrib/src/main-rust.mak
@@ -24,7 +24,9 @@ endif
 endif
 endif
 else ifdef HAVE_MACOSX
+ifneq ($(ARCH),aarch64) # macOS ARM-64 is unsupported
 RUST_TARGET = $(ARCH)-apple-darwin
+endif
 else ifdef HAVE_SOLARIS
 RUST_TARGET = x86_64-sun-solaris
 else ifdef HAVE_LINUX

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

[vlc-commits] extras: fix arch handling in macOS build script

2020-12-13 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Wed Dec  9 07:23:08 
2020 +0100| [26ea97a175b24aa3c493e95d07af69f717a22824] | committer: Felix Paul 
Kühne

extras: fix arch handling in macOS build script

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

 extras/package/macosx/build.sh | 32 +
 extras/package/macosx/env.build.sh | 72 +-
 2 files changed, 74 insertions(+), 30 deletions(-)

diff --git a/extras/package/macosx/build.sh b/extras/package/macosx/build.sh
index 69395ef5d0..18cde8bc4f 100755
--- a/extras/package/macosx/build.sh
+++ b/extras/package/macosx/build.sh
@@ -17,7 +17,6 @@ VLCBUILDDIR=""
 CORE_COUNT=`getconf NPROCESSORS_ONLN 2>&1`
 let JOBS=$CORE_COUNT+1
 
-
 usage()
 {
 cat << EOF
@@ -34,7 +33,7 @@ OPTIONS:
-pBuild packages for all artifacts
-i   Create an installable package (n: nightly, u: unsigned 
stripped release archive)
-k   Use the specified sdk (default: $SDKROOT)
-   -a  Use the specified arch (default: $ARCH)
+   -a  Use the specified arch (default: $HOST_ARCH)
-CUse the specified VLC build dir
-b   Enable breakpad support and send crash reports to this URL
-dDisable debug mode (on by default)
@@ -79,7 +78,7 @@ do
  PACKAGETYPE=$OPTARG
  ;;
  a)
- ARCH=$OPTARG
+ HOST_ARCH=$OPTARG
  ;;
  k)
  SDKROOT=$OPTARG
@@ -115,9 +114,13 @@ if [ "$QUIET" = "yes" ]; then
 out="/dev/null"
 fi
 
-info "Building VLC for the Mac OS X"
+ACTUAL_HOST_ARCH=`get_actual_arch $HOST_ARCH`
+BUILD_ARCH=`get_buildsystem_arch $BUILD_ARCH`
+
+info "Building VLC for macOS, architecture ${ACTUAL_HOST_ARCH} on a 
${BUILD_ARCH} device"
 
-TRIPLET=$(vlcGetTriplet)
+BUILD_TRIPLET=$(vlcGetBuildTriplet)
+HOST_TRIPLET=$(vlcGetHostTriplet)
 export SDKROOT
 vlcSetBaseEnvironment
 vlcroot="$(vlcGetRootDir)"
@@ -157,11 +160,11 @@ info "Building contribs"
 spushd "${vlcroot}/contrib"
 
 if [ "$REBUILD" = "yes" ]; then
-rm -rf contrib-$TRIPLET
-rm -rf $TRIPLET
+rm -rf contrib-$HOST_TRIPLET
+rm -rf $HOST_TRIPLET
 fi
-mkdir -p contrib-$TRIPLET && cd contrib-$TRIPLET
-../bootstrap --build=$TRIPLET --host=$TRIPLET > $out
+mkdir -p contrib-$HOST_TRIPLET && cd contrib-$HOST_TRIPLET
+../bootstrap --build=$BUILD_TRIPLET --host=$HOST_TRIPLET > $out
 
 if [ "$CONTRIBFROMSOURCE" = "yes" ]; then
 make list
@@ -182,6 +185,7 @@ spopd
 
 
 vlcUnsetContribEnvironment
+vlcSetLibVLCEnvironment
 
 #
 # vlc/bootstrap
@@ -214,8 +218,8 @@ fi
 if [ "${vlcroot}/configure" -nt Makefile ]; then
 
   ${vlcroot}/extras/package/macosx/configure.sh \
-  --build=$TRIPLET \
-  --host=$TRIPLET \
+  --build=$BUILD_TRIPLET \
+  --host=$HOST_TRIPLET \
   --with-macosx-version-min=$MINIMAL_OSX_VERSION \
   --with-macosx-sdk=$SDKROOT \
   $CONFIGFLAGS \
@@ -237,7 +241,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
@@ -248,14 +251,15 @@ if [ "$PACKAGETYPE" = "u" ]; then
 (cd VLC-debug.app/Contents/MacOS/lib/ && rm libvlccore.dylib && mv 
libvlccore.*.dylib libvlccore.dylib)
 (cd VLC-debug.app/Contents/MacOS/lib/ && rm libvlc.dylib && mv 
libvlc.*.dylib libvlc.dylib)
 
-
 find VLC.app/ -name "*.dylib" -exec strip -x {} \;
 find VLC.app/ -type f -name "VLC" -exec strip -x {} \;
 find VLC.app/ -type f -name "Sparkle" -exec strip -x {} \;
 find VLC.app/ -type f -name "Growl" -exec strip -x {} \;
 find VLC.app/ -type f -name "Breakpad" -exec strip -x {} \;
 
-bin/vlc-cache-gen VLC.app/Contents/MacOS/plugins
+if [ "$BUILD_TRIPLET" = "$HOST_TRIPLET" ]; then
+bin/vlc-cache-gen VLC.app/Contents/MacOS/plugins
+fi
 
 info "Building VLC release archive"
 make package-macosx-release
diff --git a/extras/package/macosx/env.build.sh 
b/extras/package/macosx/env.build.sh
index 755722fb9b..6bd0b4eca2 100755
--- a/extras/package/macosx/env.build.sh
+++ b/extras/package/macosx/env.build.sh
@@ -1,16 +1,40 @@
 #!/bin/bash
 
-ARCH="x86_64"
+HOST_ARCH="x86_64"
+BUILD_ARCH=`uname -m | cut -d. -f1`
 MINIMAL_OSX_VERSION="10.11"
 
+get_actual_arch() {
+if [ "$1" = "aarch64" ]; then
+echo "arm64"
+else
+echo "$1"
+fi
+}
+
+get_buildsystem_arch() {
+if [ "$1" = "arm64" ]; then
+echo "aarch64"
+

[vlc-commits] macosx: log if the process is translated and if the user tries to update, install the native binary

2020-12-09 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Tue Dec  8 18:02:19 
2020 +0100| [91179db394ade83d02fd12903a12224490328990] | committer: Felix Paul 
Kühne

macosx: log if the process is translated and if the user tries to update, 
install the native binary

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

 modules/gui/macosx/main/VLCMain.m | 58 ++-
 1 file changed, 57 insertions(+), 1 deletion(-)

diff --git a/modules/gui/macosx/main/VLCMain.m 
b/modules/gui/macosx/main/VLCMain.m
index d8141913e8..50ace85498 100644
--- a/modules/gui/macosx/main/VLCMain.m
+++ b/modules/gui/macosx/main/VLCMain.m
@@ -1,7 +1,7 @@
 /*
  * VLCMain.m: MacOS X interface module
  *
- * Copyright (C) 2002-2019 VLC authors and VideoLAN
+ * Copyright (C) 2002-2020 VLC authors and VideoLAN
  *
  * Authors: Derk-Jan Hartman 
  *      Felix Paul Kühne 
@@ -35,6 +35,7 @@
 #include   /* malloc(), free() */
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -80,6 +81,8 @@
 
 #ifdef HAVE_SPARKLE
 #import  /* we're the update delegate */
+NSString *const kIntel64UpdateURLString = 
@"https://update.videolan.org/vlc/sparkle/vlc-intel64.xml;;
+NSString *const kARM64UpdateURLString = 
@"https://update.videolan.org/vlc/sparkle/vlc-arm64.xml;;
 #endif
 
 NSString *VLCConfigurationChangedNotification = 
@"VLCConfigurationChangedNotification";
@@ -270,6 +273,26 @@ static VLCMain *sharedInstance = nil;
 [self migrateOldPreferences];
 
 _statusBarIcon = [[VLCStatusBarIcon alloc] init];
+
+/* on macOS 11 and later, check whether the user attempts to deploy
+ * the x86_64 binary on ARM-64 - if yes, log it */
+if (OSX_BIGSUR_AND_HIGHER) {
+if ([self processIsTranslated] > 0) {
+msg_Warn(getIntf(), "Process is translated!");
+}
+}
+}
+
+- (int)processIsTranslated
+{
+   int ret = 0;
+   size_t size = sizeof(ret);
+   if (sysctlbyname("sysctl.proc_translated", , , NULL, 0) == -1) {
+  if (errno == ENOENT)
+ return 0;
+  return -1;
+   }
+   return ret;
 }
 
 #pragma mark -
@@ -319,6 +342,39 @@ static VLCMain *sharedInstance = nil;
 
 return YES;
 }
+
+/* use the correct feed depending on the hardware architecture */
+- (nullable NSString *)feedURLStringForUpdater:(SUUpdater *)updater
+{
+#ifdef __x86_64__
+if (OSX_BIGSUR_AND_HIGHER) {
+if ([self processIsTranslated] > 0) {
+msg_Dbg(getIntf(), "Process is translated. On update, VLC will 
install the native ARM-64 binary.");
+return kARM64UpdateURLString;
+}
+}
+return kIntel64UpdateURLString;
+#elif __arm64__
+return kARM64UpdateURLString;
+#else
+#error unsupported architecture
+#endif
+}
+
+- (void)updaterDidNotFindUpdate:(SUUpdater *)updater
+{
+msg_Dbg(getIntf(), "No update found");
+}
+
+- (void)updater:(SUUpdater *)updater failedToDownloadUpdate:(SUAppcastItem 
*)item error:(NSError *)error
+{
+msg_Warn(getIntf(), "Failed to download update with error %li", 
error.code);
+}
+
+- (void)updater:(SUUpdater *)updater didAbortWithError:(NSError *)error
+{
+msg_Err(getIntf(), "Updater aborted with error %li", error.code);
+}
 #endif
 
 #pragma mark -

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

[vlc-commits] package/macosx: skip cache generation when cross-compiling

2020-12-09 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Wed Dec  9 17:30:14 
2020 +0100| [561d20cd912ad45210374a3c5dcc972f298a1ec2] | committer: Felix Paul 
Kühne

package/macosx: skip cache generation when cross-compiling

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

 extras/package/macosx/package.mak | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/extras/package/macosx/package.mak 
b/extras/package/macosx/package.mak
index c71879def2..609f5078b4 100644
--- a/extras/package/macosx/package.mak
+++ b/extras/package/macosx/package.mak
@@ -62,7 +62,11 @@ endif
cp "$(macos_destdir)$(prefix)/bin/vlc" $@/Contents/MacOS/VLC
install_name_tool -rpath "$(libdir)" "@executable_path/../Frameworks/" 
$@/Contents/MacOS/VLC
## Generate plugin cache
-   VLC_LIB_PATH="$@/Contents/Frameworks" bin/vlc-cache-gen 
$@/Contents/Frameworks/plugins
+   if test "$(build)" = "$(host)"; then \
+   VLC_LIB_PATH="$@/Contents/Frameworks" bin/vlc-cache-gen 
$@/Contents/Frameworks/plugins ; \
+   else \
+   echo "Cross-compilation: cache generation skipped!" ; \
+   fi
find $@ -type d -exec chmod ugo+rx '{}' \;
find $@ -type f -exec chmod ugo+r '{}' \;
 

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

[vlc-commits] macosx: add Big Sur detection

2020-12-09 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Mon Nov 30 17:07:29 
2020 +0100| [2d58cd600b8a45ca2d84285fc873bc482ea9be2c] | committer: Felix Paul 
Kühne

macosx: add Big Sur detection

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

 modules/gui/macosx/main/CompatibilityFixes.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/gui/macosx/main/CompatibilityFixes.h 
b/modules/gui/macosx/main/CompatibilityFixes.h
index e0a2eba8f3..93ccdc80c4 100644
--- a/modules/gui/macosx/main/CompatibilityFixes.h
+++ b/modules/gui/macosx/main/CompatibilityFixes.h
@@ -41,3 +41,5 @@ extern NSString *const 
NSCollectionViewSupplementaryElementKind;
 #endif
 
 NS_ASSUME_NONNULL_END
+
+#define OSX_BIGSUR_AND_HIGHER (NSAppKitVersionNumber >= 2022.00)

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

[vlc-commits] contrib/x264: fix cross-compilation for aarch64 on macOS

2020-12-09 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Sun Nov 29 20:12:39 
2020 +0100| [9dec73bf626928375762e1bfb8e6f4311de590ea] | committer: Felix Paul 
Kühne

contrib/x264: fix cross-compilation for aarch64 on macOS

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

 contrib/src/x264/rules.mak | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/contrib/src/x264/rules.mak b/contrib/src/x264/rules.mak
index d69f7508c5..26a8cc2fe6 100644
--- a/contrib/src/x264/rules.mak
+++ b/contrib/src/x264/rules.mak
@@ -45,7 +45,9 @@ X264_AS = AS="$(CC)"
 endif
 endif
 ifdef HAVE_CROSS_COMPILE
+ifndef HAVE_DARWIN_OS
 X264CONF += --cross-prefix="$(HOST)-"
+endif
 ifdef HAVE_ANDROID
 # broken text relocations
 ifeq ($(ANDROID_ABI), x86)
@@ -56,6 +58,11 @@ X264CONF += --disable-asm
 endif
 endif
 endif
+ifdef HAVE_DARWIN_OS
+ifeq ($(ARCH),aarch64)
+X264CONF += --extra-asflags="-arch $(PLATFORM_SHORT_ARCH)"
+endif
+endif
 
 $(TARBALLS)/x264-git.tar.xz:
$(call download_git,$(X264_GITURL))

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

[vlc-commits] contrib: fix architecture handling for macOS

2020-12-09 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Mon Nov 30 18:10:39 
2020 +0100| [6cebadc0b26352740f8fcea41d071ad23211dbc1] | committer: Felix Paul 
Kühne

contrib: fix architecture handling for macOS

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

 contrib/bootstrap | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/contrib/bootstrap b/contrib/bootstrap
index 8cd4c68f40..b65ea5788b 100755
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -272,6 +272,16 @@ case "${OS}" in
then
check_macosx_sdk
add_make_enabled "HAVE_MACOSX" "HAVE_DARWIN_OS" 
"HAVE_BSD"
+
+   case "${HOST}" in
+   *arm64*|*aarch64*)
+   add_make "PLATFORM_SHORT_ARCH := arm64"
+   add_make_enabled "HAVE_NEON"
+   ;;
+   *x86_64*)
+   add_make "PLATFORM_SHORT_ARCH := x86_64"
+   ;;
+   esac;
else
check_ios_sdk
add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" 
"HAVE_FPU"

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

[vlc-commits] macosx: log if the process is translated and if the user tries to update, install the native binary

2020-12-08 Thread Felix Paul Kühne

vlc/vlc-3.0 | branch: master | Felix Paul Kühne  | Tue Dec  8 
18:02:19 2020 +0100| [bb9ca188ebd72551f2463153f61c09ef783c0a9c] | committer: 
Felix Paul Kühne

macosx: log if the process is translated and if the user tries to update, 
install the native binary

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

 modules/gui/macosx/VLCMain.m | 35 ---
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/modules/gui/macosx/VLCMain.m b/modules/gui/macosx/VLCMain.m
index ef1f6f7c0e..7f10c3978a 100644
--- a/modules/gui/macosx/VLCMain.m
+++ b/modules/gui/macosx/VLCMain.m
@@ -35,6 +35,7 @@
 
 #include   /* malloc(), free() */
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -68,6 +69,8 @@
 
 #ifdef HAVE_SPARKLE
 #import  /* we're the update delegate */
+NSString *const kIntel64UpdateURLString = 
@"https://update.videolan.org/vlc/sparkle/vlc-intel64.xml;;
+NSString *const kARM64UpdateURLString = 
@"https://update.videolan.org/vlc/sparkle/vlc-arm64.xml;;
 #endif
 
 #pragma mark -
@@ -319,6 +322,26 @@ static VLCMain *sharedInstance = nil;
 if (kidsAround && var_GetBool(p_playlist, "playlist-autostart"))
 playlist_Control(p_playlist, PLAYLIST_PLAY, true);
 PL_UNLOCK;
+
+/* on macOS 11 and later, check whether the user attempts to deploy
+ * the x86_64 binary on ARM-64 - if yes, log it */
+if (OSX_BIGSUR_AND_HIGHER) {
+if ([self processIsTranslated] > 0) {
+msg_Warn(p_intf, "Process is translated!");
+}
+}
+}
+
+- (int)processIsTranslated
+{
+   int ret = 0;
+   size_t size = sizeof(ret);
+   if (sysctlbyname("sysctl.proc_translated", , , NULL, 0) == -1) {
+  if (errno == ENOENT)
+ return 0;
+  return -1;
+   }
+   return ret;
 }
 
 #pragma mark -
@@ -390,11 +413,17 @@ static VLCMain *sharedInstance = nil;
 - (nullable NSString *)feedURLStringForUpdater:(SUUpdater *)updater
 {
 #ifdef __x86_64__
-return @"https://update.videolan.org/vlc/sparkle/vlc-intel64.xml;;
+if (OSX_BIGSUR_AND_HIGHER) {
+if ([self processIsTranslated] > 0) {
+msg_Dbg(p_intf, "Process is translated. On update, VLC will 
install the native ARM-64 binary.");
+return kARM64UpdateURLString;
+}
+}
+return kIntel64UpdateURLString;
 #elif __arm64__
-return @"https://update.videolan.org/vlc/sparkle/vlc-arm64.xml;;
+return kARM64UpdateURLString;
 #else
-#warning unsupported architecture
+#error unsupported architecture
 #endif
 }
 

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

[vlc-commits] Update NEWS

2020-12-06 Thread Felix Paul Kühne

vlc/vlc-3.0 | branch: master | Felix Paul Kühne  | Mon Dec  7 
07:03:39 2020 +0100| [cd3f7a7578e56bf7ed40b48d04e37a328ceacc16] | committer: 
Felix Paul Kühne

Update NEWS

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

 NEWS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NEWS b/NEWS
index 83e4dba3dc..2baae88eef 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,7 @@ Video Output:
  * Direct3D11: Fix some potential crashes when using video filters
 
 macOS:
+ * Add native support for Apple Silicon / ARM-64
  * 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

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

[vlc-commits] macosx/sparkle: set feed URL based on architecture and add debug

2020-12-06 Thread Felix Paul Kühne

vlc/vlc-3.0 | branch: master | Felix Paul Kühne  | Mon Nov 30 
19:12:16 2020 +0100| [4fec28243a48c7a7b6cf1da598297f7274eabf2f] | committer: 
Felix Paul Kühne

macosx/sparkle: set feed URL based on architecture and add debug

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

 modules/gui/macosx/VLCMain.m | 29 -
 share/Info.plist.in  |  2 --
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/modules/gui/macosx/VLCMain.m b/modules/gui/macosx/VLCMain.m
index 3e08c48da9..ef1f6f7c0e 100644
--- a/modules/gui/macosx/VLCMain.m
+++ b/modules/gui/macosx/VLCMain.m
@@ -1,7 +1,7 @@
 /*
  * VLCMain.m: MacOS X interface module
  *
- * Copyright (C) 2002-2016 VLC authors and VideoLAN
+ * Copyright (C) 2002-2020 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Derk-Jan Hartman 
@@ -385,6 +385,33 @@ static VLCMain *sharedInstance = nil;
 
 return YES;
 }
+
+/* use the correct feed depending on the hardware architecture */
+- (nullable NSString *)feedURLStringForUpdater:(SUUpdater *)updater
+{
+#ifdef __x86_64__
+return @"https://update.videolan.org/vlc/sparkle/vlc-intel64.xml;;
+#elif __arm64__
+return @"https://update.videolan.org/vlc/sparkle/vlc-arm64.xml;;
+#else
+#warning unsupported architecture
+#endif
+}
+
+- (void)updaterDidNotFindUpdate:(SUUpdater *)updater
+{
+msg_Dbg(p_intf, "No update found");
+}
+
+- (void)updater:(SUUpdater *)updater failedToDownloadUpdate:(SUAppcastItem 
*)item error:(NSError *)error
+{
+msg_Warn(p_intf, "Failed to download update with error %li", error.code);
+}
+
+- (void)updater:(SUUpdater *)updater didAbortWithError:(NSError *)error
+{
+msg_Err(p_intf, "Updater aborted with error %li", error.code);
+}
 #endif
 
 #pragma mark -
diff --git a/share/Info.plist.in b/share/Info.plist.in
index 0fe1a4682d..711721fdee 100644
--- a/share/Info.plist.in
+++ b/share/Info.plist.in
@@ -1520,8 +1520,6 @@
VLCApplication
NSSupportsAutomaticGraphicsSwitching

-   SUFeedURL
-   https://update.videolan.org/vlc/sparkle/vlc-intel64.xml
SUPublicDSAKeyFile
dsa_pub.pem
UTExportedTypeDeclarations

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

[vlc-commits] package/macosx: skip cache generation when cross-compiling

2020-12-06 Thread Felix Paul Kühne

vlc/vlc-3.0 | branch: master | Felix Paul Kühne  | Sun Nov 29 
20:12:35 2020 +0100| [2234cf7263859ebbeb0eb9647c9af57e56a4a7a5] | committer: 
Felix Paul Kühne

package/macosx: skip cache generation when cross-compiling

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

 extras/package/macosx/package.mak | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/extras/package/macosx/package.mak 
b/extras/package/macosx/package.mak
index 1423d7874e..b56d68b372 100644
--- a/extras/package/macosx/package.mak
+++ b/extras/package/macosx/package.mak
@@ -61,7 +61,11 @@ endif
## Install binary
cp $(prefix)/bin/vlc $@/Contents/MacOS/VLC
## Generate plugin cache
-   bin/vlc-cache-gen $@/Contents/MacOS/plugins
+   if test "$(build)" = "$(host)"; then \
+   bin/vlc-cache-gen $@/Contents/MacOS/plugins ; \
+   else \
+   echo "Cross-compilation: cache generation skipped!" ; \
+   fi
find $@ -type d -exec chmod ugo+rx '{}' \;
find $@ -type f -exec chmod ugo+r '{}' \;
 

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

[vlc-commits] extras: fix native compilation for ARM-64 on macOS

2020-12-06 Thread Felix Paul Kühne

vlc/vlc-3.0 | branch: master | Felix Paul Kühne  | Sun Dec  6 
17:09:19 2020 +0100| [bdf8adeb05542e45492f117b57fdc1f33a6903e1] | committer: 
Felix Paul Kühne

extras: fix native compilation for ARM-64 on macOS

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

 extras/package/macosx/build.sh | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/extras/package/macosx/build.sh b/extras/package/macosx/build.sh
index c89b8d582b..bbfa66f444 100755
--- a/extras/package/macosx/build.sh
+++ b/extras/package/macosx/build.sh
@@ -63,6 +63,14 @@ get_actual_arch() {
 fi
 }
 
+get_buildsystem_arch() {
+if [ "$1" = "arm64" ]; then
+echo "aarch64"
+else
+echo "$1"
+fi
+}
+
 while getopts "hvrcpi:k:a:j:C:b:" OPTION
 do
  case $OPTION in
@@ -123,9 +131,10 @@ if [ "$QUIET" = "yes" ]; then
 out="/dev/null"
 fi
 
+ACTUAL_ARCH=`get_actual_arch $ARCH`
+BUILD_ARCH=`get_buildsystem_arch $BUILD_ARCH`
 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"
 

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

[vlc-commits] extras: fix PATH variable for contrib executables in macOS build script

2020-12-03 Thread Felix Paul Kühne

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

2020-12-03 Thread Felix Paul Kühne

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] contrib/vpx: update iOS patch to manually toggle bitcode support

2020-12-02 Thread Felix Paul Kühne

vlc/vlc-3.0 | branch: master | Felix Paul Kühne  | Mon Nov 30 
18:17:00 2020 +0100| [7a5400bcb5031cd1f0b9298116f55bd0fe5540c3] | committer: 
Felix Paul Kühne

contrib/vpx: update iOS patch to manually toggle bitcode support

Slightly change build rules to fix cross-compilation on macOS

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

 contrib/src/vpx/libvpx-ios.patch | 19 ---
 contrib/src/vpx/rules.mak| 13 +++--
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/contrib/src/vpx/libvpx-ios.patch b/contrib/src/vpx/libvpx-ios.patch
index 909d0be917..f24f2b9edb 100644
--- a/contrib/src/vpx/libvpx-ios.patch
+++ b/contrib/src/vpx/libvpx-ios.patch
@@ -1,6 +1,6 @@
-diff -ruw libvpx-1.9.0.orig/build/make/configure.sh 
libvpx-1.9.0/build/make/configure.sh
 libvpx-1.9.0.orig/build/make/configure.sh  2020-07-30 15:59:15.0 
-0400
-+++ libvpx-1.9.0/build/make/configure.sh   2020-09-01 09:32:08.722717206 
-0400
+diff -ru libvpx-1.9.0/build/make/configure.sh 
libvpx-1.9.0/build/make/configure.sh
+--- libvpx-1.9.0/build/make/configure.sh   2020-07-30 21:59:15.0 
+0200
 libvpx-1.9.0/build/make/configure.sh   2020-11-29 18:05:12.0 
+0100
 @@ -832,96 +832,6 @@
# PIC is probably what we want when building shared libs
enabled shared && soft_enable pic
@@ -111,3 +111,16 @@ diff -ruw libvpx-1.9.0.orig/build/make/configure.sh 
libvpx-1.9.0/build/make/conf
  for d in lib usr/lib usr/lib/system; do
try_dir="${alt_libc}/${d}"
[ -d "${try_dir}" ] && add_ldflags -L"${try_dir}"
+@@ -1133,12 +1037,6 @@
+ fi
+ ;;
+ esac
+-
+-if [ "$(show_darwin_sdk_major_version iphoneos)" -gt 8 ]; then
+-  check_add_cflags -fembed-bitcode
+-  check_add_asflags -fembed-bitcode
+-  check_add_ldflags -fembed-bitcode
+-fi
+   fi
+ 
+   asm_conversion_cmd="${source_path}/build/make/ads2gas_apple.pl"
diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index c1db45ffb7..0dc62d7610 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -127,24 +127,17 @@ VPX_CONF += --enable-pic
 else
 VPX_CONF += --extra-cflags="-mstackrealign"
 endif
-ifdef HAVE_MACOSX
-VPX_CONF += --extra-cflags="$(CFLAGS) $(EXTRA_CFLAGS)"
-endif
-ifdef HAVE_IOS
+ifdef HAVE_DARWIN_OS
 VPX_CONF += --enable-vp8-decoder --disable-tools
 VPX_CONF += --extra-cflags="$(CFLAGS) $(EXTRA_CFLAGS)"
+ifdef HAVE_IOS
 ifdef HAVE_TVOS
 VPX_LDFLAGS := -L$(IOS_SDK)/usr/lib -isysroot $(IOS_SDK) -mtvos-version-min=9.0
 else
 VPX_LDFLAGS := -L$(IOS_SDK)/usr/lib -isysroot $(IOS_SDK) 
-miphoneos-version-min=8.4
 endif
-ifeq ($(ARCH),aarch64)
-VPX_LDFLAGS += -arch arm64
-else
-ifndef HAVE_IOS
-VPX_LDFLAGS += -arch $(ARCH)
-endif
 endif
+VPX_LDFLAGS += -arch $(PLATFORM_SHORT_ARCH)
 endif
 
 ifneq ($(filter i386 x86_64,$(ARCH)),)

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

[vlc-commits] contrib/x264: fix cross-compilation for aarch64 on macOS

2020-12-02 Thread Felix Paul Kühne

vlc/vlc-3.0 | branch: master | Felix Paul Kühne  | Sun Nov 29 
20:12:39 2020 +0100| [7762094891a51bfb3cbea835ccc995bea48dcf0b] | committer: 
Felix Paul Kühne

contrib/x264: fix cross-compilation for aarch64 on macOS

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

 contrib/src/x264/rules.mak | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/contrib/src/x264/rules.mak b/contrib/src/x264/rules.mak
index 76dbe3440d..408d61c306 100644
--- a/contrib/src/x264/rules.mak
+++ b/contrib/src/x264/rules.mak
@@ -45,7 +45,9 @@ X264_AS = AS="$(CC)"
 endif
 endif
 ifdef HAVE_CROSS_COMPILE
+ifndef HAVE_DARWIN_OS
 X264CONF += --cross-prefix="$(HOST)-"
+endif
 ifdef HAVE_ANDROID
 # broken text relocations
 ifeq ($(ANDROID_ABI), x86)
@@ -56,6 +58,11 @@ X264CONF += --disable-asm
 endif
 endif
 endif
+ifdef HAVE_DARWIN_OS
+ifeq ($(ARCH),aarch64)
+X264CONF += --extra-asflags="-arch $(PLATFORM_SHORT_ARCH)"
+endif
+endif
 
 $(TARBALLS)/x262-git.tar.xz:
$(call download_git,$(X262_GITURL))

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

[vlc-commits] contrib/postproc: fix cross-compilation on macOS

2020-12-02 Thread Felix Paul Kühne

vlc/vlc-3.0 | branch: master | Felix Paul Kühne  | Sun Nov 29 
20:12:36 2020 +0100| [503bb5f94d64d07ede46a08882da491b01f4cd21] | committer: 
Felix Paul Kühne

contrib/postproc: fix cross-compilation on macOS

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

 contrib/src/postproc/rules.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/src/postproc/rules.mak b/contrib/src/postproc/rules.mak
index 62d2fbcbc1..080c322402 100644
--- a/contrib/src/postproc/rules.mak
+++ b/contrib/src/postproc/rules.mak
@@ -21,7 +21,7 @@ endif
 
 ifdef HAVE_CROSS_COMPILE
 POSTPROCCONF += --enable-cross-compile
-ifndef HAVE_IOS
+ifndef HAVE_DARWIN_OS
 POSTPROCCONF += --cross-prefix=$(HOST)-
 endif
 endif

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

[vlc-commits] extras: fix arch handling in macOS build script

2020-12-02 Thread Felix Paul Kühne

vlc/vlc-3.0 | branch: master | Felix Paul Kühne  | Mon Nov 30 
18:07:53 2020 +0100| [87f92cc8d8adca7f2f55770616089e81900d1b74] | committer: 
Felix Paul Kühne

extras: fix arch handling in macOS build script

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

 extras/package/macosx/build.sh | 41 ++---
 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/extras/package/macosx/build.sh b/extras/package/macosx/build.sh
index 87a3129bb5..d836a324c8 100755
--- a/extras/package/macosx/build.sh
+++ b/extras/package/macosx/build.sh
@@ -11,6 +11,7 @@ info()
 ARCH="x86_64"
 MINIMAL_OSX_VERSION="10.7"
 OSX_KERNELVERSION=`uname -r | cut -d. -f1`
+BUILD_ARCH=`uname -m | cut -d. -f1`
 SDKROOT=$(xcrun --show-sdk-path)
 VLCBUILDDIR=""
 
@@ -54,6 +55,14 @@ spopd()
 popd > /dev/null
 }
 
+get_actual_arch() {
+if [ "$1" = "aarch64" ]; then
+echo "arm64"
+else
+echo "$1"
+fi
+}
+
 while getopts "hvrcpi:k:a:j:C:b:" OPTION
 do
  case $OPTION in
@@ -124,16 +133,23 @@ builddir=`pwd`
 
 info "Building in \"$builddir\""
 
-TRIPLET=$ARCH-apple-darwin$OSX_KERNELVERSION
+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=""
 fi
 
+export AR="`xcrun --find ar`"
 export CC="`xcrun --find clang`"
 export CXX="`xcrun --find clang++`"
+export NM="`xcrun --find nm`"
 export OBJC="`xcrun --find clang`"
+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"
 
@@ -216,15 +232,15 @@ export CFLAGS="-Werror=partial-availability"
 export CXXFLAGS="-Werror=partial-availability"
 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 EXTRA_CFLAGS="-isysroot $SDKROOT 
-mmacosx-version-min=$MINIMAL_OSX_VERSION 
-DMACOSX_DEPLOYMENT_TARGET=$MINIMAL_OSX_VERSION -arch $ACTUAL_ARCH"
+export EXTRA_LDFLAGS="-Wl,-syslibroot,$SDKROOT 
-mmacosx-version-min=$MINIMAL_OSX_VERSION -isysroot $SDKROOT 
-DMACOSX_DEPLOYMENT_TARGET=$MINIMAL_OSX_VERSION -arch $ACTUAL_ARCH"
 # 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"
-mkdir -p contrib-$TRIPLET && cd contrib-$TRIPLET
-../bootstrap --build=$TRIPLET --host=$TRIPLET > $out
+mkdir -p contrib-$HOST_TRIPLET && cd contrib-$HOST_TRIPLET
+../bootstrap --build=$BUILD_TRIPLET --host=$HOST_TRIPLET > $out
 if [ "$REBUILD" = "yes" ]; then
 make clean
 fi
@@ -238,7 +254,7 @@ if [ "$CONTRIBFROMSOURCE" = "yes" ]; then
 fi
 
 else
-if [ ! -e "../$TRIPLET" ]; then
+if [ ! -e "../$HOST_TRIPLET" ]; then
 make prebuilt > $out
 fi
 fi
@@ -253,9 +269,10 @@ unset EXTRA_LDFLAGS
 unset XCODE_FLAGS
 
 # Enable debug symbols by default
-export CFLAGS="-g"
-export CXXFLAGS="-g"
-export OBJCFLAGS="-g"
+export CFLAGS="-g -arch $ACTUAL_ARCH"
+export CXXFLAGS="-g -arch $ACTUAL_ARCH"
+export OBJCFLAGS="-g -arch $ACTUAL_ARCH"
+export LDFLAGS="-arch $ACTUAL_ARCH"
 
 #
 # vlc/bootstrap
@@ -285,8 +302,8 @@ fi
 if [ "${vlcroot}/configure" -nt Makefile ]; then
 
   ${vlcroot}/extras/package/macosx/configure.sh \
-  --build=$TRIPLET \
-  --host=$TRIPLET \
+  --build=$BUILD_TRIPLET \
+  --host=$HOST_TRIPLET \
   --with-macosx-version-min=$MINIMAL_OSX_VERSION \
   --with-macosx-sdk=$SDKROOT \
   $CONFIGFLAGS \
@@ -327,7 +344,9 @@ if [ "$PACKAGETYPE" = "u" ]; then
 find VLC.app/ -type f -name "Growl" -exec strip -x {} \;
 find VLC.app/ -type f -name "Breakpad" -exec strip -x {} \;
 
+if [ "$BUILD_TRIPLET" = "$HOST_TRIPLET" ]; then
 bin/vlc-cache-gen VLC.app/Contents/MacOS/plugins
+fi
 
 info "Building VLC release archive"
 make package-macosx-release

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

[vlc-commits] macosx: add Big Sur detection

2020-12-02 Thread Felix Paul Kühne

vlc/vlc-3.0 | branch: master | Felix Paul Kühne  | Mon Nov 30 
17:07:29 2020 +0100| [9bfdc62bd7e0afb1b1b0b5a9cab62662ca466d68] | committer: 
Felix Paul Kühne

macosx: add Big Sur detection

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

 modules/gui/macosx/CompatibilityFixes.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/gui/macosx/CompatibilityFixes.h 
b/modules/gui/macosx/CompatibilityFixes.h
index 752205f84a..7433d447a0 100644
--- a/modules/gui/macosx/CompatibilityFixes.h
+++ b/modules/gui/macosx/CompatibilityFixes.h
@@ -1,7 +1,7 @@
 /*
  * CompatibilityFixes.h: MacOS X interface module
  *
- * Copyright (C) 2011-2019 VLC authors and VideoLAN
+ * Copyright (C) 2011-2020 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Felix Paul Kühne 
@@ -37,6 +37,7 @@ NS_ASSUME_NONNULL_BEGIN
 #define OSX_HIGH_SIERRA_AND_HIGHER (NSAppKitVersionNumber >= 1560)
 #define OSX_MOJAVE_AND_HIGHER (NSAppKitVersionNumber >= 1639.10)
 #define OSX_CATALINA_AND_HIGHER (NSAppKitVersionNumber >= 1894.00)
+#define OSX_BIGSUR_AND_HIGHER (NSAppKitVersionNumber >= 2022.00)
 
 // Sierra only APIs
 #ifndef MAC_OS_X_VERSION_10_12

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

[vlc-commits] contrib: fix architecture handling for macOS

2020-12-02 Thread Felix Paul Kühne

vlc/vlc-3.0 | branch: master | Felix Paul Kühne  | Mon Nov 30 
18:10:39 2020 +0100| [4e8d3f3eb953186c6ea6374c7c4573a289247ac2] | committer: 
Felix Paul Kühne

contrib: fix architecture handling for macOS

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

 contrib/bootstrap | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/contrib/bootstrap b/contrib/bootstrap
index 8b389bb747..4e0fd82a88 100755
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -282,6 +282,16 @@ case "${OS}" in
then
check_macosx_sdk
add_make_enabled "HAVE_MACOSX" "HAVE_DARWIN_OS" 
"HAVE_BSD"
+
+   case "${HOST}" in
+   *arm64*|*aarch64*)
+   add_make "PLATFORM_SHORT_ARCH := arm64"
+   add_make_enabled "HAVE_NEON"
+   ;;
+   *x86_64*)
+   add_make "PLATFORM_SHORT_ARCH := x86_64"
+   ;;
+   esac;
else
check_ios_sdk
add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" 
"HAVE_FPU"

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

[vlc-commits] contrib: disable rust for the 32bit Intel iOS simulator

2020-09-25 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Thu Sep 24 22:05:34 
2020 +0200| [c1d34ae51c0a5509410e1f01385bc7923d36592d] | committer: Felix Paul 
Kühne

contrib: disable rust for the 32bit Intel iOS simulator

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

 contrib/src/main-rust.mak | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/contrib/src/main-rust.mak b/contrib/src/main-rust.mak
index edd9c47467..36ca76d8ef 100644
--- a/contrib/src/main-rust.mak
+++ b/contrib/src/main-rust.mak
@@ -15,10 +15,12 @@ else ifdef HAVE_ANDROID
 RUST_TARGET = $(HOST)
 else ifdef HAVE_IOS
 ifneq ($(ARCH),arm) # iOS 32bit is Tier 3
+ifneq ($(ARCH),i386) # iOS 32bit is Tier 3
 ifndef HAVE_TVOS # tvOS is Tier 3
 RUST_TARGET = $(ARCH)-apple-ios
 endif
 endif
+endif
 else ifdef HAVE_MACOSX
 RUST_TARGET = $(ARCH)-apple-darwin
 else ifdef HAVE_SOLARIS

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

[vlc-commits] extras/tools: update meson

2020-09-15 Thread Felix Paul Kühne

vlc/vlc-3.0 | branch: master | Felix Paul Kühne  | Wed Sep  9 
11:32:13 2020 +0200| [aec2a0d3e1f9ef737ac868c0334393034aa6bbc0] | committer: 
Marvin Scholz

extras/tools: update meson

This solves compilation issues with contrib libraries using meson for future 
macOS architectures

(cherry picked from commit 1813caaf04639ee6b25f012da9f70f612e33b0ba)
Signed-off-by: Marvin Scholz 

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

 extras/tools/SHA512SUMS   | 2 +-
 extras/tools/packages.mak | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extras/tools/SHA512SUMS b/extras/tools/SHA512SUMS
index 86b7311c04..2447dd4796 100644
--- a/extras/tools/SHA512SUMS
+++ b/extras/tools/SHA512SUMS
@@ -16,5 +16,5 @@ 
bbdc23e7772e49da1c7c47e66d4e4efbfbfe9b21dbc59bf3ad9a6e573eecac6c9f52c7f11a64be98
 
e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdbd09bfd17d3452e6b9ef953a8c1137862ff671c97132a082e
  flex-2.6.4.tar.gz
 
8d23dde18525dccaa648ca01df40151e7f00cec4846bd611c8970dbcfc1fb57a453facfe4d41462e7c3c8bb548d44b961a04e4fc3073ab6b65063e53f42bf6fd
  nasm-2.14.tar.gz
 
d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b18b6931b2453cb60868ecbe07cc7d2984e5981a874b34942
  help2man-1.47.6.tar.xz
-ad5ec826879d3d85088ca40d768599a4c8e66983f2a6a7ebe8ab12051cad18b4ade9a2afd30fe543b0a75900822992c8ef7161d369489e2211dd7a1a8ccc32ed
  meson-0.54.2.tar.gz
+172b4de8c7474d709f172431b89bf2b2b1c2c38bc842039cccf6be075a45bd3509a1dab8512bc5b2ee025d65d8050d2f717dd15c1f9be17fca3b2e7da0d3e889
  meson-0.55.1.tar.gz
 
1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2
  ninja-1.8.2.tar.gz
diff --git a/extras/tools/packages.mak b/extras/tools/packages.mak
index 4f148068c4..51a4edd5e9 100644
--- a/extras/tools/packages.mak
+++ b/extras/tools/packages.mak
@@ -57,7 +57,7 @@ 
FLEX_URL=https://github.com/westes/flex/releases/download/v$(FLEX_VERSION)/flex-
 HELP2MAN_VERSION=1.47.6
 HELP2MAN_URL=$(GNU)/help2man/help2man-$(HELP2MAN_VERSION).tar.xz
 
-MESON_VERSION=0.54.2
+MESON_VERSION=0.55.1
 
MESON_URL=https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION)/meson-$(MESON_VERSION).tar.gz
 
 NINJA_VERSION=1.8.2

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

[vlc-commits] extras/tools: update meson

2020-09-11 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Wed Sep  9 11:32:13 
2020 +0200| [1813caaf04639ee6b25f012da9f70f612e33b0ba] | committer: Felix Paul 
Kühne

extras/tools: update meson

This solves compilation issues with contrib libraries using meson for future 
macOS architectures

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

 extras/tools/SHA512SUMS   | 2 +-
 extras/tools/packages.mak | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extras/tools/SHA512SUMS b/extras/tools/SHA512SUMS
index e3e02d8d3d..4f5979cbc9 100644
--- a/extras/tools/SHA512SUMS
+++ b/extras/tools/SHA512SUMS
@@ -19,4 +19,4 @@ 
e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdb
 
d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b18b6931b2453cb60868ecbe07cc7d2984e5981a874b34942
  help2man-1.47.6.tar.xz
 
8d23dde18525dccaa648ca01df40151e7f00cec4846bd611c8970dbcfc1fb57a453facfe4d41462e7c3c8bb548d44b961a04e4fc3073ab6b65063e53f42bf6fd
  nasm-2.14.tar.gz
 
1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2
  ninja-1.8.2.tar.gz
-ad5ec826879d3d85088ca40d768599a4c8e66983f2a6a7ebe8ab12051cad18b4ade9a2afd30fe543b0a75900822992c8ef7161d369489e2211dd7a1a8ccc32ed
  meson-0.54.2.tar.gz
+172b4de8c7474d709f172431b89bf2b2b1c2c38bc842039cccf6be075a45bd3509a1dab8512bc5b2ee025d65d8050d2f717dd15c1f9be17fca3b2e7da0d3e889
  meson-0.55.1.tar.gz
diff --git a/extras/tools/packages.mak b/extras/tools/packages.mak
index daad1ad2b2..5a0e6e9537 100644
--- a/extras/tools/packages.mak
+++ b/extras/tools/packages.mak
@@ -60,7 +60,7 @@ GETTEXT_URL=$(GNU)/gettext/gettext-$(GETTEXT_VERSION).tar.gz
 HELP2MAN_VERSION=1.47.6
 HELP2MAN_URL=$(GNU)/help2man/help2man-$(HELP2MAN_VERSION).tar.xz
 
-MESON_VERSION=0.54.2
+MESON_VERSION=0.55.1
 
MESON_URL=https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION)/meson-$(MESON_VERSION).tar.gz
 
 NINJA_VERSION=1.8.2

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

[vlc-commits] extras/tools: update yasm

2020-09-09 Thread Felix Paul Kühne

vlc/vlc-3.0 | branch: master | Felix Paul Kühne  | Wed Sep  9 
11:41:20 2020 +0200| [65726cca968bccb146f0e4573c63c0a8ade0c548] | committer: 
Felix Paul Kühne

extras/tools: update yasm

This fixes #25073 as it allows compilation of yasm on Darwin releases higher 
than 19.

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

 extras/tools/SHA512SUMS   | 2 +-
 extras/tools/packages.mak | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extras/tools/SHA512SUMS b/extras/tools/SHA512SUMS
index be51aa877d..86b7311c04 100644
--- a/extras/tools/SHA512SUMS
+++ b/extras/tools/SHA512SUMS
@@ -11,7 +11,7 @@ 
f09440681e0c414f5ca669f3aebad09e0642f30a2e12c3199e7fb3da95a7dd17994fc54475c4
 
dbbb0bb348fac54612d29182c09c88bda7096dea03bd94f03c580c24146e65a06db12808c6a1a9adc94548fa3843511e3e80b251cb07142110cf149eab23f573
  sed-4.2.2.tar.bz2
 
3bc12441bebfc388017ad0632fb3e777ceaf62be82fb19ce771df8bbb765eb094dad336110189f49f5eaaebd4d6ced586098e1e3c8b9f7f775dc483d5513f209
  tar-1.26.tar.bz2
 
83c50b8949b7215ab650fc9bf335e684d4bb2738357e1d002f31cfe4c77f96072e45767a0126016363e0272db880c4a5bd35b280e6f5074a466882137a477c79
  xz-5.2.2.tar.bz2
-e80ace766e145f6486e76da1a5a9819221b7f406745a02529b4ad220ef7f51ddd67f23d0d8b187bffc9725d9f9742ae5f3a0bb23ee5b2a61153332fb3e286b77
  yasm-1.2.0.tar.gz
+572d3b45568b10f58e48f1188c2d6bcbdd16429c8afaccc8c6d37859b45635e106885d679e41d0bee78c23822108c7ae75aa7475eed5ba58057e0a6fe1b68645
  yasm-1.3.0.tar.gz
 
bbdc23e7772e49da1c7c47e66d4e4efbfbfe9b21dbc59bf3ad9a6e573eecac6c9f52c7f11a64be9897e8deb99ef7ba015164aa8232aa391b901dd7db03632412
  bison-3.0.4.tar.xz
 
e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdbd09bfd17d3452e6b9ef953a8c1137862ff671c97132a082e
  flex-2.6.4.tar.gz
 
8d23dde18525dccaa648ca01df40151e7f00cec4846bd611c8970dbcfc1fb57a453facfe4d41462e7c3c8bb548d44b961a04e4fc3073ab6b65063e53f42bf6fd
  nasm-2.14.tar.gz
diff --git a/extras/tools/packages.mak b/extras/tools/packages.mak
index 416b05debe..4f148068c4 100644
--- a/extras/tools/packages.mak
+++ b/extras/tools/packages.mak
@@ -3,7 +3,7 @@ APACHE=http://mir2.ovh.net/ftp.apache.org/dist
 SF= http://downloads.sourceforge.net/project
 VIDEOLAN=http://downloads.videolan.org/pub/contrib
 
-YASM_VERSION=1.2.0
+YASM_VERSION=1.3.0
 
YASM_URL=http://www.tortall.net/projects/yasm/releases/yasm-$(YASM_VERSION).tar.gz
 
 NASM_VERSION=2.14

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

[vlc-commits] macosx/configure: drop enforced compiler optimization flags

2020-09-09 Thread Felix Paul Kühne

vlc/vlc-3.0 | branch: master | Felix Paul Kühne  | Tue Sep  8 
16:13:00 2020 +0200| [37e80e69c89a35a63d7bf014ea7df8568898d7a7] | committer: 
Felix Paul Kühne

macosx/configure: drop enforced compiler optimization flags

(cherry picked from commit d847aa818e363d437d0c342c8b72b3706d588460)

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

 extras/package/macosx/configure.sh | 11 ---
 1 file changed, 11 deletions(-)

diff --git a/extras/package/macosx/configure.sh 
b/extras/package/macosx/configure.sh
index 2b4868cc5b..e617ee2bd3 100755
--- a/extras/package/macosx/configure.sh
+++ b/extras/package/macosx/configure.sh
@@ -3,17 +3,6 @@
 CFLAGS=${CFLAGS}
 LDFLAGS=${LDFLAGS}
 
-case "${ARCH}" in
-x86_64*)
-CFLAGS="${CFLAGS} -m64 -march=core2 -mtune=core2"
-LDFLAGS="${LDFLAGS} -m64"
-;;
-*x86*)
-CFLAGS="${CFLAGS} -m32 -march=prescott -mtune=generic"
-LDFLAGS="${LDFLAGS} -m32"
-;;
-esac
-
 OPTIONS="
 --prefix=`pwd`/vlc_install_dir
 --enable-macosx

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

[vlc-commits] contrib/ncurses: update to the latest version

2020-09-09 Thread Felix Paul Kühne

vlc/vlc-3.0 | branch: master | Felix Paul Kühne  | Tue Sep  8 
16:22:12 2020 +0200| [abefd47d4b7da16cdd18b2eb6b7da6519d9be9de] | committer: 
Felix Paul Kühne

contrib/ncurses: update to the latest version

(cherry picked from commit 5fc2ca88c0c07278f7e6a893d582ea771605c4df)

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

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

diff --git a/contrib/src/ncurses/SHA512SUMS b/contrib/src/ncurses/SHA512SUMS
index 9a470e0b6d..e7a3468610 100644
--- a/contrib/src/ncurses/SHA512SUMS
+++ b/contrib/src/ncurses/SHA512SUMS
@@ -1 +1 @@
-d7c5e54b6d4d8b9211f0006ca8786f7609d180cc1aaebf4f25e7e35e12959779cf66447359a602daed625621ca32b0d910d67aef3eb8b6fdc3c373819a88faa1
  ncurses-5.9.tar.gz
+4c1333dcc30e858e8a9525d4b9aefb6cfc727bc4a1062bace06ffc4639ad9f6e54f6bdda0e3a0e5ea14de995f96b52b3327d9ec633608792c99a1e8d840d
  ncurses-6.2.tar.gz
diff --git a/contrib/src/ncurses/rules.mak b/contrib/src/ncurses/rules.mak
index 4b19f13b44..7b1d9989a0 100644
--- a/contrib/src/ncurses/rules.mak
+++ b/contrib/src/ncurses/rules.mak
@@ -1,6 +1,6 @@
 # ncurses
 
-NCURSES_VERSION := 5.9
+NCURSES_VERSION := 6.2
 NCURSES_URL := $(GNU)/ncurses/ncurses-$(NCURSES_VERSION).tar.gz
 
 ifdef HAVE_MACOSX

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

[vlc-commits] contrib/ncurses: update to the latest version

2020-09-09 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Tue Sep  8 16:22:12 
2020 +0200| [5fc2ca88c0c07278f7e6a893d582ea771605c4df] | committer: Felix Paul 
Kühne

contrib/ncurses: update to the latest version

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

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

diff --git a/contrib/src/ncurses/SHA512SUMS b/contrib/src/ncurses/SHA512SUMS
index 9a470e0b6d..e7a3468610 100644
--- a/contrib/src/ncurses/SHA512SUMS
+++ b/contrib/src/ncurses/SHA512SUMS
@@ -1 +1 @@
-d7c5e54b6d4d8b9211f0006ca8786f7609d180cc1aaebf4f25e7e35e12959779cf66447359a602daed625621ca32b0d910d67aef3eb8b6fdc3c373819a88faa1
  ncurses-5.9.tar.gz
+4c1333dcc30e858e8a9525d4b9aefb6cfc727bc4a1062bace06ffc4639ad9f6e54f6bdda0e3a0e5ea14de995f96b52b3327d9ec633608792c99a1e8d840d
  ncurses-6.2.tar.gz
diff --git a/contrib/src/ncurses/rules.mak b/contrib/src/ncurses/rules.mak
index 4b19f13b44..7b1d9989a0 100644
--- a/contrib/src/ncurses/rules.mak
+++ b/contrib/src/ncurses/rules.mak
@@ -1,6 +1,6 @@
 # ncurses
 
-NCURSES_VERSION := 5.9
+NCURSES_VERSION := 6.2
 NCURSES_URL := $(GNU)/ncurses/ncurses-$(NCURSES_VERSION).tar.gz
 
 ifdef HAVE_MACOSX

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

[vlc-commits] macosx/configure: drop enforced compiler optimization flags

2020-09-09 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Tue Sep  8 16:13:00 
2020 +0200| [d847aa818e363d437d0c342c8b72b3706d588460] | committer: Felix Paul 
Kühne

macosx/configure: drop enforced compiler optimization flags

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

 extras/package/macosx/configure.sh | 11 ---
 1 file changed, 11 deletions(-)

diff --git a/extras/package/macosx/configure.sh 
b/extras/package/macosx/configure.sh
index 3f60488b20..d7f35da600 100755
--- a/extras/package/macosx/configure.sh
+++ b/extras/package/macosx/configure.sh
@@ -6,17 +6,6 @@ SCRIPTDIR=$(dirname "$0")
 CFLAGS=${CFLAGS}
 LDFLAGS=${LDFLAGS}
 
-case "${ARCH}" in
-x86_64*)
-CFLAGS="${CFLAGS} -m64 -march=core2 -mtune=core2"
-LDFLAGS="${LDFLAGS} -m64"
-;;
-*x86*)
-CFLAGS="${CFLAGS} -m32 -march=prescott -mtune=generic"
-LDFLAGS="${LDFLAGS} -m32"
-;;
-esac
-
 OPTIONS="
 --prefix=/
 --enable-macosx

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

[vlc-commits] macosx/about: indicate the correct architecture

2020-09-08 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Tue Sep  8 16:29:40 
2020 +0200| [e1021bba8e9fce7b4d83b742301b2676e0cdb76b] | committer: Felix Paul 
Kühne

macosx/about: indicate the correct architecture

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

 modules/gui/macosx/windows/VLCAboutWindowController.m | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/gui/macosx/windows/VLCAboutWindowController.m 
b/modules/gui/macosx/windows/VLCAboutWindowController.m
index 76331dc0f9..94daa7740e 100644
--- a/modules/gui/macosx/windows/VLCAboutWindowController.m
+++ b/modules/gui/macosx/windows/VLCAboutWindowController.m
@@ -36,10 +36,11 @@
 
 #import "views/VLCScrollingClipView.h"
 
-
-/* this is a bit weird, but we should be confident that there will be more than
- * one arch to support again one day */
+#ifdef __x86_64__
 #define PLATFORM "Intel 64bit"
+#else
+#define PLATFORM "Apple Silicon"
+#endif
 
 @interface VLCAboutWindowController ()
 {

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

[vlc-commits] contrib/growl: add support for ARM64

2020-09-07 Thread Felix Paul Kühne

vlc/vlc-3.0 | branch: master | Felix Paul Kühne  | Mon Aug 31 
18:36:07 2020 +0200| [6084106daee5fb896ada35411bc261a88e2d4e55] | committer: 
Felix Paul Kühne

contrib/growl: add support for ARM64

This adds ARM64 as a valid arch and disable the treat-warning-as-error behavior.

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

 contrib/src/growl/growl-support-arm64.patch | 59 +
 contrib/src/growl/rules.mak |  1 +
 2 files changed, 60 insertions(+)

diff --git a/contrib/src/growl/growl-support-arm64.patch 
b/contrib/src/growl/growl-support-arm64.patch
new file mode 100644
index 00..59977ede1d
--- /dev/null
+++ b/contrib/src/growl/growl-support-arm64.patch
@@ -0,0 +1,59 @@
+--- growl/Growl.xcodeproj/project.pbxproj  2020-08-31 16:59:37.0 
+0200
 growl/Growl.xcodeproj/project.pbxproj  2020-08-31 18:32:49.0 
+0200
+@@ -502,6 +502,8 @@
+   isa = PBXBuildRule;
+   compilerSpec = com.apple.compilers.gcc.4_0;
+   fileType = sourcecode.c;
++  inputFiles = (
++  );
+   isEditable = 1;
+   outputFiles = (
+   );
+@@ -5448,6 +5450,7 @@
+   FRAMEWORK_VERSION = A;
+   GCC_PREFIX_HEADER = 
Framework/Source/GrowlFramework_Prefix.pch;
+   GCC_SYMBOLS_PRIVATE_EXTERN = NO;
++  GCC_TREAT_WARNINGS_AS_ERRORS = NO;
+   INFOPLIST_FILE = 
"Framework/Resources/Growl.framework-Info.plist";
+   INFOPLIST_PREPROCESS = YES;
+   INSTALL_PATH = "@executable_path/../Frameworks";
+@@ -5462,6 +5465,7 @@
+   );
+   PRODUCT_NAME = Growl;
+   SDKROOT = macosx;
++  VALID_ARCHS = "i386 x86_64 arm64";
+   WARNING_LDFLAGS = "-Wassign-intercept";
+   };
+   name = Localization;
+@@ -6169,6 +6173,7 @@
+   FRAMEWORK_VERSION = A;
+   GCC_PREFIX_HEADER = 
Framework/Source/GrowlFramework_Prefix.pch;
+   GCC_SYMBOLS_PRIVATE_EXTERN = NO;
++  GCC_TREAT_WARNINGS_AS_ERRORS = NO;
+   INFOPLIST_FILE = 
"Framework/Resources/Growl.framework-Info.plist";
+   INFOPLIST_PREPROCESS = YES;
+   INSTALL_PATH = "@executable_path/../Frameworks";
+@@ -6183,6 +6188,7 @@
+   );
+   PRODUCT_NAME = Growl;
+   SDKROOT = macosx;
++  VALID_ARCHS = "i386 x86_64 arm64";
+   WARNING_LDFLAGS = "-Wassign-intercept";
+   };
+   name = Debug;
+@@ -6198,6 +6204,7 @@
+   FRAMEWORK_VERSION = A;
+   GCC_PREFIX_HEADER = 
Framework/Source/GrowlFramework_Prefix.pch;
+   GCC_SYMBOLS_PRIVATE_EXTERN = NO;
++  GCC_TREAT_WARNINGS_AS_ERRORS = NO;
+   INFOPLIST_FILE = 
"Framework/Resources/Growl.framework-Info.plist";
+   INFOPLIST_PREPROCESS = YES;
+   INSTALL_PATH = "@executable_path/../Frameworks";
+@@ -6212,6 +6219,7 @@
+   );
+   PRODUCT_NAME = Growl;
+   SDKROOT = macosx;
++  VALID_ARCHS = "i386 x86_64 arm64";
+   WARNING_LDFLAGS = "-Wassign-intercept";
+   };
+   name = Release;
diff --git a/contrib/src/growl/rules.mak b/contrib/src/growl/rules.mak
index ed03d523e2..91d1e4ffa0 100644
--- a/contrib/src/growl/rules.mak
+++ b/contrib/src/growl/rules.mak
@@ -19,6 +19,7 @@ growl: GrowlSDK-$(GROWL_VERSION)-src.tar.gz .sum-growl
$(APPLY) $(SRC)/growl/growl-log-delegate.patch
$(APPLY) $(SRC)/growl/growl-partial-availability.diff
$(APPLY) $(SRC)/growl/growl-update-vcs-target.patch
+   $(APPLY) $(SRC)/growl/growl-support-arm64.patch
$(MOVE)
 
 .growl: growl

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

[vlc-commits] macosx/about: indicate the correct architecture

2020-09-07 Thread Felix Paul Kühne

vlc/vlc-3.0 | branch: master | Felix Paul Kühne  | Mon Aug 31 
19:02:39 2020 +0200| [ec5c988198bee28b25b4b2c67bbc8b23dff57bc4] | committer: 
Felix Paul Kühne

macosx/about: indicate the correct architecture

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

 modules/gui/macosx/VLCAboutWindowController.m | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/gui/macosx/VLCAboutWindowController.m 
b/modules/gui/macosx/VLCAboutWindowController.m
index a4badff8b5..bd0f6783f6 100644
--- a/modules/gui/macosx/VLCAboutWindowController.m
+++ b/modules/gui/macosx/VLCAboutWindowController.m
@@ -35,10 +35,11 @@
 
 #import "VLCScrollingClipView.h"
 
-
-/* this is a bit weird, but we should be confident that there will be more than
- * one arch to support again one day */
+#ifdef __x86_64__
 #define PLATFORM "Intel 64bit"
+#else
+#define PLATFORM "Apple Silicon"
+#endif
 
 @interface VLCAboutWindowController ()
 {

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

[vlc-commits] contrib/growl: fix compilation with modern Xcode

2020-09-07 Thread Felix Paul Kühne

vlc/vlc-3.0 | branch: master | Felix Paul Kühne  | Mon Aug 31 
16:53:58 2020 +0200| [cbce3053f26c4cf7e61b0fda840822e7abc2a39c] | committer: 
Felix Paul Kühne

contrib/growl: fix compilation with modern Xcode

This fixes the compilation when the Mac OS X 10.8 SDK is not available.

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

 contrib/src/growl/growl-update-vcs-target.patch | 26 +
 contrib/src/growl/rules.mak |  1 +
 2 files changed, 27 insertions(+)

diff --git a/contrib/src/growl/growl-update-vcs-target.patch 
b/contrib/src/growl/growl-update-vcs-target.patch
new file mode 100644
index 00..2d8841ab8c
--- /dev/null
+++ b/contrib/src/growl/growl-update-vcs-target.patch
@@ -0,0 +1,26 @@
+--- growl/Growl.xcodeproj/project.pbxproj  2012-12-12 07:18:11.0 
+0100
 growl/Growl.xcodeproj/project.pbxproj  2020-08-31 16:50:03.0 
+0200
+@@ -5667,6 +5667,7 @@
+   buildSettings = {
+   COMBINE_HIDPI_IMAGES = YES;
+   PRODUCT_NAME = Revision;
++  SDKROOT = macosx;
+   };
+   name = Localization;
+   };
+@@ -5794,6 +5795,7 @@
+   buildSettings = {
+   COMBINE_HIDPI_IMAGES = YES;
+   PRODUCT_NAME = Revision;
++  SDKROOT = macosx;
+   };
+   name = Debug;
+   };
+@@ -5803,6 +5805,7 @@
+   buildSettings = {
+   COMBINE_HIDPI_IMAGES = YES;
+   PRODUCT_NAME = Revision;
++  SDKROOT = macosx;
+   };
+   name = Release;
+   };
diff --git a/contrib/src/growl/rules.mak b/contrib/src/growl/rules.mak
index 2685041621..ed03d523e2 100644
--- a/contrib/src/growl/rules.mak
+++ b/contrib/src/growl/rules.mak
@@ -18,6 +18,7 @@ growl: GrowlSDK-$(GROWL_VERSION)-src.tar.gz .sum-growl
$(APPLY) $(SRC)/growl/security-nothanks.patch
$(APPLY) $(SRC)/growl/growl-log-delegate.patch
$(APPLY) $(SRC)/growl/growl-partial-availability.diff
+   $(APPLY) $(SRC)/growl/growl-update-vcs-target.patch
$(MOVE)
 
 .growl: growl

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

[vlc-commits] NEWS: updated for 3.0.12

2020-07-19 Thread Felix Paul Kühne

vlc/vlc-3.0 | branch: master | Felix Paul Kühne  | Sun Jul 19 
19:29:02 2020 +0200| [965d3a477a696a2b75e56867b5ead4377c9414e7] | committer: 
Felix Paul Kühne

NEWS: updated for 3.0.12

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

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

diff --git a/NEWS b/NEWS
index 960a99e3a5..82571f4262 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,18 @@
 Changes between 3.0.11 and 3.0.12:
 --
 
+Service Discovery:
+ * Fix listing of media on certain Panasonic recorders discovered via UPnP
+
 macOS:
  * Fix automatic playback resume with "Music" app
+ * Fix possible freeze after pause, seek, unpause
+
+Contribs:
+ * Updated gnutls to 3.6.14
+ * Updated libebml to 1.4.0
+ * Updated libmatroska to 1.6.0
+ * Updated mpg123 to 1.26.2
 
 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] upnp: add basic network interface discovery for iOS and tvOS

2020-07-13 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Mon Jul  6 13:57:55 
2020 +0200| [c4bb98bd0f55b8b18a3adfaa3f0a94ad66fd8bbf] | committer: Felix Paul 
Kühne

upnp: add basic network interface discovery for iOS and tvOS

This is a manual forward-port of a8e6a381.

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

 modules/services_discovery/upnp-wrapper.hpp | 41 +++--
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/modules/services_discovery/upnp-wrapper.hpp 
b/modules/services_discovery/upnp-wrapper.hpp
index ba132dc50b..f692552eae 100644
--- a/modules/services_discovery/upnp-wrapper.hpp
+++ b/modules/services_discovery/upnp-wrapper.hpp
@@ -337,7 +337,6 @@ done:
 
 #ifdef __APPLE__
 #include 
-#endif
 
 #if defined(TARGET_OS_OSX) && TARGET_OS_OSX
 #include 
@@ -364,7 +363,45 @@ inline char *getPreferedAdapter()
 return returnValue;
 }
 
-#else
+#else /* iOS and tvOS */
+
+inline bool necessaryFlagsSetOnInterface(struct ifaddrs *anInterface)
+{
+unsigned int flags = anInterface->ifa_flags;
+if( (flags & IFF_UP) && (flags & IFF_RUNNING) && !(flags & IFF_LOOPBACK) 
&& !(flags & IFF_POINTOPOINT) ) {
+return true;
+}
+return false;
+}
+
+inline char *getPreferedAdapter()
+{
+struct ifaddrs *listOfInterfaces;
+struct ifaddrs *anInterface;
+int ret = getifaddrs();
+char *adapterName = NULL;
+
+if (ret != 0) {
+return NULL;
+}
+
+anInterface = listOfInterfaces;
+while (anInterface != NULL) {
+bool ret = necessaryFlagsSetOnInterface(anInterface);
+if (ret) {
+adapterName = strdup(anInterface->ifa_name);
+break;
+}
+
+anInterface = anInterface->ifa_next;
+}
+freeifaddrs(listOfInterfaces);
+
+return adapterName;
+}
+#endif
+
+#else /* *nix and Android */
 
 inline char *getPreferedAdapter()
 {

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

[vlc-commits] upnp: restore default adapter lookup for Linux and Android

2020-07-09 Thread Felix Paul Kühne

vlc/vlc-3.0 | branch: master | Felix Paul Kühne  | Thu Jul  9 
15:12:05 2020 +0200| [dd404ea81ded6f542e19fe47ac54a37f6f9e445a] | committer: 
Felix Paul Kühne

upnp: restore default adapter lookup for Linux and Android

This addresses a build system regression in a8e6a381 and fixes #24943.

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

 modules/services_discovery/upnp.cpp | 13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/modules/services_discovery/upnp.cpp 
b/modules/services_discovery/upnp.cpp
index 9a905d2496..c00f2ea533 100644
--- a/modules/services_discovery/upnp.cpp
+++ b/modules/services_discovery/upnp.cpp
@@ -1539,7 +1539,6 @@ done:
 
 #ifdef __APPLE__
 #include 
-#endif
 
 #if defined(TARGET_OS_OSX) && TARGET_OS_OSX
 #include 
@@ -1600,7 +1599,8 @@ inline char *getPreferedAdapter()
 
 return returnValue;
 }
-#else
+
+#else /* iOS and tvOS */
 
 inline bool necessaryFlagsSetOnInterface(struct ifaddrs *anInterface)
 {
@@ -1637,6 +1637,15 @@ inline char *getPreferedAdapter()
 return adapterName;
 }
 
+#endif
+
+#else /* *nix and Android */
+
+inline char *getPreferedAdapter()
+{
+return NULL;
+}
+
 #endif
 #else
 

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

[vlc-commits] upnp: add basic network interface discovery for iOS and tvOS

2020-07-06 Thread Felix Paul Kühne

vlc/vlc-3.0 | branch: master | Felix Paul Kühne  | Wed Jul  1 
13:45:29 2020 +0200| [a8e6a381bd81bbe6838499bc8f1b68fef663f8cb] | committer: 
Felix Paul Kühne

upnp: add basic network interface discovery for iOS and tvOS

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

 modules/services_discovery/upnp.cpp | 34 --
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/modules/services_discovery/upnp.cpp 
b/modules/services_discovery/upnp.cpp
index d51a533b47..9a905d2496 100644
--- a/modules/services_discovery/upnp.cpp
+++ b/modules/services_discovery/upnp.cpp
@@ -1602,9 +1602,39 @@ inline char *getPreferedAdapter()
 }
 #else
 
-static char *getPreferedAdapter()
+inline bool necessaryFlagsSetOnInterface(struct ifaddrs *anInterface)
 {
-return NULL;
+unsigned int flags = anInterface->ifa_flags;
+if( (flags & IFF_UP) && (flags & IFF_RUNNING) && !(flags & IFF_LOOPBACK) 
&& !(flags & IFF_POINTOPOINT) ) {
+return true;
+}
+return false;
+}
+
+inline char *getPreferedAdapter()
+{
+struct ifaddrs *listOfInterfaces;
+struct ifaddrs *anInterface;
+int ret = getifaddrs();
+char *adapterName = NULL;
+
+if (ret != 0) {
+return NULL;
+}
+
+anInterface = listOfInterfaces;
+while (anInterface != NULL) {
+bool ret = necessaryFlagsSetOnInterface(anInterface);
+if (ret) {
+adapterName = strdup(anInterface->ifa_name);
+break;
+}
+
+anInterface = anInterface->ifa_next;
+}
+freeifaddrs(listOfInterfaces);
+
+return adapterName;
 }
 
 #endif

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

[vlc-commits] tools: fix libtool bootstapping on macOS

2020-06-18 Thread Felix Paul Kühne

vlc/vlc-3.0 | branch: master | Felix Paul Kühne  | Wed Jul 17 
10:34:47 2019 +0200| [30475295967e713369aee6f4cee9a956cd498a72] | committer: 
Steve Lhomme

tools: fix libtool bootstapping on macOS

(cherry picked from commit c2acdb2d4d5b9267c65fd81285f842a2f8712358)
Signed-off-by: Steve Lhomme 

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

 extras/tools/tools.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak
index 94375c748c..ffe1d166d7 100644
--- a/extras/tools/tools.mak
+++ b/extras/tools/tools.mak
@@ -131,7 +131,7 @@ libtool: libtool-$(LIBTOOL_VERSION).tar.gz
$(APPLY) $(TOOLS)/libtool-2.4.6-san.patch
$(APPLY) $(TOOLS)/libtool-2.4.6-clang-libs.patch
$(APPLY) $(TOOLS)/libtool-2.4.6-response-files.patch
-   (cd $(UNPACK_DIR) && autoreconf)
+   (cd $(UNPACK_DIR) && autoreconf -fv)
$(MOVE)
 
 .buildlibtool: libtool .automake .help2man

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

[vlc-commits] macosx/configure: setup environment before configuring

2020-05-02 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Thu Apr 30 14:31:25 
2020 +0200| [7418c568021777fbd1b8e1e941853b3344fd8ad8] | committer: Felix Paul 
Kühne

macosx/configure: setup environment before configuring

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

 extras/package/macosx/configure.sh | 5 +
 1 file changed, 5 insertions(+)

diff --git a/extras/package/macosx/configure.sh 
b/extras/package/macosx/configure.sh
index 5bd06de79c..3f60488b20 100755
--- a/extras/package/macosx/configure.sh
+++ b/extras/package/macosx/configure.sh
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+SCRIPTDIR=$(dirname "$0")
+. "$SCRIPTDIR/env.build.sh" "none"
+
 CFLAGS=${CFLAGS}
 LDFLAGS=${LDFLAGS}
 
@@ -39,4 +42,6 @@ OPTIONS="
 export CFLAGS
 export LDFLAGS
 
+vlcSetSymbolEnvironment
+
 sh "$(dirname $0)"/../../../configure ${OPTIONS} "$@"

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

[vlc-commits] macosx/media library: add missing sanity checks

2020-04-30 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Thu Apr 30 15:06:30 
2020 +0200| [8ae48d5606d413f9c1dfd66a9f6030e386a884e9] | committer: Felix Paul 
Kühne

macosx/media library: add missing sanity checks

This unbreaks playback if the media library is disabled at runtime.

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

 modules/gui/macosx/library/VLCLibraryDataTypes.m | 21 +
 1 file changed, 21 insertions(+)

diff --git a/modules/gui/macosx/library/VLCLibraryDataTypes.m 
b/modules/gui/macosx/library/VLCLibraryDataTypes.m
index 5aee788748..167ecaf38e 100644
--- a/modules/gui/macosx/library/VLCLibraryDataTypes.m
+++ b/modules/gui/macosx/library/VLCLibraryDataTypes.m
@@ -187,6 +187,9 @@ NSString *VLCMediaLibraryMediaItemLibraryID = 
@"VLCMediaLibraryMediaItemLibraryI
 return nil;
 }
 vlc_medialibrary_t *p_mediaLibrary = vlc_ml_instance_get(p_intf);
+if (!p_mediaLibrary) {
+return nil;
+}
 vlc_ml_artist_t *p_artist = vlc_ml_get_artist(p_mediaLibrary, artistID);
 VLCMediaLibraryArtist *artist = nil;
 if (p_artist) {
@@ -238,6 +241,9 @@ NSString *VLCMediaLibraryMediaItemLibraryID = 
@"VLCMediaLibraryMediaItemLibraryI
 return @[];
 }
 vlc_medialibrary_t *p_mediaLibrary = vlc_ml_instance_get(p_intf);
+if (!p_mediaLibrary) {
+return @[];
+}
 vlc_ml_media_list_t *p_mediaList = 
vlc_ml_list_album_tracks(p_mediaLibrary, NULL, _albumID);
 NSMutableArray *mutableArray = [[NSMutableArray alloc] 
initWithCapacity:p_mediaList->i_nb_items];
 for (size_t x = 0; x < p_mediaList->i_nb_items; x++) {
@@ -300,6 +306,9 @@ NSString *VLCMediaLibraryMediaItemLibraryID = 
@"VLCMediaLibraryMediaItemLibraryI
 return nil;
 }
 vlc_medialibrary_t *p_mediaLibrary = vlc_ml_instance_get(p_intf);
+if (!p_mediaLibrary) {
+return nil;
+}
 vlc_ml_media_t *p_mediaItem = vlc_ml_get_media(p_mediaLibrary, libraryID);
 VLCMediaLibraryMediaItem *returnValue = nil;
 if (p_mediaItem) {
@@ -315,6 +324,9 @@ NSString *VLCMediaLibraryMediaItemLibraryID = 
@"VLCMediaLibraryMediaItemLibraryI
 return nil;
 }
 vlc_medialibrary_t *p_mediaLibrary = vlc_ml_instance_get(p_intf);
+if (!p_mediaLibrary) {
+return nil;
+}
 vlc_ml_media_t *p_mediaItem = vlc_ml_get_media_by_mrl(p_mediaLibrary,
   [[url 
absoluteString] UTF8String]);
 VLCMediaLibraryMediaItem *returnValue = nil;
@@ -331,6 +343,9 @@ NSString *VLCMediaLibraryMediaItemLibraryID = 
@"VLCMediaLibraryMediaItemLibraryI
 return nil;
 }
 vlc_medialibrary_t *p_mediaLibrary = vlc_ml_instance_get(p_intf);
+if (!p_mediaLibrary) {
+return nil;
+}
 if (p_mediaItem != NULL && p_mediaLibrary != NULL) {
 return [self initWithMediaItem:p_mediaItem library:p_mediaLibrary];
 }
@@ -409,6 +424,9 @@ NSString *VLCMediaLibraryMediaItemLibraryID = 
@"VLCMediaLibraryMediaItemLibraryI
 return nil;
 }
 vlc_medialibrary_t *p_mediaLibrary = vlc_ml_instance_get(p_intf);
+if (!p_mediaLibrary) {
+return nil;
+}
 vlc_ml_media_t *p_media = vlc_ml_new_external_media(p_mediaLibrary, 
urlString.UTF8String);
 if (p_media) {
 self = [self initWithMediaItem:p_media library:p_mediaLibrary];
@@ -429,6 +447,9 @@ NSString *VLCMediaLibraryMediaItemLibraryID = 
@"VLCMediaLibraryMediaItemLibraryI
 return nil;
 }
 vlc_medialibrary_t *p_mediaLibrary = vlc_ml_instance_get(p_intf);
+if (!p_mediaLibrary) {
+return nil;
+}
 vlc_ml_media_t *p_media = vlc_ml_new_stream(p_mediaLibrary, 
urlString.UTF8String);
 if (p_media) {
 self = [self initWithMediaItem:p_media library:p_mediaLibrary];

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

[vlc-commits] macosx/playback continuity: cosmetics

2020-04-30 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Thu Apr 30 15:09:13 
2020 +0200| [37717908e48e5739f9ec434bc09a319f6fac0028] | committer: Felix Paul 
Kühne

macosx/playback continuity: cosmetics

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

 .../macosx/playlist/VLCPlaybackContinuityController.m  | 18 ++
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/modules/gui/macosx/playlist/VLCPlaybackContinuityController.m 
b/modules/gui/macosx/playlist/VLCPlaybackContinuityController.m
index e8de840e63..d9a719c6d7 100644
--- a/modules/gui/macosx/playlist/VLCPlaybackContinuityController.m
+++ b/modules/gui/macosx/playlist/VLCPlaybackContinuityController.m
@@ -1,7 +1,7 @@
 /*
  * VLCPlaybackContinuityController.m: MacOS X interface module
  *
- * Copyright (C) 2015-2019 VLC authors and VideoLAN
+ * Copyright (C) 2015-2020 VLC authors and VideoLAN
  *
  * Authors: Felix Paul Kühne 
  *  David Fuhrmann 
@@ -36,6 +36,8 @@ static const float MinimumStorePercent = 0.05;
 static const float MaximumStorePercent = 0.95;
 static const int64_t MinimumStoreTime = 60 * 1000;
 static const int64_t MinimumStoreRemainingTime = 60 * 1000;
+static NSString *VLCRecentlyPlayedMediaKey = @"recentlyPlayedMedia";
+static NSString *VLCRecentlyPlayedMediaListKey = @"recentlyPlayedMediaList";
 
 @interface VLCPlaybackContinuityController()
 {
@@ -50,8 +52,8 @@ static const int64_t MinimumStoreRemainingTime = 60 * 1000;
 {
 NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
 NSDictionary *appDefaults = [NSDictionary dictionaryWithObjectsAndKeys:
- [NSArray array], @"recentlyPlayedMediaList",
- [NSDictionary dictionary], 
@"recentlyPlayedMedia", nil];
+ [NSArray array], 
VLCRecentlyPlayedMediaListKey,
+ [NSDictionary dictionary], 
VLCRecentlyPlayedMediaKey, nil];
 
 [defaults registerDefaults:appDefaults];
 }
@@ -218,7 +220,7 @@ static const int64_t MinimumStoreRemainingTime = 60 * 1000;
  ask:(BOOL)ask
   player:(VLCPlayerController 
*)playerController
 {
-NSDictionary *recentlyPlayedFiles = [[NSUserDefaults standardUserDefaults] 
objectForKey:@"recentlyPlayedMedia"];
+NSDictionary *recentlyPlayedFiles = [[NSUserDefaults standardUserDefaults] 
objectForKey:VLCRecentlyPlayedMediaKey];
 if (!recentlyPlayedFiles)
 return;
 
@@ -301,13 +303,13 @@ BOOL ShouldStorePlaybackPosition(float position, int64_t 
duration)
  withPlayer:(VLCPlayerController 
*)playerController
 {
 NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-NSMutableDictionary *mutDict = [[NSMutableDictionary alloc] 
initWithDictionary:[defaults objectForKey:@"recentlyPlayedMedia"]];
+NSMutableDictionary *mutDict = [[NSMutableDictionary alloc] 
initWithDictionary:[defaults objectForKey:VLCRecentlyPlayedMediaKey]];
 
 float relativePos = playerController.position;
 long long pos = SEC_FROM_VLC_TICK(playerController.time);
 long long dur = SEC_FROM_VLC_TICK(inputItem.duration);
 
-NSMutableArray *mediaList = [[defaults 
objectForKey:@"recentlyPlayedMediaList"] mutableCopy];
+NSMutableArray *mediaList = [[defaults 
objectForKey:VLCRecentlyPlayedMediaListKey] mutableCopy];
 NSString *mrl = inputItem.MRL;
 
 if (ShouldStorePlaybackPosition(relativePos, dur*1000)) {
@@ -327,8 +329,8 @@ BOOL ShouldStorePlaybackPosition(float position, int64_t 
duration)
 [mutDict removeObjectForKey:mrl];
 [mediaList removeObject:mrl];
 }
-[defaults setObject:mutDict forKey:@"recentlyPlayedMedia"];
-[defaults setObject:mediaList forKey:@"recentlyPlayedMediaList"];
+[defaults setObject:mutDict forKey:VLCRecentlyPlayedMediaKey];
+[defaults setObject:mediaList forKey:VLCRecentlyPlayedMediaListKey];
 }
 
 @end

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

[vlc-commits] caopengllayer: fix moving window with mouse

2020-04-29 Thread Felix Paul Kühne

vlc/vlc-3.0 | branch: master | Felix Paul Kühne  | Wed Apr 29 
18:32:07 2020 +0200| [7c74e968f48879f615b43c1be9d555b78098773d] | committer: 
Felix Paul Kühne

caopengllayer: fix moving window with mouse

This fixes #24646

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

 modules/video_output/caopengllayer.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/video_output/caopengllayer.m 
b/modules/video_output/caopengllayer.m
index 6a360d6d40..aef7b538f7 100644
--- a/modules/video_output/caopengllayer.m
+++ b/modules/video_output/caopengllayer.m
@@ -624,7 +624,7 @@ shouldInheritContentsScale:(CGFloat)newScale
 
 - (BOOL)mouseDownCanMoveWindow
 {
-return NO;
+return YES;
 }
 
 

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

[vlc-commits] contrib/ffmpeg: fix iOS cross compilation

2020-04-21 Thread Felix Paul Kühne

vlc/vlc-3.0 | branch: master | Felix Paul Kühne  | Wed Jul 17 
13:58:07 2019 +0200| [b7574279cb092e20946dbc49b9e01ce185ea32c3] | committer: 
Hugo Beauzée-Luyssen

contrib/ffmpeg: fix iOS cross compilation

(cherry picked from commit 44d007a9bbe629572f8ade692b24395e8c96439c)
Signed-off-by: Hugo Beauzée-Luyssen 

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

 contrib/src/ffmpeg/rules.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 82fcc9955f..4db97585ea 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -144,7 +144,7 @@ ifeq ($(ARCH),x86_64)
 FFMPEGCONF += --cpu=core2
 endif
 ifdef HAVE_IOS
-FFMPEGCONF += --enable-pic --extra-ldflags="$(EXTRA_CFLAGS)"
+FFMPEGCONF += --enable-pic --extra-ldflags="$(EXTRA_CFLAGS) -isysroot 
$(IOS_SDK)"
 ifdef HAVE_NEON
 FFMPEGCONF += --as="$(AS)"
 endif

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

[vlc-commits] tools: meson: use the latest 0.53.1 release

2020-03-24 Thread Felix Paul Kühne

vlc/vlc-3.0 | branch: master | Felix Paul Kühne  | Mon Jul 22 
12:09:41 2019 +0200| [485da9d58191bb6032288a4ecbb9624f69d22a8d] | committer: 
Hugo Beauzée-Luyssen

tools: meson: use the latest 0.53.1 release

(cherry picked from commit bc3cfde09963fb63b443440708bef422cf134ba1)
Signed-off-by: Hugo Beauzée-Luyssen 

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

 extras/tools/SHA512SUMS   | 2 +-
 extras/tools/bootstrap| 2 +-
 extras/tools/packages.mak | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/extras/tools/SHA512SUMS b/extras/tools/SHA512SUMS
index abc6410fe0..7fd6d37e1c 100644
--- a/extras/tools/SHA512SUMS
+++ b/extras/tools/SHA512SUMS
@@ -15,5 +15,5 @@ 
e80ace766e145f6486e76da1a5a9819221b7f406745a02529b4ad220ef7f51ddd67f23d0d8b187bf
 
bbdc23e7772e49da1c7c47e66d4e4efbfbfe9b21dbc59bf3ad9a6e573eecac6c9f52c7f11a64be9897e8deb99ef7ba015164aa8232aa391b901dd7db03632412
  bison-3.0.4.tar.xz
 
e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdbd09bfd17d3452e6b9ef953a8c1137862ff671c97132a082e
  flex-2.6.4.tar.gz
 
8d23dde18525dccaa648ca01df40151e7f00cec4846bd611c8970dbcfc1fb57a453facfe4d41462e7c3c8bb548d44b961a04e4fc3073ab6b65063e53f42bf6fd
  nasm-2.14.tar.gz
-ba4921530049f002c362bc420bd87181074893109ce4b1fedb18545227d27ea96c09798eb02f1f8fabbf6ac5c185b0b7eca42df2a34ad0559f95a97d78811702
  meson-0.48.1.tar.gz
+0c96c354bcd7e6945473c7df0ddff929ef2bae9c2dfc7b48c6c6174c7f2be4f798398929f9c4d5986aa5fc882305ff76371ad0d65a499f058b33b05ff7025859
  meson-0.53.1.tar.gz
 
1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2
  ninja-1.8.2.tar.gz
diff --git a/extras/tools/bootstrap b/extras/tools/bootstrap
index 8e5cae9b7a..5989705c50 100755
--- a/extras/tools/bootstrap
+++ b/extras/tools/bootstrap
@@ -105,7 +105,7 @@ check xz
 check bison 3.0.0
 check flex
 check_nasm 2.13.02
-check meson 0.48.1
+check meson 0.51.1
 check ninja
 
 [ -n "$NEEDED" ] && mkdir -p build/bin && echo "To-be-built packages: `echo 
$NEEDED | sed 's/\.//g'`"
diff --git a/extras/tools/packages.mak b/extras/tools/packages.mak
index ffe91ee980..64f9326d56 100644
--- a/extras/tools/packages.mak
+++ b/extras/tools/packages.mak
@@ -54,7 +54,7 @@ BISON_URL=$(GNU)/bison/bison-$(BISON_VERSION).tar.xz
 FLEX_VERSION=2.6.4
 
FLEX_URL=https://github.com/westes/flex/releases/download/v$(FLEX_VERSION)/flex-$(FLEX_VERSION).tar.gz
 
-MESON_VERSION=0.48.1
+MESON_VERSION=0.53.1
 
MESON_URL=https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION)/meson-$(MESON_VERSION).tar.gz
 
 NINJA_VERSION=1.8.2

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

[vlc-commits] macosx/menu: replace implicit 10.14 dependency (closes #23694)

2020-02-02 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Sun Feb  2 16:23:20 
2020 +0100| [27a98ee4a92e429e73de9169fbe468b85a6a2940] | committer: Felix Paul 
Kühne

macosx/menu: replace implicit 10.14 dependency (closes #23694)

The itemArray property is settable in 10.14 and above only, so this commit adds 
a work-around to retain support with previous releases of macOS.

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

 .../package/macosx/VLC.xcodeproj/project.pbxproj   |  6 
 modules/gui/macosx/Makefile.am |  2 ++
 .../gui/macosx/extensions/NSMenu+VLCAdditions.h| 35 +++
 .../gui/macosx/extensions/NSMenu+VLCAdditions.m| 39 ++
 .../gui/macosx/library/VLCLibraryMenuController.m  |  5 +--
 .../macosx/playlist/VLCPlaylistMenuController.m|  3 +-
 po/POTFILES.in |  2 ++
 7 files changed, 89 insertions(+), 3 deletions(-)

diff --git a/extras/package/macosx/VLC.xcodeproj/project.pbxproj 
b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
index 3cd3787692..bc80f68022 100644
--- a/extras/package/macosx/VLC.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
@@ -169,6 +169,7 @@
7DE7232E22A51F8D00D72616 /* VLCPositionFormatter.m in Sources 
*/ = {isa = PBXBuildFile; fileRef = 7DE7232D22A51F8D00D72616 /* 
VLCPositionFormatter.m */; };
7DE82E7922843781002D341A /* VLCLibraryAlbumTableCellView.m in 
Sources */ = {isa = PBXBuildFile; fileRef = 7DE82E7822843781002D341A /* 
VLCLibraryAlbumTableCellView.m */; };
7DE9C7DD220728420089108F /* VLCPlayerController.m in Sources */ 
= {isa = PBXBuildFile; fileRef = 7DE9C7DC220728420089108F /* 
VLCPlayerController.m */; };
+   7DF0994F23E71E76007CA6EE /* NSMenu+VLCAdditions.m in Sources */ 
= {isa = PBXBuildFile; fileRef = 7DF0994E23E71E76007CA6EE /* 
NSMenu+VLCAdditions.m */; };
7DFBDCA82269E77500B700A5 /* VLCLibraryController.m in Sources 
*/ = {isa = PBXBuildFile; fileRef = 7DFBDCA72269E77500B700A5 /* 
VLCLibraryController.m */; };
7DFBDCAB2269E77F00B700A5 /* VLCLibraryModel.m in Sources */ = 
{isa = PBXBuildFile; fileRef = 7DFBDCAA2269E77F00B700A5 /* VLCLibraryModel.m 
*/; };
7DFBDCAE2269ED0C00B700A5 /* VLCLibraryVideoDataSource.m in 
Sources */ = {isa = PBXBuildFile; fileRef = 7DFBDCAD2269ED0C00B700A5 /* 
VLCLibraryVideoDataSource.m */; };
@@ -593,6 +594,8 @@
7DE9C7DC220728420089108F /* VLCPlayerController.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path 
= VLCPlayerController.m; sourceTree = ""; };
7DF0435E1972E26A0022B534 /* VLCAddonListItem.h */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.h; path = 
VLCAddonListItem.h; sourceTree = ""; };
7DF0435F1972E26A0022B534 /* VLCAddonListItem.m */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = 
VLCAddonListItem.m; sourceTree = ""; };
+   7DF0994D23E71E5B007CA6EE /* NSMenu+VLCAdditions.h */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.h; path = 
"NSMenu+VLCAdditions.h"; sourceTree = ""; };
+   7DF0994E23E71E76007CA6EE /* NSMenu+VLCAdditions.m */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = 
"NSMenu+VLCAdditions.m"; sourceTree = ""; };
7DF14FBC2270CB1C0008ABE4 /* 
VLCMediaSourceDeviceCollectionViewItem.xib */ = {isa = PBXFileReference; 
lastKnownFileType = file.xib; path = 
VLCMediaSourceDeviceCollectionViewItem.xib; sourceTree = ""; };
7DF812ED1B555A340052293C /* VLCPlaybackContinuityController.h 
*/ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = 
VLCPlaybackContinuityController.h; sourceTree = ""; };
7DF812EE1B555A340052293C /* VLCPlaybackContinuityController.m 
*/ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = 
VLCPlaybackContinuityController.m; sourceTree = ""; };
@@ -1026,6 +1029,8 @@
7D28E6382275B7340098D30E /* 
NSFont+VLCAdditions.m */,
7D404ABD2281892C00B28EF4 /* 
NSView+VLCAdditions.h */,
7D404ABE2281892C00B28EF4 /* 
NSView+VLCAdditions.m */,
+   7DF0994D23E71E5B007CA6EE /* 
NSMenu+VLCAdditions.h */,
+   7DF0994E23E71E76007CA6EE /* 
NSMenu+VLCAdditions.m */,
);
path = extensions;
sourceTree = "";
@@ -1823,6 +1828,7 @@
1C3113D51E508C6900D4DD76 /* 
VLCTextfieldPanelController.m in Sources */,
7DFBDCAE2269ED0C00B700A5 /* 
VLCLibraryVideoDataSource.m

[vlc-commits] macosx/video: replace API deprecated in 10.11

2020-02-02 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Fri Jan 31 13:05:23 
2020 +0100| [ea32acb9c6cc8d1784f85ee2c471bc4c81336a4c] | committer: Felix Paul 
Kühne

macosx/video: replace API deprecated in 10.11

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

 modules/gui/macosx/windows/video/VLCVideoOutputProvider.m |  8 
 modules/gui/macosx/windows/video/VLCVideoWindowCommon.m   | 12 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/gui/macosx/windows/video/VLCVideoOutputProvider.m 
b/modules/gui/macosx/windows/video/VLCVideoOutputProvider.m
index 9544c3e168..96a5ac53ed 100644
--- a/modules/gui/macosx/windows/video/VLCVideoOutputProvider.m
+++ b/modules/gui/macosx/windows/video/VLCVideoOutputProvider.m
@@ -314,7 +314,7 @@ int WindowOpen(vout_window_t *p_wnd)
 NSSize videoViewSize = NSMakeSize(videoViewPosition.size.width, 
videoViewPosition.size.height);
 
 // Avoid flashes if video will directly start in fullscreen
-NSDisableScreenUpdates();
+[NSAnimationContext beginGrouping];
 
 if (!videoWallpaper) {
 // set (only!) window origin if specified
@@ -373,7 +373,7 @@ int WindowOpen(vout_window_t *p_wnd)
 [self setFullscreen:1 forWindow:p_wnd withAnimation:NO];
 }
 
-NSEnableScreenUpdates();
+[NSAnimationContext endGrouping];
 
 return voutView;
 }
@@ -394,7 +394,7 @@ int WindowOpen(vout_window_t *p_wnd)
 [videoWindow setHasActiveVideo: NO];
 
 // prevent visible extra window if in fullscreen
-NSDisableScreenUpdates();
+[NSAnimationContext beginGrouping];
 BOOL b_native = var_InheritBool(getIntf(), "macosx-nativefullscreenmode");
 
 // close fullscreen, without changing fullscreen vars
@@ -412,7 +412,7 @@ int WindowOpen(vout_window_t *p_wnd)
 } else {
 [(VLCLibraryWindow *)videoWindow disableVideoPlaybackAppearance];
 }
-NSEnableScreenUpdates();
+[NSAnimationContext endGrouping];
 
 [_voutWindows removeObjectForKey:key];
 if ([_voutWindows count] == 0) {
diff --git a/modules/gui/macosx/windows/video/VLCVideoWindowCommon.m 
b/modules/gui/macosx/windows/video/VLCVideoWindowCommon.m
index bf4a5188d2..049a5b0d27 100644
--- a/modules/gui/macosx/windows/video/VLCVideoWindowCommon.m
+++ b/modules/gui/macosx/windows/video/VLCVideoWindowCommon.m
@@ -640,13 +640,13 @@ NSString *VLCWindowShouldShowController = 
@"VLCWindowShouldShowController";
 CGDisplayFade(token, 0.5, kCGDisplayBlendNormal, 
kCGDisplayBlendSolidColor, 0, 0, 0, YES);
 }
 
-NSDisableScreenUpdates();
+[NSAnimationContext beginGrouping];
 [[_videoView superview] replaceSubview:_videoView 
with:o_temp_view];
 [o_temp_view setFrame:[_videoView frame]];
 [[o_fullscreen_window contentView] addSubview:_videoView];
 [_videoView setFrame: [[o_fullscreen_window contentView] frame]];
 [_videoView setAutoresizingMask:NSViewWidthSizable | 
NSViewHeightSizable];
-NSEnableScreenUpdates();
+[NSAnimationContext endGrouping];
 
 [screen setFullscreenPresentationOptions];
 
@@ -668,7 +668,7 @@ NSString *VLCWindowShouldShowController = 
@"VLCWindowShouldShowController";
 }
 
 /* Make sure we don't see the _videoView disappearing of the screen 
during this operation */
-NSDisableScreenUpdates();
+[NSAnimationContext beginGrouping];
 [[_videoView superview] replaceSubview:_videoView with:o_temp_view];
 [o_temp_view setFrame:[_videoView frame]];
 [[o_fullscreen_window contentView] addSubview:_videoView];
@@ -676,7 +676,7 @@ NSString *VLCWindowShouldShowController = 
@"VLCWindowShouldShowController";
 [_videoView setAutoresizingMask:NSViewWidthSizable | 
NSViewHeightSizable];
 
 [o_fullscreen_window makeKeyAndOrderFront:self];
-NSEnableScreenUpdates();
+[NSAnimationContext endGrouping];
 }
 
 /* We are in fullscreen (and no animation is running) */
@@ -850,7 +850,7 @@ NSString *VLCWindowShouldShowController = 
@"VLCWindowShouldShowController";
 
 /* This function is private and should be only triggered at the end of the 
fullscreen change animation */
 /* Make sure we don't see the _videoView disappearing of the screen during 
this operation */
-NSDisableScreenUpdates();
+[NSAnimationContext beginGrouping];
 [_videoView removeFromSuperviewWithoutNeedingDisplay];
 [[o_temp_view superview] replaceSubview:o_temp_view with:_videoView];
 // TODO Replace tmpView by an existing view (e.g. middle view)
@@ -864,7 +864,7 @@ NSString *VLCWindowShouldShowController = 
@"VLCWindowShouldShowController";
 [self makeKeyAndOrderFront:self];
 
 [o_fullscreen_window orderOut: self];
-NSEnableScreenUpdates();
+[NS

[vlc-commits] macosx/hotkeys: fix compilation warnings

2020-02-02 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Fri Jan 31 12:42:27 
2020 +0100| [0239c119b1a71ead2292c71e40e95640b74b36d9] | committer: Felix Paul 
Kühne

macosx/hotkeys: fix compilation warnings

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

 modules/gui/macosx/coreinteraction/VLCHotkeysController.m | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/gui/macosx/coreinteraction/VLCHotkeysController.m 
b/modules/gui/macosx/coreinteraction/VLCHotkeysController.m
index 43a7e6080f..787f5c9645 100644
--- a/modules/gui/macosx/coreinteraction/VLCHotkeysController.m
+++ b/modules/gui/macosx/coreinteraction/VLCHotkeysController.m
@@ -81,7 +81,7 @@
 VLCPlayerController *playerController = [[[VLCMain sharedInstance] 
playlistController] playerController];
 unichar key = 0;
 vlc_value_t val;
-unsigned int i_pressed_modifiers = 0;
+NSEventModifierFlags i_pressed_modifiers = 0;
 val.i_int = 0;
 
 i_pressed_modifiers = [anEvent modifierFlags];
@@ -197,7 +197,7 @@
 
 unichar key = 0;
 vlc_value_t val;
-unsigned int i_pressed_modifiers = 0;
+NSEventModifierFlags i_pressed_modifiers = 0;
 
 val.i_int = 0;
 i_pressed_modifiers = [o_event modifierFlags];

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

[vlc-commits] macosx/prefs: replace use of API deprecated in 10.6

2020-02-02 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Fri Jan 31 12:40:13 
2020 +0100| [f513dc14dfe9ee3230206ca9f334d39d7156cd02] | committer: Felix Paul 
Kühne

macosx/prefs: replace use of API deprecated in 10.6

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

 modules/gui/macosx/main/VLCMain+OldPrefs.m | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/gui/macosx/main/VLCMain+OldPrefs.m 
b/modules/gui/macosx/main/VLCMain+OldPrefs.m
index ec4027686d..6fa8722e6b 100644
--- a/modules/gui/macosx/main/VLCMain+OldPrefs.m
+++ b/modules/gui/macosx/main/VLCMain+OldPrefs.m
@@ -105,8 +105,9 @@ static const int kCurrentPreferencesVersion = 4;
 } else {
 NSArray *libraries = 
NSSearchPathForDirectoriesInDomains(NSLibraryDirectory,
  
NSUserDomainMask, YES);
-if (!libraries || [libraries count] == 0) return;
-NSString * preferences = [[libraries firstObject] 
stringByAppendingPathComponent:@"Preferences"];
+if (!libraries || [libraries count] == 0)
+return;
+NSString *preferences = [[libraries firstObject] 
stringByAppendingPathComponent:@"Preferences"];
 
 NSAlert *alert = [[NSAlert alloc] init];
 [alert setAlertStyle:NSAlertStyleInformational];
@@ -122,15 +123,14 @@ static const int kCurrentPreferencesVersion = 4;
 
 // Do NOT add the current plist file here as this would conflict with 
caching.
 // Instead, just reset below.
-NSArray * ourPreferences = [NSArray 
arrayWithObjects:@"org.videolan.vlc", @"VLC", nil];
-
-/* Move the file to trash one by one. Using above array the method 
would stop after first file
- not found. */
-for (NSString *file in ourPreferences) {
-[[NSWorkspace sharedWorkspace] 
performFileOperation:NSWorkspaceRecycleOperation source:preferences 
destination:@"" files:[NSArray arrayWithObject:file] tag:nil];
-}
+NSArray *ourPreferences = @[[[NSURL alloc] 
initFileURLWithPath:[preferences 
stringByAppendingPathComponent:@"org.videolan.vlc"]],
+[[NSURL alloc] 
initFileURLWithPath:[preferences stringByAppendingPathComponent:@"VLC"]]];
 
-[self resetAndReinitializeUserDefaults];
+[[NSWorkspace sharedWorkspace] recycleURLs:ourPreferences 
completionHandler:^(NSDictionary *newURLs, NSError *error){
+[self resetAndReinitializeUserDefaults];
+[VLCMain relaunchApplication];
+}];
+return;
 }
 
 [VLCMain relaunchApplication];

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

[vlc-commits] macosx/library: fail creation of data types when the library cannot be reached

2020-01-28 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Tue Jan 28 11:18:49 
2020 +0100| [5ad33dd1c2ef3fd835150dca287e1b852f4fedbe] | committer: Felix Paul 
Kühne

macosx/library: fail creation of data types when the library cannot be reached

When starting and quitting VLC very quickly, we might still try to create media 
library data structures while the interface thread already ended, which was 
leading to a segfault when attempting to access the library with an invalid 
interface thread pointer.

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

 modules/gui/macosx/library/VLCLibraryDataTypes.h |  6 +--
 modules/gui/macosx/library/VLCLibraryDataTypes.m | 57 ++--
 2 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/modules/gui/macosx/library/VLCLibraryDataTypes.h 
b/modules/gui/macosx/library/VLCLibraryDataTypes.h
index bada8467f8..c643e5e6c8 100644
--- a/modules/gui/macosx/library/VLCLibraryDataTypes.h
+++ b/modules/gui/macosx/library/VLCLibraryDataTypes.h
@@ -153,9 +153,9 @@ extern const long long int 
VLCMediaLibraryMediaItemDurationDenominator;
 
 + (nullable instancetype)mediaItemForLibraryID:(int64_t)libraryID;
 + (nullable instancetype)mediaItemForURL:(NSURL *)url;
-- (instancetype)initWithMediaItem:(struct vlc_ml_media_t *)mediaItem;
-- (instancetype)initWithExternalURL:(NSURL *)url;
-- (instancetype)initWithStreamURL:(NSURL *)url;
+- (nullable instancetype)initWithMediaItem:(struct vlc_ml_media_t *)mediaItem;
+- (nullable instancetype)initWithExternalURL:(NSURL *)url;
+- (nullable instancetype)initWithStreamURL:(NSURL *)url;
 
 @property (readonly) int64_t libraryID;
 @property (readonly) vlc_ml_media_type_t mediaType;
diff --git a/modules/gui/macosx/library/VLCLibraryDataTypes.m 
b/modules/gui/macosx/library/VLCLibraryDataTypes.m
index 57555e0879..5aee788748 100644
--- a/modules/gui/macosx/library/VLCLibraryDataTypes.m
+++ b/modules/gui/macosx/library/VLCLibraryDataTypes.m
@@ -180,9 +180,13 @@ NSString *VLCMediaLibraryMediaItemLibraryID = 
@"VLCMediaLibraryMediaItemLibraryI
 
 @implementation VLCMediaLibraryArtist
 
-+ (instancetype)artistWithID:(int64_t)artistID
++ (nullable instancetype)artistWithID:(int64_t)artistID
 {
-vlc_medialibrary_t *p_mediaLibrary = vlc_ml_instance_get(getIntf());
+intf_thread_t *p_intf = getIntf();
+if (!p_intf) {
+return nil;
+}
+vlc_medialibrary_t *p_mediaLibrary = vlc_ml_instance_get(p_intf);
 vlc_ml_artist_t *p_artist = vlc_ml_get_artist(p_mediaLibrary, artistID);
 VLCMediaLibraryArtist *artist = nil;
 if (p_artist) {
@@ -229,7 +233,11 @@ NSString *VLCMediaLibraryMediaItemLibraryID = 
@"VLCMediaLibraryMediaItemLibraryI
 
 - (NSArray *)tracksAsMediaItems
 {
-vlc_medialibrary_t *p_mediaLibrary = vlc_ml_instance_get(getIntf());
+intf_thread_t *p_intf = getIntf();
+if (!p_intf) {
+return @[];
+}
+vlc_medialibrary_t *p_mediaLibrary = vlc_ml_instance_get(p_intf);
 vlc_ml_media_list_t *p_mediaList = 
vlc_ml_list_album_tracks(p_mediaLibrary, NULL, _albumID);
 NSMutableArray *mutableArray = [[NSMutableArray alloc] 
initWithCapacity:p_mediaList->i_nb_items];
 for (size_t x = 0; x < p_mediaList->i_nb_items; x++) {
@@ -287,7 +295,11 @@ NSString *VLCMediaLibraryMediaItemLibraryID = 
@"VLCMediaLibraryMediaItemLibraryI
 
 + (nullable instancetype)mediaItemForLibraryID:(int64_t)libraryID
 {
-vlc_medialibrary_t *p_mediaLibrary = vlc_ml_instance_get(getIntf());
+intf_thread_t *p_intf = getIntf();
+if (!p_intf) {
+return nil;
+}
+vlc_medialibrary_t *p_mediaLibrary = vlc_ml_instance_get(p_intf);
 vlc_ml_media_t *p_mediaItem = vlc_ml_get_media(p_mediaLibrary, libraryID);
 VLCMediaLibraryMediaItem *returnValue = nil;
 if (p_mediaItem) {
@@ -296,9 +308,13 @@ NSString *VLCMediaLibraryMediaItemLibraryID = 
@"VLCMediaLibraryMediaItemLibraryI
 return returnValue;
 }
 
-+ (instancetype)mediaItemForURL:(NSURL *)url
++ (nullable instancetype)mediaItemForURL:(NSURL *)url
 {
-vlc_medialibrary_t *p_mediaLibrary = vlc_ml_instance_get(getIntf());
+intf_thread_t *p_intf = getIntf();
+if (!p_intf) {
+return nil;
+}
+vlc_medialibrary_t *p_mediaLibrary = vlc_ml_instance_get(p_intf);
 vlc_ml_media_t *p_mediaItem = vlc_ml_get_media_by_mrl(p_mediaLibrary,
   [[url 
absoluteString] UTF8String]);
 VLCMediaLibraryMediaItem *returnValue = nil;
@@ -308,10 +324,17 @@ NSString *VLCMediaLibraryMediaItemLibraryID = 
@"VLCMediaLibraryMediaItemLibraryI
 return returnValue;
 }
 
-- (instancetype)initWithMediaItem:(struct vlc_ml_media_t *)p_mediaItem
+- (nullable instancetype)initWithMediaItem:(struct vlc_ml_media_t *)p_mediaItem
 {
-vlc_medialibrary_t *p_mediaLibrary = vlc_ml_instance_get(getIntf());
-return [self initWithMediaItem:p_mediaItem library:p_mediaLibrary];

[vlc-commits] macosx/library: add missing sanity checks to model

2020-01-28 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Tue Jan 28 11:19:47 
2020 +0100| [c6cca200433e0d3f0efa4f2ba8f1f636472af68e] | committer: Felix Paul 
Kühne

macosx/library: add missing sanity checks to model

Creating data structures can fail for many reasons. Handle this scenario 
gracefully.

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

 modules/gui/macosx/library/VLCLibraryModel.m | 19 +++
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/modules/gui/macosx/library/VLCLibraryModel.m 
b/modules/gui/macosx/library/VLCLibraryModel.m
index 0b4b4d9e7e..d46ec3a6fb 100644
--- a/modules/gui/macosx/library/VLCLibraryModel.m
+++ b/modules/gui/macosx/library/VLCLibraryModel.m
@@ -74,6 +74,9 @@ static void libraryCallback(void *p_data, const 
vlc_ml_event_t *p_event)
 case VLC_ML_EVENT_MEDIA_THUMBNAIL_GENERATED:
 if (p_event->media_thumbnail_generated.b_success) {
 VLCMediaLibraryMediaItem *mediaItem = 
[[VLCMediaLibraryMediaItem alloc] initWithMediaItem:(struct vlc_ml_media_t 
*)p_event->media_thumbnail_generated.p_media];
+if (mediaItem == nil) {
+return;
+}
 dispatch_async(dispatch_get_main_queue(), ^{
 VLCLibraryModel *libraryModel = (__bridge VLCLibraryModel 
*)p_data;
 [libraryModel mediaItemWasUpdated:mediaItem];
@@ -145,7 +148,9 @@ static void libraryCallback(void *p_data, const 
vlc_ml_event_t *p_event)
 NSMutableArray *mutableArray = [[NSMutableArray alloc] 
initWithCapacity:p_media_list->i_nb_items];
 for (size_t x = 0; x < p_media_list->i_nb_items; x++) {
 VLCMediaLibraryMediaItem *mediaItem = [[VLCMediaLibraryMediaItem 
alloc] initWithMediaItem:_media_list->p_items[x]];
-[mutableArray addObject:mediaItem];
+if (mediaItem != nil) {
+[mutableArray addObject:mediaItem];
+}
 }
 vlc_ml_media_list_release(p_media_list);
 dispatch_async(dispatch_get_main_queue(), ^{
@@ -178,7 +183,9 @@ static void libraryCallback(void *p_data, const 
vlc_ml_event_t *p_event)
 NSMutableArray *mutableArray = [[NSMutableArray alloc] 
initWithCapacity:p_artist_list->i_nb_items];
 for (size_t x = 0; x < p_artist_list->i_nb_items; x++) {
 VLCMediaLibraryArtist *artist = [[VLCMediaLibraryArtist alloc] 
initWithArtist:_artist_list->p_items[x]];
-[mutableArray addObject:artist];
+if (artist != nil) {
+[mutableArray addObject:artist];
+}
 }
 vlc_ml_artist_list_release(p_artist_list);
 dispatch_async(dispatch_get_main_queue(), ^{
@@ -287,7 +294,9 @@ static void libraryCallback(void *p_data, const 
vlc_ml_event_t *p_event)
 NSMutableArray *mutableArray = [[NSMutableArray alloc] 
initWithCapacity:p_media_list->i_nb_items];
 for (size_t x = 0; x < p_media_list->i_nb_items; x++) {
 VLCMediaLibraryMediaItem *mediaItem = [[VLCMediaLibraryMediaItem 
alloc] initWithMediaItem:_media_list->p_items[x]];
-[mutableArray addObject:mediaItem];
+if (mediaItem != nil) {
+[mutableArray addObject:mediaItem];
+}
 }
 vlc_ml_media_list_release(p_media_list);
 dispatch_async(dispatch_get_main_queue(), ^{
@@ -321,7 +330,9 @@ static void libraryCallback(void *p_data, const 
vlc_ml_event_t *p_event)
 NSMutableArray *mutableArray = [[NSMutableArray alloc] 
initWithCapacity:p_media_list->i_nb_items];
 for (size_t x = 0; x < p_media_list->i_nb_items; x++) {
 VLCMediaLibraryMediaItem *mediaItem = [[VLCMediaLibraryMediaItem 
alloc] initWithMediaItem:_media_list->p_items[x]];
-[mutableArray addObject:mediaItem];
+if (mediaItem != nil) {
+[mutableArray addObject:mediaItem];
+}
 }
 vlc_ml_media_list_release(p_media_list);
 dispatch_async(dispatch_get_main_queue(), ^{

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

[vlc-commits] macosx/playlist: add specific artwork cache

2020-01-26 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Sun Jan 26 21:15:50 
2020 +0100| [9f4fa06f0ee4ce0cdddbdeac30d6a630a994ceee] | committer: Felix Paul 
Kühne

macosx/playlist: add specific artwork cache

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

 .../package/macosx/VLC.xcodeproj/project.pbxproj   |  6 ++
 modules/gui/macosx/Makefile.am |  2 +
 .../gui/macosx/playlist/VLCPlaylistImageCache.h| 34 +
 .../gui/macosx/playlist/VLCPlaylistImageCache.m| 82 ++
 modules/gui/macosx/playlist/VLCPlaylistItem.h  |  1 -
 modules/gui/macosx/playlist/VLCPlaylistItem.m  | 21 --
 po/POTFILES.in |  2 +
 7 files changed, 140 insertions(+), 8 deletions(-)

diff --git a/extras/package/macosx/VLC.xcodeproj/project.pbxproj 
b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
index 38aa696d99..3cd3787692 100644
--- a/extras/package/macosx/VLC.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
@@ -161,6 +161,7 @@
7DB7F20920CC07FD00C2CAED /* WebKit.framework in Frameworks */ = 
{isa = PBXBuildFile; fileRef = 7DB7F20820CC07FD00C2CAED /* WebKit.framework */; 
};
7DB7F20B20CC082800C2CAED /* QuartzCore.framework in Frameworks 
*/ = {isa = PBXBuildFile; fileRef = 7DB7F20A20CC082800C2CAED /* 
QuartzCore.framework */; };
7DBB7639227F3FBC002649E1 /* 
VLCLibraryCollectionViewSupplementaryElementView.m in Sources */ = {isa = 
PBXBuildFile; fileRef = 7DBB7638227F3FBC002649E1 /* 
VLCLibraryCollectionViewSupplementaryElementView.m */; };
+   7DBFDD4723DE1FBB00722E3D /* VLCPlaylistImageCache.m in Sources 
*/ = {isa = PBXBuildFile; fileRef = 7DBFDD4623DE1FBB00722E3D /* 
VLCPlaylistImageCache.m */; };
7DC21A7422049A6600F98A02 /* VLCOpenInputMetadata.m in Sources 
*/ = {isa = PBXBuildFile; fileRef = 7DC21A7322049A6600F98A02 /* 
VLCOpenInputMetadata.m */; };
7DD2F5C52081B73B007EE187 /* VLCRemoteControlService.m in 
Sources */ = {isa = PBXBuildFile; fileRef = 7DD2F5C42081B73B007EE187 /* 
VLCRemoteControlService.m */; };
7DE2F0442282C84A0040DD0A /* VLCLibraryAudioDataSource.m in 
Sources */ = {isa = PBXBuildFile; fileRef = 7DE2F0432282C84A0040DD0A /* 
VLCLibraryAudioDataSource.m */; };
@@ -572,6 +573,8 @@
7DBB06631CC2314D004C74D2 /* caopengllayer.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name 
= caopengllayer.m; path = ../../../modules/video_output/caopengllayer.m; 
sourceTree = ""; };
7DBB7637227F3FBC002649E1 /* 
VLCLibraryCollectionViewSupplementaryElementView.h */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.h; path = 
VLCLibraryCollectionViewSupplementaryElementView.h; sourceTree = ""; };
7DBB7638227F3FBC002649E1 /* 
VLCLibraryCollectionViewSupplementaryElementView.m */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = 
VLCLibraryCollectionViewSupplementaryElementView.m; sourceTree = ""; };
+   7DBFDD4523DE1FBB00722E3D /* VLCPlaylistImageCache.h */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.h; path = 
VLCPlaylistImageCache.h; sourceTree = ""; };
+   7DBFDD4623DE1FBB00722E3D /* VLCPlaylistImageCache.m */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = 
VLCPlaylistImageCache.m; sourceTree = ""; };
7DC21A7222049A6600F98A02 /* VLCOpenInputMetadata.h */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.h; path = 
VLCOpenInputMetadata.h; sourceTree = ""; };
7DC21A7322049A6600F98A02 /* VLCOpenInputMetadata.m */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = 
VLCOpenInputMetadata.m; sourceTree = ""; };
7DD2F5C32081B73B007EE187 /* VLCRemoteControlService.h */ = {isa 
= PBXFileReference; lastKnownFileType = sourcecode.c.h; path = 
VLCRemoteControlService.h; sourceTree = ""; };
@@ -1086,6 +1089,8 @@
7D0F640B2202163E00FDB91F /* 
VLCPlaylistDataSource.m */,
7D445D822202524D00263D34 /* VLCPlaylistItem.h 
*/,
7D445D832202524D00263D34 /* VLCPlaylistItem.m 
*/,
+   7DBFDD4523DE1FBB00722E3D /* 
VLCPlaylistImageCache.h */,
+   7DBFDD4623DE1FBB00722E3D /* 
VLCPlaylistImageCache.m */,
7D445D8C2203375100263D34 /* 
VLCPlaylistMenuController.h */,
7D445D8D2203375100263D34 /* 
VLCPlaylistMenuController.m */,
7D1BF28B22A19227C50F /* 
VLCPlaylistSortingMenuController.h */,
@@ -1757,6 +1762,7 @@
7DFBDCB7226CDFD600B700A5 /* VLCI

[vlc-commits] macosx/library: improve artwork caching strategy

2020-01-26 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Sun Jan 26 21:22:11 
2020 +0100| [f4ba432113cb5a4dd75e2821a80d4ee92d6008ce] | committer: Felix Paul 
Kühne

macosx/library: improve artwork caching strategy

Instead of caching by library ID, cache by MRL as it may not be unique across 
multiple library items, for instance regarding album tracks.

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

 modules/gui/macosx/library/VLCLibraryImageCache.h |  3 +--
 modules/gui/macosx/library/VLCLibraryImageCache.m | 29 +--
 2 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/modules/gui/macosx/library/VLCLibraryImageCache.h 
b/modules/gui/macosx/library/VLCLibraryImageCache.h
index 18e6cef04d..763bd400c6 100644
--- a/modules/gui/macosx/library/VLCLibraryImageCache.h
+++ b/modules/gui/macosx/library/VLCLibraryImageCache.h
@@ -28,8 +28,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface VLCLibraryImageCache : NSObject
 
-+ (NSImage *)thumbnailForMediaItemWithID:(int64_t)libraryID;
-+ (NSImage *)thumbnailForMediaItem:(VLCMediaLibraryMediaItem *)mediaItem;
++ (nullable NSImage *)thumbnailForMediaItem:(VLCMediaLibraryMediaItem 
*)mediaItem;
 
 @end
 
diff --git a/modules/gui/macosx/library/VLCLibraryImageCache.m 
b/modules/gui/macosx/library/VLCLibraryImageCache.m
index 29255f2873..d71693c18b 100644
--- a/modules/gui/macosx/library/VLCLibraryImageCache.m
+++ b/modules/gui/macosx/library/VLCLibraryImageCache.m
@@ -20,17 +20,15 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
 */
 
-
 #import "VLCLibraryImageCache.h"
 #import "library/VLCLibraryDataTypes.h"
 #import "main/VLCMain.h"
 
-NSUInteger kVLCMaximumImageCacheSize = 50;
+NSUInteger kVLCMaximumLibraryImageCacheSize = 50;
 uint32_t kVLCDesiredThumbnailWidth = 512;
 uint32_t kVLCDesiredThumbnailHeight = 320;
 float kVLCDefaultThumbnailPosition = .15;
 
-
 @interface VLCLibraryImageCache()
 {
 NSCache *_imageCache;
@@ -46,7 +44,7 @@ float kVLCDefaultThumbnailPosition = .15;
 self = [super init];
 if (self) {
 _imageCache = [[NSCache alloc] init];
-_imageCache.countLimit = kVLCMaximumImageCacheSize;
+_imageCache.countLimit = kVLCMaximumLibraryImageCacheSize;
 }
 return self;
 }
@@ -61,11 +59,6 @@ float kVLCDefaultThumbnailPosition = .15;
 return sharedImageCache;
 }
 
-+ (NSImage *)thumbnailForMediaItemWithID:(int64_t)libraryID
-{
-return [[VLCLibraryImageCache sharedImageCache] 
imageForMediaItemWithID:libraryID];
-}
-
 + (NSImage *)thumbnailForMediaItem:(VLCMediaLibraryMediaItem *)mediaItem
 {
 return [[VLCLibraryImageCache sharedImageCache] 
imageForMediaItem:mediaItem];
@@ -73,36 +66,26 @@ float kVLCDefaultThumbnailPosition = .15;
 
 - (NSImage *)imageForMediaItem:(VLCMediaLibraryMediaItem *)mediaItem
 {
-NSImage *cachedImage = [_imageCache objectForKey:@(mediaItem.libraryID)];
-if (cachedImage) {
-return cachedImage;
-}
-return [self smallThumbnailForMediaItem:mediaItem];
-}
-
-- (NSImage *)imageForMediaItemWithID:(int64_t)libraryID
-{
-NSNumber *libraryIDnumber = @(libraryID);
-NSImage *cachedImage = [_imageCache objectForKey:libraryIDnumber];
+NSImage *cachedImage = [_imageCache 
objectForKey:mediaItem.smallArtworkMRL];
 if (cachedImage) {
 return cachedImage;
 }
-VLCMediaLibraryMediaItem *mediaItem = [VLCMediaLibraryMediaItem 
mediaItemForLibraryID:libraryID];
 return [self smallThumbnailForMediaItem:mediaItem];
 }
 
 - (NSImage *)smallThumbnailForMediaItem:(VLCMediaLibraryMediaItem *)mediaItem
 {
 NSImage *image;
+NSString *artworkMRL = mediaItem.smallArtworkMRL;
 if (mediaItem.smallArtworkGenerated) {
-image = [[NSImage alloc] initWithContentsOfURL:[NSURL 
URLWithString:mediaItem.smallArtworkMRL]];
+image = [[NSImage alloc] initWithContentsOfURL:[NSURL 
URLWithString:artworkMRL]];
 } else {
 if (mediaItem.mediaType != VLC_ML_MEDIA_TYPE_AUDIO) {
 [self generateThumbnailForMediaItem:mediaItem.libraryID];
 }
 }
 if (image) {
-[_imageCache setObject:image forKey:@(mediaItem.libraryID)];
+[_imageCache setObject:image forKey:artworkMRL];
 }
 return image;
 }

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

[vlc-commits] macosx/library: add an image cache to improve responsiveness

2020-01-26 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Sun Jan 26 14:58:24 
2020 +0100| [bd91af604b4bf24075e1d5f868a5ebf3d209eeb4] | committer: Felix Paul 
Kühne

macosx/library: add an image cache to improve responsiveness

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

 .../package/macosx/VLC.xcodeproj/project.pbxproj   |   6 +
 modules/gui/macosx/Makefile.am |   2 +
 .../macosx/library/VLCLibraryAlbumTableCellView.m  |   7 +-
 .../gui/macosx/library/VLCLibraryAudioDataSource.m |   7 +-
 .../macosx/library/VLCLibraryCollectionViewItem.m  |   9 +-
 modules/gui/macosx/library/VLCLibraryController.h  |   1 -
 modules/gui/macosx/library/VLCLibraryController.m  |  17 ---
 modules/gui/macosx/library/VLCLibraryDataTypes.h   |   1 +
 modules/gui/macosx/library/VLCLibraryDataTypes.m   |   6 +
 modules/gui/macosx/library/VLCLibraryImageCache.h  |  36 ++
 modules/gui/macosx/library/VLCLibraryImageCache.m  | 123 +
 .../macosx/library/VLCLibraryInformationPanel.m|   4 +-
 po/POTFILES.in |   2 +
 13 files changed, 180 insertions(+), 41 deletions(-)

diff --git a/extras/package/macosx/VLC.xcodeproj/project.pbxproj 
b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
index 4534baf5cc..38aa696d99 100644
--- a/extras/package/macosx/VLC.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
@@ -139,6 +139,7 @@
7D903EAF224392B400917358 /* timespec_get.c in Sources */ = {isa 
= PBXBuildFile; fileRef = 7D903EAE224392B400917358 /* timespec_get.c */; };
7D903EB6224394BE00917358 /* specific.c in Sources */ = {isa = 
PBXBuildFile; fileRef = 7D903EB5224394BE00917358 /* specific.c */; };
7D903EB92243952100917358 /* threads.c in Sources */ = {isa = 
PBXBuildFile; fileRef = 7D903EB82243952100917358 /* threads.c */; };
+   7D92AF2123DDCA8D00D81EA3 /* VLCLibraryImageCache.m in Sources 
*/ = {isa = PBXBuildFile; fileRef = 7D92AF2023DDCA8D00D81EA3 /* 
VLCLibraryImageCache.m */; };
7D93D8FC2316C2DC001C0063 /* VLCCustomCropArWindowController.m 
in Sources */ = {isa = PBXBuildFile; fileRef = 7D93D8FB2316C2DC001C0063 /* 
VLCCustomCropArWindowController.m */; };
7DB40D2A20CBCEB500F63173 /* VLCMainMenu.m in Sources */ = {isa 
= PBXBuildFile; fileRef = 7DB40D2920CBCEB500F63173 /* VLCMainMenu.m */; };
7DB40D2D20CBCEC200F63173 /* VLCStatusBarIcon.m in Sources */ = 
{isa = PBXBuildFile; fileRef = 7DB40D2B20CBCEC200F63173 /* VLCStatusBarIcon.m 
*/; };
@@ -540,6 +541,8 @@
7D903EAE224392B400917358 /* timespec_get.c */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.c; name = timespec_get.c; 
path = ../../../../compat/timespec_get.c; sourceTree = ""; };
7D903EB5224394BE00917358 /* specific.c */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = 
specific.c; path = ../../../src/darwin/specific.c; sourceTree = ""; };
7D903EB82243952100917358 /* threads.c */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = 
threads.c; path = ../../../../src/misc/threads.c; sourceTree = ""; };
+   7D92AF1F23DDCA8D00D81EA3 /* VLCLibraryImageCache.h */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.h; path = 
VLCLibraryImageCache.h; sourceTree = ""; };
+   7D92AF2023DDCA8D00D81EA3 /* VLCLibraryImageCache.m */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = 
VLCLibraryImageCache.m; sourceTree = ""; };
7D93D8F92316C142001C0063 /* VLCCustomCropARPanel.xib */ = {isa 
= PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = 
VLCCustomCropARPanel.xib; sourceTree = ""; };
7D93D8FA2316C2DC001C0063 /* VLCCustomCropArWindowController.h 
*/ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = 
VLCCustomCropArWindowController.h; sourceTree = ""; };
7D93D8FB2316C2DC001C0063 /* VLCCustomCropArWindowController.m 
*/ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = 
VLCCustomCropArWindowController.m; sourceTree = ""; };
@@ -1052,6 +1055,8 @@
7DFBDCAA2269E77F00B700A5 /* VLCLibraryModel.m 
*/,
7DFBDCB2226CD00900B700A5 /* 
VLCLibraryDataTypes.h */,
7DFBDCB3226CD00900B700A5 /* 
VLCLibraryDataTypes.m */,
+   7D92AF1F23DDCA8D00D81EA3 /* 
VLCLibraryImageCache.h */,
+   7D92AF2023DDCA8D00D81EA3 /* 
VLCLibraryImageCache.m */,
7DFBDCAC2269ED0C00B700A5 /* 
VLCLibraryVideoDataSource.h */,
7DFBDCAD2269ED0C00B700A5 /* 
VLCLi

[vlc-commits] macosx/library: show minimal menu if appropriate

2020-01-26 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Sun Jan 26 13:43:30 
2020 +0100| [322b55eab90a46bcfa6310816c1654156a23c3b4] | committer: Felix Paul 
Kühne

macosx/library: show minimal menu if appropriate

When the user right-clicks on a non-media-item in the library representation, 
don't offer options to manipulate the item as there is none.

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

 modules/gui/macosx/library/VLCLibraryMenuController.m | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/gui/macosx/library/VLCLibraryMenuController.m 
b/modules/gui/macosx/library/VLCLibraryMenuController.m
index 9d45e5a2ef..53a365ae1c 100644
--- a/modules/gui/macosx/library/VLCLibraryMenuController.m
+++ b/modules/gui/macosx/library/VLCLibraryMenuController.m
@@ -68,7 +68,15 @@
 
 - (void)popupMenuWithEvent:(NSEvent *)theEvent forView:(NSView *)theView
 {
-[NSMenu popUpContextMenu:_libraryMenu withEvent:theEvent forView:theView];
+if (self.representedMediaItem != nil) {
+[NSMenu popUpContextMenu:_libraryMenu withEvent:theEvent 
forView:theView];
+} else {
+NSMenu *minimalMenu = [[NSMenu alloc] initWithTitle:@""];
+NSMenuItem *addItem = [[NSMenuItem alloc] initWithTitle:_NS("Add Media 
Folder...") action:@selector(addMedia:) keyEquivalent:@""];
+addItem.target = self;
+minimalMenu.itemArray = @[addItem];
+[NSMenu popUpContextMenu:minimalMenu withEvent:theEvent 
forView:theView];
+}
 }
 
 #pragma mark - actions

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

[vlc-commits] macosx/library: clean info panel output

2020-01-26 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Sun Jan 26 14:20:24 
2020 +0100| [2601a1725db3e65f5d809023bcb1bd44197cb5bd] | committer: Felix Paul 
Kühne

macosx/library: clean info panel output

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

 .../gui/macosx/library/VLCLibraryInformationPanel.m   | 19 ++-
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/modules/gui/macosx/library/VLCLibraryInformationPanel.m 
b/modules/gui/macosx/library/VLCLibraryInformationPanel.m
index bed9cb05af..793105f6d3 100644
--- a/modules/gui/macosx/library/VLCLibraryInformationPanel.m
+++ b/modules/gui/macosx/library/VLCLibraryInformationPanel.m
@@ -47,20 +47,16 @@
 
 - (void)updateRepresentation
 {
-NSMutableString *textContent = [[NSMutableString alloc] 
initWithFormat:@"ID: %lli\n", _representedMediaItem.libraryID];
-[textContent appendFormat:@"Title: %@\n", _representedMediaItem.title];
+NSMutableString *textContent = [[NSMutableString alloc] 
initWithFormat:@"Title: '%@', ID: %lli\n", _representedMediaItem.title, 
_representedMediaItem.libraryID];
 if (_representedMediaItem.mediaSubType != VLC_ML_MEDIA_SUBTYPE_UNKNOWN) {
 [textContent appendFormat:@"Type: %@ — %@\n", 
_representedMediaItem.readableMediaType, 
_representedMediaItem.readableMediaSubType];
 } else {
 [textContent appendFormat:@"Type: %@\n", 
_representedMediaItem.readableMediaType];
 }
 [textContent appendFormat:@"Duration: %@\n", [NSString 
stringWithTime:_representedMediaItem.duration / 
VLCMediaLibraryMediaItemDurationDenominator]];
-[textContent appendFormat:@"Play count: %u\n", 
_representedMediaItem.playCount];
-[textContent appendFormat:@"Last played: %@\n", [NSDateFormatter 
localizedStringFromDate:[NSDate 
dateWithTimeIntervalSince1970:_representedMediaItem.lastPlayedDate]
-   
  dateStyle:NSDateFormatterShortStyle timeStyle:NSDateFormatterShortStyle]];
+[textContent appendFormat:@"Play count: %u, last played: %@\n", 
_representedMediaItem.playCount, [NSDateFormatter 
localizedStringFromDate:[NSDate 
dateWithTimeIntervalSince1970:_representedMediaItem.lastPlayedDate] 
dateStyle:NSDateFormatterShortStyle timeStyle:NSDateFormatterShortStyle]];
 [textContent appendFormat:@"Small artwork generated? %@\n", 
_representedMediaItem.smallArtworkGenerated == YES ? _NS("Yes") : _NS("No")];
-[textContent appendFormat:@"Favorited? %@\n", 
_representedMediaItem.smallArtworkGenerated == YES ? _NS("Yes") : _NS("No")];
-[textContent appendFormat:@"Playback progress: %2.f%%\n", 
_representedMediaItem.lastPlaybackPosition * 100.];
+[textContent appendFormat:@"Favorited? %@, Playback progress: %2.f%%\n", 
_representedMediaItem.smallArtworkGenerated == YES ? _NS("Yes") : _NS("No"), 
_representedMediaItem.lastPlaybackPosition * 100.];
 
 NSArray *array = _representedMediaItem.files;
 NSUInteger count = array.count;
@@ -77,8 +73,7 @@
 for (NSUInteger x = 0; x < count; x++) {
 VLCMediaLibraryTrack *track = array[x];
 [textContent appendFormat:@"Type: %@\n", track.readableTrackType];
-[textContent appendFormat:@"Codec: %@\n", track.codec];
-[textContent appendFormat:@"Bitrate: %u\n", track.bitrate];
+[textContent appendFormat:@"Codec: %@ (%@) @ %u kB/s\n", 
track.readableCodecName, track.codec, track.bitrate / 1024 / 8];
 if (track.language.length > 0) {
 [textContent appendFormat:@"Language: %@\n", track.language];
 }
@@ -87,11 +82,9 @@
 }
 
 if (track.trackType == VLC_ML_TRACK_TYPE_AUDIO) {
-[textContent appendFormat:@"Number of Channels: %u\n", 
track.numberOfAudioChannels];
-[textContent appendFormat:@"Sample rate: %u\n", 
track.audioSampleRate];
+[textContent appendFormat:@"Number of Channels: %u, Sample rate: 
%u\n", track.numberOfAudioChannels, track.audioSampleRate];
 } else if (track.trackType == VLC_ML_TRACK_TYPE_VIDEO) {
-[textContent appendFormat:@"Dimensions: %ux%u px\n", 
track.videoWidth, track.videoHeight];
-[textContent appendFormat:@"Aspect-Ratio: %2.f\n", 
(float)track.sourceAspectRatio / track.sourceAspectRatioDenominator];
+[textContent appendFormat:@"Dimensions: %ux%u px, Aspect-Ratio: 
%2.f\n", track.videoWidth, track.videoHeight, (float)track.sourceAspectRatio / 
track.sourceAspectRatioDenominator];
 [textContent appendFormat:@"Framerate: %2.f\n", 
(float)track.frameRate / track.frameRateDenominator];;
 }
 [textContent appendString:@"\n"];

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

[vlc-commits] macosx/library: add helper to output a readable codec name

2020-01-26 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Sun Jan 26 14:10:32 
2020 +0100| [04f1b942ad2130af1ebf17277de67b86b7550a7a] | committer: Felix Paul 
Kühne

macosx/library: add helper to output a readable codec name

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

 modules/gui/macosx/library/VLCLibraryDataTypes.h | 1 +
 modules/gui/macosx/library/VLCLibraryDataTypes.m | 6 ++
 2 files changed, 7 insertions(+)

diff --git a/modules/gui/macosx/library/VLCLibraryDataTypes.h 
b/modules/gui/macosx/library/VLCLibraryDataTypes.h
index 3d64261f70..01f67a81c1 100644
--- a/modules/gui/macosx/library/VLCLibraryDataTypes.h
+++ b/modules/gui/macosx/library/VLCLibraryDataTypes.h
@@ -55,6 +55,7 @@ extern const long long int 
VLCMediaLibraryMediaItemDurationDenominator;
 - (instancetype)initWithTrack:(struct vlc_ml_media_track_t *)p_track;
 
 @property (readonly) NSString *codec;
+@property (readonly) NSString *readableCodecName;
 @property (readonly) NSString *language;
 @property (readonly) NSString *trackDescription;
 @property (readonly) vlc_ml_track_type_t trackType;
diff --git a/modules/gui/macosx/library/VLCLibraryDataTypes.m 
b/modules/gui/macosx/library/VLCLibraryDataTypes.m
index 7aa8373ac6..d29094da13 100644
--- a/modules/gui/macosx/library/VLCLibraryDataTypes.m
+++ b/modules/gui/macosx/library/VLCLibraryDataTypes.m
@@ -123,6 +123,12 @@ NSString *VLCMediaLibraryMediaItemLibraryID = 
@"VLCMediaLibraryMediaItemLibraryI
 return [NSString stringWithFormat:@"%@ — type: %i, codec %@", 
NSStringFromClass([self class]), _trackType, _codec];
 }
 
+- (NSString *)readableCodecName
+{
+vlc_fourcc_t fourcc = vlc_fourcc_GetCodecFromString(UNKNOWN_ES, 
_codec.UTF8String);
+return toNSStr(vlc_fourcc_GetDescription(UNKNOWN_ES, fourcc));
+}
+
 - (NSString *)readableTrackType
 {
 switch (_trackType) {

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

[vlc-commits] macosx/library: add helpers to expose human readable types

2020-01-25 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Sat Jan 25 13:40:32 
2020 +0100| [ac96cb4f29544b1b45af4c94d384e41ad6d6d7a8] | committer: Felix Paul 
Kühne

macosx/library: add helpers to expose human readable types

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

 modules/gui/macosx/library/VLCLibraryDataTypes.h |  4 ++
 modules/gui/macosx/library/VLCLibraryDataTypes.m | 82 
 2 files changed, 86 insertions(+)

diff --git a/modules/gui/macosx/library/VLCLibraryDataTypes.h 
b/modules/gui/macosx/library/VLCLibraryDataTypes.h
index d208f20ff6..3d64261f70 100644
--- a/modules/gui/macosx/library/VLCLibraryDataTypes.h
+++ b/modules/gui/macosx/library/VLCLibraryDataTypes.h
@@ -43,6 +43,7 @@ extern const long long int 
VLCMediaLibraryMediaItemDurationDenominator;
 @property (readonly) NSString *MRL;
 @property (readonly) NSURL *fileURL;
 @property (readonly) vlc_ml_file_type_t fileType;
+@property (readonly) NSString *readableFileType;
 @property (readonly) BOOL external;
 @property (readonly) BOOL removable;
 @property (readonly) BOOL present;
@@ -57,6 +58,7 @@ extern const long long int 
VLCMediaLibraryMediaItemDurationDenominator;
 @property (readonly) NSString *language;
 @property (readonly) NSString *trackDescription;
 @property (readonly) vlc_ml_track_type_t trackType;
+@property (readonly) NSString *readableTrackType;
 @property (readonly) uint32_t bitrate;
 
 @property (readonly) uint32_t numberOfAudioChannels;
@@ -156,7 +158,9 @@ extern const long long int 
VLCMediaLibraryMediaItemDurationDenominator;
 
 @property (readonly) int64_t libraryID;
 @property (readonly) vlc_ml_media_type_t mediaType;
+@property (readonly) NSString *readableMediaType;
 @property (readonly) vlc_ml_media_subtype_t mediaSubType;
+@property (readonly) NSString *readableMediaSubType;
 @property (readonly) VLCInputItem *inputItem;
 
 @property (readonly) NSArray  *files;
diff --git a/modules/gui/macosx/library/VLCLibraryDataTypes.m 
b/modules/gui/macosx/library/VLCLibraryDataTypes.m
index 82fef465e0..7aa8373ac6 100644
--- a/modules/gui/macosx/library/VLCLibraryDataTypes.m
+++ b/modules/gui/macosx/library/VLCLibraryDataTypes.m
@@ -63,6 +63,34 @@ NSString *VLCMediaLibraryMediaItemLibraryID = 
@"VLCMediaLibraryMediaItemLibraryI
 return [NSURL URLWithString:_MRL];
 }
 
+- (NSString *)readableFileType
+{
+switch (_fileType) {
+case VLC_ML_FILE_TYPE_MAIN:
+return _NS("Main");
+break;
+
+case VLC_ML_FILE_TYPE_PART:
+return _NS("Part");
+break;
+
+case VLC_ML_FILE_TYPE_PLAYLIST:
+return _NS("Playlist");
+break;
+
+case VLC_ML_FILE_TYPE_SUBTITLE:
+return _NS("Subtitle");
+break;
+
+case VLC_ML_FILE_TYPE_SOUNDTRACK:
+return _NS("Soundtrack");
+
+default:
+return _NS("Unknown");
+break;
+}
+}
+
 @end
 
 @implementation VLCMediaLibraryTrack
@@ -95,6 +123,22 @@ NSString *VLCMediaLibraryMediaItemLibraryID = 
@"VLCMediaLibraryMediaItemLibraryI
 return [NSString stringWithFormat:@"%@ — type: %i, codec %@", 
NSStringFromClass([self class]), _trackType, _codec];
 }
 
+- (NSString *)readableTrackType
+{
+switch (_trackType) {
+case VLC_ML_TRACK_TYPE_AUDIO:
+return _NS("Audio");
+break;
+
+case VLC_ML_TRACK_TYPE_VIDEO:
+return _NS("Video");
+
+default:
+return _NS("Unknown");
+break;
+}
+}
+
 @end
 
 @implementation VLCMediaLibraryMovie
@@ -373,6 +417,44 @@ NSString *VLCMediaLibraryMediaItemLibraryID = 
@"VLCMediaLibraryMediaItemLibraryI
 NSStringFromClass([self class]), _title, _libraryID, _mediaType, 
_smallArtworkMRL];
 }
 
+- (NSString *)readableMediaType
+{
+switch (_mediaType) {
+case VLC_ML_MEDIA_TYPE_AUDIO:
+return _NS("Audio");
+break;
+
+case VLC_ML_MEDIA_TYPE_VIDEO:
+return _NS("Video");
+break;
+
+default:
+return _NS("Unknown");
+break;
+}
+}
+
+- (NSString *)readableMediaSubType
+{
+switch (_mediaSubType) {
+case VLC_ML_MEDIA_SUBTYPE_MOVIE:
+return _NS("Movie");
+break;
+
+case VLC_ML_MEDIA_SUBTYPE_SHOW_EPISODE:
+return _NS("Show Episode");
+break;
+
+case VLC_ML_MEDIA_SUBTYPE_ALBUMTRACK:
+return _NS("Album Track");
+break;
+
+default:
+return _NS("Unknown");
+break;
+}
+}
+
 - (VLCInputItem *)inputItem
 {
 input_item_t *p_inputItem = vlc_ml_get_input_item(_p_mediaLibrary, 
_libraryID);

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

[vlc-commits] macosx/library: add basic information panel

2020-01-25 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Sat Jan 25 13:41:51 
2020 +0100| [15452c9707e9e45a459988abd1db6403eea70610] | committer: Felix Paul 
Kühne

macosx/library: add basic information panel

This way, you can reveal the data about an individual item stored in the data 
base. The representation will be moved to a different place, so this is notably 
for debug purposes for now.

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

 .../package/macosx/VLC.xcodeproj/project.pbxproj   |   8 ++
 modules/gui/macosx/Makefile.am |   3 +
 .../gui/macosx/UI/VLCLibraryInformationPanel.xib   |  56 +++
 .../macosx/library/VLCLibraryInformationPanel.h|  38 
 .../macosx/library/VLCLibraryInformationPanel.m| 107 +
 .../gui/macosx/library/VLCLibraryMenuController.m  |  16 ++-
 po/POTFILES.in |   2 +
 7 files changed, 229 insertions(+), 1 deletion(-)

diff --git a/extras/package/macosx/VLC.xcodeproj/project.pbxproj 
b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
index 8f8702e145..4534baf5cc 100644
--- a/extras/package/macosx/VLC.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
@@ -98,6 +98,7 @@
6BBBF9851F7B257100B404CD /* VLCLogMessage.m in Sources */ = 
{isa = PBXBuildFile; fileRef = 6BBBF9841F7B257100B404CD /* VLCLogMessage.m */; 
};
6BF093F91EE0182B0049D8B0 /* VLCTimeField.m in Sources */ = {isa 
= PBXBuildFile; fileRef = 6BF093F81EE0182B0049D8B0 /* VLCTimeField.m */; };
6BF5C5041EFE66EF008A9C12 /* VLCHUDTableView.m in Sources */ = 
{isa = PBXBuildFile; fileRef = 6BF5C5031EFE66EF008A9C12 /* VLCHUDTableView.m 
*/; };
+   7D03F97423DC5BBC0027A875 /* VLCLibraryInformationPanel.m in 
Sources */ = {isa = PBXBuildFile; fileRef = 7D03F97223DC5BBC0027A875 /* 
VLCLibraryInformationPanel.m */; };
7D0F5A9B2264EB410009C48A /* VLCHotkeysController.m in Sources 
*/ = {isa = PBXBuildFile; fileRef = 7D0F5A9A2264EB410009C48A /* 
VLCHotkeysController.m */; };
7D0F63FF2201F63400FDB91F /* VLCPlaylistTableCellView.m in 
Sources */ = {isa = PBXBuildFile; fileRef = 7D0F63FE2201F63400FDB91F /* 
VLCPlaylistTableCellView.m */; };
7D0F64062202047900FDB91F /* VLCLibraryCollectionViewItem.m in 
Sources */ = {isa = PBXBuildFile; fileRef = 7D0F64042202047900FDB91F /* 
VLCLibraryCollectionViewItem.m */; };
@@ -437,6 +438,9 @@
6BF56C3D1FCF00AF004A411A /* audiotoolbox_midi.c */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = 
audiotoolbox_midi.c; path = ../../../modules/codec/audiotoolbox_midi.c; 
sourceTree = ""; };
6BF5C5021EFE66EF008A9C12 /* VLCHUDTableView.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
VLCHUDTableView.h; sourceTree = ""; };
6BF5C5031EFE66EF008A9C12 /* VLCHUDTableView.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path 
= VLCHUDTableView.m; sourceTree = ""; };
+   7D03F97123DC5BBC0027A875 /* VLCLibraryInformationPanel.h */ = 
{isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = 
VLCLibraryInformationPanel.h; sourceTree = ""; };
+   7D03F97223DC5BBC0027A875 /* VLCLibraryInformationPanel.m */ = 
{isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = 
VLCLibraryInformationPanel.m; sourceTree = ""; };
+   7D03F97323DC5BBC0027A875 /* VLCLibraryInformationPanel.xib */ = 
{isa = PBXFileReference; lastKnownFileType = file.xib; path = 
VLCLibraryInformationPanel.xib; sourceTree = ""; };
7D0A387820CBCC4D00D4BF3B /* videotoolbox.c */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name 
= videotoolbox.c; path = ../../../modules/codec/videotoolbox.c; sourceTree = 
""; };
7D0F5A992264EB410009C48A /* VLCHotkeysController.h */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.h; path = 
VLCHotkeysController.h; sourceTree = ""; };
7D0F5A9A2264EB410009C48A /* VLCHotkeysController.m */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = 
VLCHotkeysController.m; sourceTree = ""; };
@@ -1056,6 +1060,8 @@
7DFBDCB0226A518400B700A5 /* 
VLCLibraryMenuController.m */,
7D22A8F222BC14F80063ECD2 /* 
VLCLibrarySortingMenuController.h */,
7D22A8F322BC14F80063ECD2 /* 
VLCLibrarySortingMenuController.m */,
+   7D03F97123DC5BBC0027A875 /* 
VLCLibraryInformationPanel.h */,
+   7D03F97223DC5BBC0027A875 /* 
VLCLibraryInfo

[vlc-commits] macosx/library: fix runtime exception due to life cycle management

2020-01-24 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Fri Jan 24 17:14:15 
2020 +0100| [497ece8b40163ac364281e22097b8676a61e41ee] | committer: Felix Paul 
Kühne

macosx/library: fix runtime exception due to life cycle management

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

 modules/gui/macosx/library/VLCLibraryCollectionViewItem.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gui/macosx/library/VLCLibraryCollectionViewItem.h 
b/modules/gui/macosx/library/VLCLibraryCollectionViewItem.h
index 71abe643d5..aebe9a7821 100644
--- a/modules/gui/macosx/library/VLCLibraryCollectionViewItem.h
+++ b/modules/gui/macosx/library/VLCLibraryCollectionViewItem.h
@@ -41,7 +41,7 @@ extern NSString *VLCLibraryCellIdentifier;
 @property (readwrite, assign) IBOutlet NSButton *addToPlaylistButton;
 @property (readwrite, assign) IBOutlet VLCLinearProgressIndicator 
*progressIndicator;
 
-@property (readwrite, assign, nonatomic) VLCMediaLibraryMediaItem 
*representedMediaItem;
+@property (readwrite, retain, nonatomic) VLCMediaLibraryMediaItem 
*representedMediaItem;
 
 - (IBAction)playInstantly:(id)sender;
 - (IBAction)addToPlaylist:(id)sender;

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

[vlc-commits] macosx/prefs widgets: cosmetics

2020-01-24 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Fri Jan 24 18:05:30 
2020 +0100| [74b80c2fd06ea0f816193abc9cafd4c9f8336cf4] | committer: Felix Paul 
Kühne

macosx/prefs widgets: cosmetics

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

 modules/gui/macosx/preferences/prefs_widgets.m | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/modules/gui/macosx/preferences/prefs_widgets.m 
b/modules/gui/macosx/preferences/prefs_widgets.m
index 3ee0e77048..d256052579 100644
--- a/modules/gui/macosx/preferences/prefs_widgets.m
+++ b/modules/gui/macosx/preferences/prefs_widgets.m
@@ -40,6 +40,8 @@
 #include "extensions/NSString+Helpers.h"
 #include "preferences/prefs_widgets.h"
 
+NSString *VLCPrefsWidgetModuleDragType = @"VLC media player module";
+
 #define CONFIG_ITEM_STRING_LIST (CONFIG_ITEM_STRING + 10)
 #define CONFIG_ITEM_RANGED_INTEGER (CONFIG_ITEM_INTEGER + 10)
 
@@ -896,11 +898,10 @@ o_textfield = [[NSSecureTextField alloc] initWithFrame: 
s_rc];  \
 return self.label.frame.size.width;
 }
 
-- (void) alignWithXPosition:(int)i_xPos;
+- (void)alignWithXPosition:(int)i_xPos
 {
-/* FIXME: not implemented atm, but created to shut up the warning
- * about "method definition not found" -- FK @ 7/24/05 */
 }
+
 @end
 
 @interface StringConfigControl()
@@ -2056,7 +2057,7 @@ o_moduleenabled = [NSNumber numberWithBool:NO];\
 [o_tableColumn setDataCell: o_dataCell];
 [o_tableColumn setWidth:s_rc.size.width - 34];
 [o_tableview addTableColumn: o_tableColumn];
-[o_tableview registerForDraggedTypes:[NSArray arrayWithObject:@"VLC media 
player module"]];
+[o_tableview registerForDraggedTypes:@[VLCPrefsWidgetModuleDragType]];
 
 [o_tableview setDataSource:self];
 [o_tableview setTarget: self];
@@ -2141,8 +2142,8 @@ o_moduleenabled = [NSNumber numberWithBool:NO];\
 
 - (BOOL)tableView:(NSTableView *)tableView writeRowsWithIndexes:(NSIndexSet 
*)rowIndexes toPasteboard:(NSPasteboard *)pboard
 {
-[pboard declareTypes:@[@"VLC media player module"] owner:nil];
-[pboard setPropertyList:@[@(rowIndexes.firstIndex)] forType:@"VLC media 
player module"];
+[pboard declareTypes:@[VLCPrefsWidgetModuleDragType] owner:nil];
+[pboard setPropertyList:@[@(rowIndexes.firstIndex)] 
forType:VLCPrefsWidgetModuleDragType];
 return YES;
 }
 
@@ -2175,7 +2176,7 @@ o_moduleenabled = [NSNumber numberWithBool:NO];\
 
 // Intra-table drag - data is the array of rows.
 if (!accepted && (array =
-  [pb propertyListForType:@"VLC media player module"]) != 
NULL) {
+  [pb propertyListForType:VLCPrefsWidgetModuleDragType]) 
!= NULL) {
 NSEnumerator *iter = nil;
 id val;
 // Move the modules

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

[vlc-commits] macosx/library: show all videos available

2020-01-24 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Fri Jan 24 17:13:50 
2020 +0100| [f02317be0c8db903673c29551bbf4aab3bf28fcd] | committer: Felix Paul 
Kühne

macosx/library: show all videos available

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

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

diff --git a/modules/gui/macosx/library/VLCLibraryModel.m 
b/modules/gui/macosx/library/VLCLibraryModel.m
index ed9a61fbd1..0b4b4d9e7e 100644
--- a/modules/gui/macosx/library/VLCLibraryModel.m
+++ b/modules/gui/macosx/library/VLCLibraryModel.m
@@ -277,7 +277,7 @@ static void libraryCallback(void *p_data, const 
vlc_ml_event_t *p_event)
 dispatch_async(dispatch_get_global_queue(QOS_CLASS_USER_INTERACTIVE, 0), ^{
 vlc_ml_query_params_t queryParameters;
 memset(, 0, sizeof(vlc_ml_query_params_t));
-queryParameters.i_nbResults = 20;
+queryParameters.i_nbResults = 0;
 queryParameters.i_sort = self->_sortCriteria;
 queryParameters.b_desc = self->_sortDescending;
 vlc_ml_media_list_t *p_media_list = 
vlc_ml_list_video_media(self->_p_mediaLibrary, );

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

[vlc-commits] macosx/extras: set typical library search path

2020-01-24 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Fri Jan 24 16:32:54 
2020 +0100| [43c35ecb61e58be29a4f542bade26f0f04e08e82] | committer: Felix Paul 
Kühne

macosx/extras: set typical library search path

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

 extras/package/macosx/VLC.xcodeproj/project.pbxproj | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/extras/package/macosx/VLC.xcodeproj/project.pbxproj 
b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
index e9fdfcee69..8f8702e145 100644
--- a/extras/package/macosx/VLC.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
@@ -1871,6 +1871,7 @@
../../../modules/gui/macosx,
);
INFOPLIST_FILE = 
"$(SRCROOT)/../../../build/share/macosx/Info.plist";
+   LIBRARY_SEARCH_PATHS = 
"${VLC_SRC_DIR}/build/macos-install/lib";
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"-lvlccore",
@@ -1910,6 +1911,7 @@
../../../modules/gui/macosx,
);
INFOPLIST_FILE = 
"$(SRCROOT)/../../../build/share/macosx/Info.plist";
+   LIBRARY_SEARCH_PATHS = 
"${VLC_SRC_DIR}/build/macos-install/lib";
OTHER_LDFLAGS = (
"-lvlccore",
"-framework",
@@ -1948,6 +1950,7 @@
../../../modules/gui/macosx,
);
INFOPLIST_FILE = 
"$(SRCROOT)/../../../build/share/macosx/Info.plist";
+   LIBRARY_SEARCH_PATHS = 
"${VLC_SRC_DIR}/build/macos-install/lib";
OTHER_LDFLAGS = (
"-lvlccore",
"-framework",

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

[vlc-commits] macosx/prefs widgets: replace delegate method deprecated in Mac OS 10.4

2020-01-24 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Fri Jan 24 18:00:32 
2020 +0100| [662ceeebb8b5a704b707b6b8d85e5de1738e29b0] | committer: Felix Paul 
Kühne

macosx/prefs widgets: replace delegate method deprecated in Mac OS 10.4

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

 modules/gui/macosx/preferences/prefs_widgets.m | 17 -
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/modules/gui/macosx/preferences/prefs_widgets.m 
b/modules/gui/macosx/preferences/prefs_widgets.m
index a7b52ca94f..3ee0e77048 100644
--- a/modules/gui/macosx/preferences/prefs_widgets.m
+++ b/modules/gui/macosx/preferences/prefs_widgets.m
@@ -2139,19 +2139,10 @@ o_moduleenabled = [NSNumber numberWithBool:NO];\
 
 @implementation ModuleListConfigControl (NSTableDataSource)
 
-- (BOOL)tableView:(NSTableView*)table writeRows:(NSArray*)rows
- toPasteboard:(NSPasteboard*)pb
-{
-// We only want to allow dragging of selected rows.
-NSEnumerator*iter = [rows objectEnumerator];
-NSNumber*row;
-while ((row = [iter nextObject]) != nil) {
-if (![table isRowSelected:[row intValue]])
-return NO;
-}
-
-[pb declareTypes:[NSArray arrayWithObject:@"VLC media player module"] 
owner:nil];
-[pb setPropertyList:rows forType:@"VLC media player module"];
+- (BOOL)tableView:(NSTableView *)tableView writeRowsWithIndexes:(NSIndexSet 
*)rowIndexes toPasteboard:(NSPasteboard *)pboard
+{
+[pboard declareTypes:@[@"VLC media player module"] owner:nil];
+[pboard setPropertyList:@[@(rowIndexes.firstIndex)] forType:@"VLC media 
player module"];
 return YES;
 }
 

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

[vlc-commits] securetransport: fix mem leak

2020-01-24 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Fri Jan 24 17:54:35 
2020 +0100| [eef5d45135ceeb4708c05aa80d0ddb86f6b99e21] | committer: Felix Paul 
Kühne

securetransport: fix mem leak

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

 modules/misc/securetransport.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/misc/securetransport.c b/modules/misc/securetransport.c
index 8a40756557..fe24951691 100644
--- a/modules/misc/securetransport.c
+++ b/modules/misc/securetransport.c
@@ -451,6 +451,7 @@ static int st_Handshake (vlc_tls_t *session,
 OSStatus res = SSLCopyALPNProtocols(sys->p_context, );
 if (res == noErr && alpnArray) {
 *alp = CFArrayALPNCopyFirst(alpnArray);
+CFRelease(alpnArray);
 if (unlikely(*alp == NULL))
 return -1;
 } else {

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

[vlc-commits] build/appleos: keep the logger modules

2020-01-24 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Fri Jan 24 11:45:05 
2020 +0100| [361ad729d761ba47f2364c4ee7e124a7f072d2a6] | committer: Felix Paul 
Kühne

build/appleos: keep the logger modules

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

 extras/package/apple/build.conf | 2 --
 1 file changed, 2 deletions(-)

diff --git a/extras/package/apple/build.conf b/extras/package/apple/build.conf
index 4b53fb9aaf..efb056d76b 100644
--- a/extras/package/apple/build.conf
+++ b/extras/package/apple/build.conf
@@ -190,8 +190,6 @@ export VLC_MODULE_REMOVAL_LIST_BASE=(
 speex_resampler
 magnify
 gradient
-file_logger
-console_logger
 visual
 invert
 sepia

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

[vlc-commits] appleos/build: add support for bitcode compilation

2020-01-24 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Thu Jan 23 13:40:28 
2020 +0100| [809c03446e5f3020f0701abea373d930f38b22be] | committer: Felix Paul 
Kühne

appleos/build: add support for bitcode compilation

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

 extras/package/apple/build.sh | 22 +-
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/extras/package/apple/build.sh b/extras/package/apple/build.sh
index 2d5a9dfa4b..978871a6db 100755
--- a/extras/package/apple/build.sh
+++ b/extras/package/apple/build.sh
@@ -94,6 +94,8 @@ CORE_COUNT=$(sysctl -n machdep.cpu.core_count)
 let VLC_USE_NUMBER_OF_CORES=$CORE_COUNT+1
 # whether to disable debug mode (the default) or not
 VLC_DISABLE_DEBUG=0
+# whether to compile with bitcode or not
+VLC_USE_BITCODE=0
 
 ##
 #Helper functions#
@@ -103,12 +105,13 @@ VLC_DISABLE_DEBUG=0
 usage()
 {
 echo "Usage: $VLC_SCRIPT_NAME [options]"
-echo " --arch=ARCH Architecture to build for"
+echo " --arch=ARCH  Architecture to build for"
 echo "   (i386|x86_64|armv7|arm64)"
-echo " --sdk=SDK   Name of the SDK to build with (see 'xcodebuild 
-showsdks')"
-echo " --disable-debug Disable libvlc debug mode (for release)"
-echo " --verbose   Print verbose output and disable multi-core use"
-echo " --help  Print this help"
+echo " --sdk=SDKName of the SDK to build with (see 'xcodebuild 
-showsdks')"
+echo " --enable-bitcode Enable bitcode for compilation"
+echo " --disable-debug  Disable libvlc debug mode (for release)"
+echo " --verbosePrint verbose output and disable multi-core use"
+echo " --help   Print this help"
 echo ""
 echo "Advanced options:"
 echo " --package-contribsCreate a prebuilt contrib package"
@@ -285,6 +288,9 @@ set_host_envvars()
 {
 # Flags to be used for C-like compilers (C, C++, Obj-C)
 local clike_flags="$VLC_DEPLOYMENT_TARGET_CFLAG -arch $VLC_HOST_ARCH 
-isysroot $VLC_APPLE_SDK_PATH $1"
+if [ "$VLC_USE_BITCODE" -gt "0" ]; then
+clike_flags+=" -fembed-bitcode"
+fi
 
 export CPPFLAGS="-arch $VLC_HOST_ARCH -isysroot $VLC_APPLE_SDK_PATH"
 
@@ -315,6 +321,9 @@ write_config_mak()
 {
 # Flags to be used for C-like compilers (C, C++, Obj-C)
 local clike_flags="$VLC_DEPLOYMENT_TARGET_CFLAG -arch $VLC_HOST_ARCH 
-isysroot $VLC_APPLE_SDK_PATH $1"
+if [ "$VLC_USE_BITCODE" -gt "0" ]; then
+clike_flags+=" -fembed-bitcode"
+fi
 
 local vlc_cppflags="-arch $VLC_HOST_ARCH -isysroot $VLC_APPLE_SDK_PATH"
 local vlc_cflags="$clike_flags"
@@ -396,6 +405,9 @@ do
 --disable-debug)
 VLC_DISABLE_DEBUG=1
 ;;
+--enable-bitcode)
+VLC_USE_BITCODE=1
+;;
 --arch=*)
 VLC_HOST_ARCH="${1#--arch=}"
 ;;

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

[vlc-commits] contrib/ffmpeg: fix compilation with bitcode for iOS/tvOS

2020-01-24 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Fri Jan 24 11:08:53 
2020 +0100| [bfb245618116f53eb4ddeab4e1e8233e85f06356] | committer: Felix Paul 
Kühne

contrib/ffmpeg: fix compilation with bitcode for iOS/tvOS

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

 contrib/src/ffmpeg/rules.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 1d34ba6bdf..a1e77da515 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -141,7 +141,7 @@ endif
 
 # Darwin
 ifdef HAVE_DARWIN_OS
-FFMPEGCONF += --arch=$(ARCH) --target-os=darwin
+FFMPEGCONF += --arch=$(ARCH) --target-os=darwin --extra-cflags="$(CFLAGS)"
 ifdef USE_FFMPEG
 FFMPEGCONF += --disable-lzma
 endif

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

[vlc-commits] contrib/gpg-error: fix compilation for appleOS

2020-01-23 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Thu Jan 23 11:20:47 
2020 +0100| [0455fc1dd297bbc30bfcc02833a824235e317885] | committer: Felix Paul 
Kühne

contrib/gpg-error: fix compilation for appleOS

This fixes the compilation in case the host triplet does not include a version 
number and can therefore conflict with the files potentially to be copied.

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

 contrib/src/gpg-error/rules.mak | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/contrib/src/gpg-error/rules.mak b/contrib/src/gpg-error/rules.mak
index b36cc57344..e0223dc753 100644
--- a/contrib/src/gpg-error/rules.mak
+++ b/contrib/src/gpg-error/rules.mak
@@ -34,19 +34,27 @@ endif
 endif
 ifdef HAVE_DARWIN_OS
 ifdef HAVE_ARMV7A
+ifneq ($(HOST),arm-apple-darwin)
cp $@/src/syscfg/lock-obj-pub.arm-apple-darwin.h 
$@/src/syscfg/lock-obj-pub.$(HOST).h
+endif
 else
 ifeq ($(ARCH),aarch64)
 ifneq ($(HOST),aarch64-apple-darwin)
cp $@/src/syscfg/lock-obj-pub.aarch64-apple-darwin.h 
$@/src/syscfg/lock-obj-pub.$(HOST).h
 endif
 else
-ifneq ($(ARCH),x86_64)
+ifeq ($(ARCH),x86_64)
+ifneq ($(HOST),x86_64-apple-darwin)
+   cp $@/src/syscfg/lock-obj-pub.x86_64-apple-darwin.h 
$@/src/syscfg/lock-obj-pub.$(HOST).h
+endif
+else
+ifneq ($(HOST),i386-apple-darwin)
cp $@/src/syscfg/lock-obj-pub.x86_64-apple-darwin.h 
$@/src/syscfg/lock-obj-pub.$(HOST).h
 endif
 endif
 endif
 endif
+endif
 ifdef HAVE_NACL
 ifeq ($(ARCH),i386) # 32bits intel
cp $@/src/syscfg/lock-obj-pub.i686-pc-linux-gnu.h 
$@/src/syscfg/lock-obj-pub.nacl.h

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

[vlc-commits] Remove support for ARMv7s

2020-01-23 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Wed Jan 22 18:28:21 
2020 +0100| [e7210c467cd1f9f0c5e7b169247385a1bb5020d0] | committer: Felix Paul 
Kühne

Remove support for ARMv7s

This platform was used by iPhone 5 only, which can also execute ARMv7 and is 
quite dated now, so the maintenance burden cannot no longer be justified.

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

 contrib/bootstrap | 4 
 contrib/src/vpx/rules.mak | 8 
 extras/package/apple/build.sh | 4 ++--
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/contrib/bootstrap b/contrib/bootstrap
index 01a234e55c..5ed5f6f25d 100755
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -273,10 +273,6 @@ case "${OS}" in
add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" 
"HAVE_FPU"
 
case "${HOST}" in
-   *armv7s*)
-   add_make "PLATFORM_SHORT_ARCH := armv7s"
-   add_make_enabled "HAVE_NEON" 
"HAVE_ARMV7A"
-   ;;
*arm64*|*aarch64*)
add_make "PLATFORM_SHORT_ARCH := arm64"
;;
diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index 23841bb28c..8dd9f6305c 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -38,15 +38,7 @@ endif
 VPX_LDFLAGS := $(LDFLAGS)
 
 ifeq ($(ARCH),arm)
-ifdef HAVE_IOS
-ifneq ($(filter armv7s%,$(subst -, ,$(HOST))),)
-VPX_ARCH := armv7s
-else
-VPX_ARCH := armv7
-endif
-else
 VPX_ARCH := armv7
-endif
 else ifeq ($(ARCH),i386)
 VPX_ARCH := x86
 else ifeq ($(ARCH),mips)
diff --git a/extras/package/apple/build.sh b/extras/package/apple/build.sh
index 3f4a15a191..2d5a9dfa4b 100755
--- a/extras/package/apple/build.sh
+++ b/extras/package/apple/build.sh
@@ -104,7 +104,7 @@ usage()
 {
 echo "Usage: $VLC_SCRIPT_NAME [options]"
 echo " --arch=ARCH Architecture to build for"
-echo "   (i386|x86_64|armv7|armv7s|arm64)"
+echo "   (i386|x86_64|armv7|arm64)"
 echo " --sdk=SDK   Name of the SDK to build with (see 'xcodebuild 
-showsdks')"
 echo " --disable-debug Disable libvlc debug mode (for release)"
 echo " --verbose   Print verbose output and disable multi-core use"
@@ -182,7 +182,7 @@ set_deployment_target()
 validate_architecture()
 {
 case "$1" in
-i386|x86_64|armv7|armv7s|arm64)
+i386|x86_64|armv7|arm64)
 VLC_HOST_ARCH="$1"
 ;;
 aarch64)

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

[vlc-commits] configure: fix compilation for tvOS

2020-01-22 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Wed Jan 22 15:01:28 
2020 +0100| [ee0f8c6106ae8a3b2e50fc03c20df6c673a89af9] | committer: Felix Paul 
Kühne

configure: fix compilation for tvOS

Both daemon and fork are declared for tvOS but are not available for use, so we 
need to explicitly ignore them.

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

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

diff --git a/configure.ac b/configure.ac
index f69d719553..0d7af8a01e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -195,6 +195,8 @@ case "${host_os}" in
  [HAVE_TVOS="1"
  HAVE_IOS="0"
  HAVE_OSX="0"
+ ac_cv_func_daemon=no
+ ac_cv_func_fork=no
  ],)
 
 dnl

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

[vlc-commits] appleos/build: save one hierarchy level when building

2020-01-22 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Wed Jan 22 15:54:05 
2020 +0100| [d3614e5c033b6b2736795ae8371b7e4659539c61] | committer: Felix Paul 
Kühne

appleos/build: save one hierarchy level when building

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

 extras/package/apple/build.sh | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/extras/package/apple/build.sh b/extras/package/apple/build.sh
index 70015b3f5d..79c73b3971 100755
--- a/extras/package/apple/build.sh
+++ b/extras/package/apple/build.sh
@@ -612,13 +612,13 @@ if ! [ -e configure ]; then
 fi
 
 # Build
-mkdir -p "${VLC_BUILD_DIR}/build/${VLC_PSEUDO_TRIPLET}"
-cd "${VLC_BUILD_DIR}/build/${VLC_PSEUDO_TRIPLET}" || abort_err "Failed cd to 
VLC build dir"
+mkdir -p "${VLC_BUILD_DIR}/build"
+cd "${VLC_BUILD_DIR}/build" || abort_err "Failed cd to VLC build dir"
 
 # Create VLC install dir if it does not already exist
 mkdir -p "$VLC_INSTALL_DIR"
 
-../../../configure \
+../../configure \
 --with-contrib="$VLC_CONTRIB_INSTALL_DIR" \
 --host="$VLC_HOST_TRIPLET" \
 --prefix="$VLC_INSTALL_DIR" \
@@ -663,8 +663,8 @@ echo ""
 
 echo "Compile VLC static modules list object"
 
-mkdir -p "${VLC_BUILD_DIR}/build/${VLC_PSEUDO_TRIPLET}/build-sh"
-cd "${VLC_BUILD_DIR}/build/${VLC_PSEUDO_TRIPLET}/build-sh" \
+mkdir -p "${VLC_BUILD_DIR}/build/build-sh"
+cd "${VLC_BUILD_DIR}/build/build-sh" \
  || abort_err "Failed cd to VLC build-sh build dir"
 
 # Collect paths of all static libraries needed (plugins and contribs)
@@ -695,7 +695,7 @@ gen_vlc_static_module_list 
"${VLC_STATIC_MODULELIST_NAME}.c" "${VLC_PLUGINS_SYMB
 ${CC:-cc} -c  ${CFLAGS} "${VLC_STATIC_MODULELIST_NAME}.c" \
   || abort_err "Compiling module list file failed"
 
-echo 
"${VLC_BUILD_DIR}/build/${VLC_PSEUDO_TRIPLET}/build-sh/${VLC_STATIC_MODULELIST_NAME}.o"
 \
+echo "${VLC_BUILD_DIR}/build/build-sh/${VLC_STATIC_MODULELIST_NAME}.o" \
   >> "$VLC_STATIC_FILELIST_NAME"
 
 echo ""

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

[vlc-commits] appleos/build: move resulting static libs to a folder of their own

2020-01-22 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Wed Jan 22 15:56:43 
2020 +0100| [2c490ea4ddabe70154f028fb69a3a0cc8db305eb] | committer: Felix Paul 
Kühne

appleos/build: move resulting static libs to a folder of their own

This way, they are no longer burried in a build folder where no-one can find 
them.

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

 extras/package/apple/build.sh | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/extras/package/apple/build.sh b/extras/package/apple/build.sh
index 79c73b3971..3f4a15a191 100755
--- a/extras/package/apple/build.sh
+++ b/extras/package/apple/build.sh
@@ -663,9 +663,9 @@ echo ""
 
 echo "Compile VLC static modules list object"
 
-mkdir -p "${VLC_BUILD_DIR}/build/build-sh"
-cd "${VLC_BUILD_DIR}/build/build-sh" \
- || abort_err "Failed cd to VLC build-sh build dir"
+mkdir -p "${VLC_BUILD_DIR}/static-lib"
+cd "${VLC_BUILD_DIR}/static-lib" \
+ || abort_err "Failed cd to VLC static-lib build dir"
 
 # Collect paths of all static libraries needed (plugins and contribs)
 VLC_STATIC_FILELIST_NAME="static-libs-list"
@@ -695,7 +695,7 @@ gen_vlc_static_module_list 
"${VLC_STATIC_MODULELIST_NAME}.c" "${VLC_PLUGINS_SYMB
 ${CC:-cc} -c  ${CFLAGS} "${VLC_STATIC_MODULELIST_NAME}.c" \
   || abort_err "Compiling module list file failed"
 
-echo "${VLC_BUILD_DIR}/build/build-sh/${VLC_STATIC_MODULELIST_NAME}.o" \
+echo "${VLC_BUILD_DIR}/static-lib/${VLC_STATIC_MODULELIST_NAME}.o" \
   >> "$VLC_STATIC_FILELIST_NAME"
 
 echo ""

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

[vlc-commits] contrib/gpg-error: fix compilation for x86_64 on macOS

2020-01-22 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Wed Jan 22 17:07:16 
2020 +0100| [18f1ff6d899c3127346d4952b66a02fafa431e3e] | committer: Felix Paul 
Kühne

contrib/gpg-error: fix compilation for x86_64 on macOS

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

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

diff --git a/contrib/src/gpg-error/rules.mak b/contrib/src/gpg-error/rules.mak
index badf00cf57..b36cc57344 100644
--- a/contrib/src/gpg-error/rules.mak
+++ b/contrib/src/gpg-error/rules.mak
@@ -41,10 +41,12 @@ ifneq ($(HOST),aarch64-apple-darwin)
cp $@/src/syscfg/lock-obj-pub.aarch64-apple-darwin.h 
$@/src/syscfg/lock-obj-pub.$(HOST).h
 endif
 else
+ifneq ($(ARCH),x86_64)
cp $@/src/syscfg/lock-obj-pub.x86_64-apple-darwin.h 
$@/src/syscfg/lock-obj-pub.$(HOST).h
 endif
 endif
 endif
+endif
 ifdef HAVE_NACL
 ifeq ($(ARCH),i386) # 32bits intel
cp $@/src/syscfg/lock-obj-pub.i686-pc-linux-gnu.h 
$@/src/syscfg/lock-obj-pub.nacl.h

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

[vlc-commits] macosx: declare m2t extension

2020-01-22 Thread Felix Paul Kühne

vlc/vlc-3.0 | branch: master | Felix Paul Kühne  | Wed Jan 22 
14:55:52 2020 +0100| [1c41ac1877157b48724fc37fca41215b997f35f4] | committer: 
Felix Paul Kühne

macosx: declare m2t extension

(cherry picked from commit 4979d82332be2d067c91574aa5df7db1bbcea797)

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

 share/Info.plist.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/share/Info.plist.in b/share/Info.plist.in
index 071cfac5d9..d0ed11041f 100644
--- a/share/Info.plist.in
+++ b/share/Info.plist.in
@@ -930,6 +930,7 @@

tp
ts
+   m2t
m2ts
mts
mt2s
@@ -2154,6 +2155,7 @@
ps
tp
ts
+   m2t
m2ts
mts
mt2s

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

[vlc-commits] macosx: declare m2t extension

2020-01-22 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Wed Jan 22 14:55:52 
2020 +0100| [4979d82332be2d067c91574aa5df7db1bbcea797] | committer: Felix Paul 
Kühne

macosx: declare m2t extension

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

 share/Info.plist.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/share/Info.plist.in b/share/Info.plist.in
index 04b8531517..e382f277ca 100644
--- a/share/Info.plist.in
+++ b/share/Info.plist.in
@@ -1027,6 +1027,7 @@

tp
ts
+   m2t
m2ts
mts
mt2s
@@ -2198,6 +2199,7 @@
ps
tp
ts
+   m2t
m2ts
mts
mt2s

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

[vlc-commits] macosx/media source: handle preparse-ended event

2020-01-06 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Sun Dec 29 16:23:49 
2019 +0100| [897bec4e30c59b0032a1f6e5360e72d4310d078e] | committer: Felix Paul 
Kühne

macosx/media source: handle preparse-ended event

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

 modules/gui/macosx/media-source/VLCMediaSource.h   |  1 +
 modules/gui/macosx/media-source/VLCMediaSource.m   | 14 ++
 .../gui/macosx/media-source/VLCMediaSourceBaseDataSource.m | 10 ++
 3 files changed, 25 insertions(+)

diff --git a/modules/gui/macosx/media-source/VLCMediaSource.h 
b/modules/gui/macosx/media-source/VLCMediaSource.h
index f40368959b..c39da12cb7 100644
--- a/modules/gui/macosx/media-source/VLCMediaSource.h
+++ b/modules/gui/macosx/media-source/VLCMediaSource.h
@@ -32,6 +32,7 @@ NS_ASSUME_NONNULL_BEGIN
 extern NSString *VLCMediaSourceChildrenReset;
 extern NSString *VLCMediaSourceChildrenAdded;
 extern NSString *VLCMediaSourceChildrenRemoved;
+extern NSString *VLCMediaSourcePreparsingEnded;
 
 @interface VLCMediaSource : NSObject
 
diff --git a/modules/gui/macosx/media-source/VLCMediaSource.m 
b/modules/gui/macosx/media-source/VLCMediaSource.m
index d02bee24f7..eb187fd1ea 100644
--- a/modules/gui/macosx/media-source/VLCMediaSource.m
+++ b/modules/gui/macosx/media-source/VLCMediaSource.m
@@ -37,6 +37,7 @@
 NSString *VLCMediaSourceChildrenReset = @"VLCMediaSourceChildrenReset";
 NSString *VLCMediaSourceChildrenAdded = @"VLCMediaSourceChildrenAdded";
 NSString *VLCMediaSourceChildrenRemoved = @"VLCMediaSourceChildrenRemoved";
+NSString *VLCMediaSourcePreparsingEnded = @"VLCMediaSourcePreparsingEnded";
 
 static void cb_children_reset(vlc_media_tree_t *p_tree,
   input_item_node_t *p_node,
@@ -75,10 +76,23 @@ static void cb_children_removed(vlc_media_tree_t *p_tree,
 });
 }
 
+static void cb_preparse_ended(vlc_media_tree_t *p_tree,
+  input_item_node_t *p_node,
+  enum input_item_preparse_status status,
+  void *p_data)
+{
+dispatch_async(dispatch_get_main_queue(), ^{
+VLCMediaSource *mediaSource = (__bridge VLCMediaSource *)p_data;
+[[NSNotificationCenter defaultCenter] 
postNotificationName:VLCMediaSourcePreparsingEnded
+
object:mediaSource];
+});
+}
+
 static const struct vlc_media_tree_callbacks treeCallbacks = {
 cb_children_reset,
 cb_children_added,
 cb_children_removed,
+cb_preparse_ended,
 };
 
 @implementation VLCMediaSource
diff --git a/modules/gui/macosx/media-source/VLCMediaSourceBaseDataSource.m 
b/modules/gui/macosx/media-source/VLCMediaSourceBaseDataSource.m
index 3994cde2a8..34fcc7b1e6 100644
--- a/modules/gui/macosx/media-source/VLCMediaSourceBaseDataSource.m
+++ b/modules/gui/macosx/media-source/VLCMediaSourceBaseDataSource.m
@@ -65,6 +65,10 @@ NSString *VLCMediaSourceTableViewCellIdentifier = 
@"VLCMediaSourceTableViewCellI
selector:@selector(mediaSourceChildrenRemoved:)
name:VLCMediaSourceChildrenRemoved
  object:nil];
+[notificationCenter addObserver:self
+   selector:@selector(mediaSourcePreparingEnded:)
+   name:VLCMediaSourcePreparsingEnded
+ object:nil];
 }
 return self;
 }
@@ -375,6 +379,12 @@ NSString *VLCMediaSourceTableViewCellIdentifier = 
@"VLCMediaSourceTableViewCellI
 [self reloadDataForNotification:aNotification];
 }
 
+- (void)mediaSourcePreparingEnded:(NSNotification *)aNotification
+{
+msg_Dbg(getIntf(), "Preparsing ended: %s", [[aNotification.object 
description] UTF8String]);
+[self reloadDataForNotification:aNotification];
+}
+
 - (void)reloadDataForNotification:(NSNotification *)aNotification
 {
 if (_gridViewMode) {

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

[vlc-commits] macosx/fspanel: fix title

2020-01-06 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Sun Dec 29 15:34:15 
2019 +0100| [5dd154ef42a937a0c4f72b1dd7002eb554de4275] | committer: Felix Paul 
Kühne

macosx/fspanel: fix title

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

 modules/gui/macosx/windows/video/VLCFSPanelController.m | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/gui/macosx/windows/video/VLCFSPanelController.m 
b/modules/gui/macosx/windows/video/VLCFSPanelController.m
index 21bb703a63..28d0a6f249 100644
--- a/modules/gui/macosx/windows/video/VLCFSPanelController.m
+++ b/modules/gui/macosx/windows/video/VLCFSPanelController.m
@@ -162,6 +162,8 @@ static NSString *kAssociatedFullscreenRect = 
@"VLCFullscreenAssociatedWindowRect
  * so the state is shared between those.
  */
 [_remainingOrTotalTime 
setRemainingIdentifier:VLCTimeFieldDisplayTimeAsRemaining];
+
+[self inputItemChanged:nil];
 }
 
 #undef setupButton
@@ -282,7 +284,7 @@ static NSString *kAssociatedFullscreenRect = 
@"VLCFullscreenAssociatedWindowRect
 title = _NS("VLC media player");
 }
 
-if (nowPlaying) {
+if (nowPlaying.length > 0) {
 [_mediaTitle setStringValue:nowPlaying];
 } else {
 [_mediaTitle setStringValue:title];

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

[vlc-commits] contrib/vpx: disable tools compilation

2019-12-23 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Mon Dec 23 15:33:36 
2019 +0100| [ceb912373b9553af4755c78cf1a1aa4e531fdcfa] | committer: Felix Paul 
Kühne

contrib/vpx: disable tools compilation

This addresses compilation issues for iOS and generally, those tools are not 
needed in VLC's context for any platform.

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

 contrib/src/vpx/rules.mak | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index 63808e3f5a..630f4abdf2 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -101,7 +101,8 @@ VPX_CONF := \
--disable-install-bins \
--disable-install-docs \
--disable-dependency-tracking \
-   --enable-vp9-highbitdepth
+   --enable-vp9-highbitdepth \
+   --disable-tools
 
 ifndef HAVE_WIN32
 ifndef HAVE_IOS

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

[vlc-commits] contrib/vpx: fix compilation for iOS Simulator

2019-12-23 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Fri Nov 22 11:17:45 
2019 +0100| [d771840eb6261b30cc27f67a451fdde5511dc40c] | committer: Felix Paul 
Kühne

contrib/vpx: fix compilation for iOS Simulator

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

 contrib/src/vpx/rules.mak | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index 02c07e851a..63808e3f5a 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -75,6 +75,7 @@ ifeq ($(ARCH),$(filter $(ARCH), arm aarch64))
 VPX_OS := darwin
 else
 VPX_OS := darwin11
+VPX_CROSS :=
 endif
 else ifdef HAVE_SOLARIS
 VPX_OS := solaris

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

[vlc-commits] apple/build: add more options

2019-12-06 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Wed Nov 27 18:08:32 
2019 +0100| [86907bce50a4e366824553dd1bee12c63d220075] | committer: Felix Paul 
Kühne

apple/build: add more options

This exposes the verbose option, adds disable-debug and compiles the sources on 
all the cores by default.

Additionally, this downloads all the contrib packages before compiling a single 
one of them.

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

 extras/package/apple/build.sh | 41 ++---
 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/extras/package/apple/build.sh b/extras/package/apple/build.sh
index f35dcd4de0..e0508370a9 100755
--- a/extras/package/apple/build.sh
+++ b/extras/package/apple/build.sh
@@ -89,6 +89,11 @@ VLC_USE_PREBUILT_CONTRIBS=0
 # User-provided URL from where to fetch contribs, empty
 # for the default chosen by contrib system
 VLC_PREBUILT_CONTRIBS_URL=${VLC_PREBUILT_CONTRIBS_URL:-""}
+# The number of cores to compile on
+CORE_COUNT=$(sysctl -n machdep.cpu.core_count)
+let VLC_USE_NUMBER_OF_CORES=$CORE_COUNT+1
+# whether to disable debug mode (the default) or not
+VLC_DISABLE_DEBUG=0
 
 ##
 #Helper functions#
@@ -98,10 +103,12 @@ VLC_PREBUILT_CONTRIBS_URL=${VLC_PREBUILT_CONTRIBS_URL:-""}
 usage()
 {
 echo "Usage: $VLC_SCRIPT_NAME [options]"
-echo " --arch=ARCHArchitecture to build for"
-echo "  (i386|x86_64|armv7|armv7s|arm64)"
-echo " --sdk=SDK  Name of the SDK to build with (see 'xcodebuild 
-showsdks')"
-echo " --help Print this help"
+echo " --arch=ARCH Architecture to build for"
+echo "   (i386|x86_64|armv7|armv7s|arm64)"
+echo " --sdk=SDK   Name of the SDK to build with (see 'xcodebuild 
-showsdks')"
+echo " --disable-debug Disable libvlc debug mode (for release)"
+echo " --verbose   Print verbose output and disable multi-core use"
+echo " --help  Print this help"
 echo ""
 echo "Advanced options:"
 echo " --package-contribsCreate a prebuilt contrib package"
@@ -362,6 +369,10 @@ do
 ;;
 --verbose)
 VLC_SCRIPT_VERBOSE=1
+VLC_USE_NUMBER_OF_CORES=1
+;;
+--disable-debug)
+VLC_DISABLE_DEBUG=1
 ;;
 --arch=*)
 VLC_HOST_ARCH="${1#--arch=}"
@@ -420,12 +431,13 @@ readonly 
VLC_PSEUDO_TRIPLET="${VLC_HOST_ARCH}-apple-${VLC_HOST_PLATFORM}_${VLC_D
 # Contrib install dir
 readonly VLC_CONTRIB_INSTALL_DIR="$VLC_BUILD_DIR/contrib/$VLC_PSEUDO_TRIPLET"
 # VLC install dir
-readonly VLC_INSTALL_DIR="$VLC_BUILD_DIR/vlc-$VLC_PSEUDO_TRIPLET"
+readonly 
VLC_INSTALL_DIR="$VLC_BUILD_DIR/vlc-${VLC_APPLE_SDK_NAME}-${VLC_HOST_ARCH}"
 
 echo "Build configuration"
-echo "  Platform: $VLC_HOST_PLATFORM"
-echo "  Architecture: $VLC_HOST_ARCH"
-echo "  SDK Version:  $VLC_APPLE_SDK_VERSION"
+echo "  Platform: $VLC_HOST_PLATFORM"
+echo "  Architecture: $VLC_HOST_ARCH"
+echo "  SDK Version:  $VLC_APPLE_SDK_VERSION"
+echo "  Number of Cores:  $VLC_USE_NUMBER_OF_CORES"
 echo ""
 
 ##
@@ -475,7 +487,7 @@ echo "Building needed tools (if missing)"
 
 cd "$VLC_SRC_DIR/extras/tools" || abort_err "Failed cd to tools dir"
 ./bootstrap || abort_err "Bootstrapping tools failed"
-$MAKE || abort_err "Building tools failed"
+$MAKE -j$VLC_USE_NUMBER_OF_CORES || abort_err "Building tools failed"
 
 echo ""
 
@@ -533,8 +545,11 @@ else
 # Print list of contribs that will be built
 $MAKE list
 
+# Download source packages
+$MAKE fetch -j$VLC_USE_NUMBER_OF_CORES
+
 # Build contribs
-$MAKE || abort_err "Building contribs failed"
+$MAKE -j$VLC_USE_NUMBER_OF_CORES || abort_err "Building contribs failed"
 
 # Make prebuilt contribs package
 if [ "$VLC_MAKE_PREBUILT_CONTRIBS" -gt "0" ]; then
@@ -564,6 +579,10 @@ elif [ "$VLC_HOST_OS" = "tvos" ]; then
 VLC_CONFIG_OPTIONS+=( "${VLC_CONFIG_OPTIONS_TVOS[@]}" )
 fi
 
+if [ "$VLC_DISABLE_DEBUG" -gt "0" ]; then
+VLC_CONFIG_OPTIONS+=( "--disable-debug" )
+fi
+
 # Bootstrap VLC
 cd "$VLC_SRC_DIR" || abort_err "Failed cd to VLC source dir"
 ./bootstrap
@@ -582,7 +601,7 @@ mkdir -p "$VLC_INSTALL_DIR"
 "${VLC_CONFIG_OPTIONS[@]}" \
  || abort_err "Configuring VLC failed"
 
-$MAKE || abort_err "Building VLC failed"
+$MAKE -j$VLC_USE_NUMBER_OF_CORES || abort_err "Building VLC failed"
 
 $MAKE install || abort_err "Installing VLC failed"
 

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

[vlc-commits] apple/build: disable AOM for iOS and tvOS

2019-12-06 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Wed Nov 27 17:55:18 
2019 +0100| [4e54cf163b3facc4d3a7cae0489dfe41919e16e3] | committer: Felix Paul 
Kühne

apple/build: disable AOM for iOS and tvOS

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

 extras/package/apple/build.conf | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/extras/package/apple/build.conf b/extras/package/apple/build.conf
index d9ba5c9436..4b53fb9aaf 100644
--- a/extras/package/apple/build.conf
+++ b/extras/package/apple/build.conf
@@ -82,11 +82,14 @@ export VLC_CONTRIB_OPTIONS_MACOSX=(
 )
 
 # Additional contrib bootstrap options for iOS
-export VLC_CONTRIB_OPTIONS_IOS=()
+export VLC_CONTRIB_OPTIONS_IOS=(
+--disable-aom
+)
 
 # Additional contrib bootstrap options for tvOS
 export VLC_CONTRIB_OPTIONS_TVOS=(
 --disable-libarchive
+--disable-aom
 )
 
 #

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

[vlc-commits] apple/build: bootstrap only if configure does not exist

2019-12-06 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Wed Nov 27 20:57:31 
2019 +0100| [f18af1b1c9029c199afd7d38e952ea3e4a1e12a0] | committer: Felix Paul 
Kühne

apple/build: bootstrap only if configure does not exist

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

 extras/package/apple/build.sh | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/extras/package/apple/build.sh b/extras/package/apple/build.sh
index e0508370a9..3a0a9b8819 100755
--- a/extras/package/apple/build.sh
+++ b/extras/package/apple/build.sh
@@ -585,7 +585,10 @@ fi
 
 # Bootstrap VLC
 cd "$VLC_SRC_DIR" || abort_err "Failed cd to VLC source dir"
-./bootstrap
+if ! [ -e configure ]; then
+echo "Bootstraping vlc"
+./bootstrap
+fi
 
 # Build
 mkdir -p "${VLC_BUILD_DIR}/build/${VLC_PSEUDO_TRIPLET}"

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

[vlc-commits] apple/build: fix cross-compilation for x86_64

2019-12-06 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Wed Nov 27 16:16:04 
2019 +0100| [43826f9fd75b53346c79ba9b8071237c03723c9e] | committer: Felix Paul 
Kühne

apple/build: fix cross-compilation for x86_64

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

 extras/package/apple/build.sh | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/extras/package/apple/build.sh b/extras/package/apple/build.sh
index 5f7f0ed6f5..f35dcd4de0 100755
--- a/extras/package/apple/build.sh
+++ b/extras/package/apple/build.sh
@@ -407,11 +407,14 @@ check_tool xcrun
 # Validate given SDK name
 validate_sdk_name "$VLC_APPLE_SDK_NAME"
 
+# Set triplet (query the compiler for this)
+# FIXME: we hard-code the version number here so HOST and BUILD will not be 
same
+# which fixes cross-compilation for x86_64
+# note that for 'aarch64', we need to specify it like this here and sanity to 
'arm64' afterwards
+readonly VLC_HOST_TRIPLET="${VLC_HOST_ARCH}-apple-darwin18"
+
 # Validate architecture argument
 validate_architecture "$VLC_HOST_ARCH"
-
-# Set triplet (query the compiler for this)
-readonly VLC_HOST_TRIPLET="$(${CC:-cc} -arch "$VLC_HOST_ARCH" -dumpmachine)"
 # Set pseudo-triplet
 readonly 
VLC_PSEUDO_TRIPLET="${VLC_HOST_ARCH}-apple-${VLC_HOST_PLATFORM}_${VLC_DEPLOYMENT_TARGET}"
 # Contrib install dir

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

[vlc-commits] apple/build: rename installation folder for contrib

2019-12-06 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Fri Nov 29 11:26:35 
2019 +0100| [4696e7f2c2d4d92b4adc96f7ed9109abba07b46c] | committer: Felix Paul 
Kühne

apple/build: rename installation folder for contrib

This strips duplicate information and makes the folder a lot easier to parse.

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

 extras/package/apple/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extras/package/apple/build.sh b/extras/package/apple/build.sh
index 3a0a9b8819..ab2daf53d7 100755
--- a/extras/package/apple/build.sh
+++ b/extras/package/apple/build.sh
@@ -429,7 +429,7 @@ validate_architecture "$VLC_HOST_ARCH"
 # Set pseudo-triplet
 readonly 
VLC_PSEUDO_TRIPLET="${VLC_HOST_ARCH}-apple-${VLC_HOST_PLATFORM}_${VLC_DEPLOYMENT_TARGET}"
 # Contrib install dir
-readonly VLC_CONTRIB_INSTALL_DIR="$VLC_BUILD_DIR/contrib/$VLC_PSEUDO_TRIPLET"
+readonly 
VLC_CONTRIB_INSTALL_DIR="$VLC_BUILD_DIR/contrib/${VLC_HOST_ARCH}-${VLC_APPLE_SDK_NAME}"
 # VLC install dir
 readonly 
VLC_INSTALL_DIR="$VLC_BUILD_DIR/vlc-${VLC_APPLE_SDK_NAME}-${VLC_HOST_ARCH}"
 

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

[vlc-commits] macosx: add support for Apple Music

2019-11-14 Thread Felix Paul Kühne

vlc/vlc-3.0 | branch: master | Felix Paul Kühne  | Thu Nov 14 
11:55:44 2019 +0100| [2164633b495bff4f6435b434ee05dc7572e4a663] | committer: 
Felix Paul Kühne

macosx: add support for Apple Music

This matches the previous iTunes support.

This is a manual backport of 20bf0e212.

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

 NEWS |  3 ++-
 modules/gui/macosx/SPMediaKeyTap.m   |  1 +
 modules/gui/macosx/VLCInputManager.m | 26 +-
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 66755c1961..c2f5a215e5 100644
--- a/NEWS
+++ b/NEWS
@@ -7,7 +7,7 @@ Core:
 Demux:
  * Fix TTML entities not passed to decoder
  * Misc raw H264/HEVC frame rate fixes
- * Fixed adaptive regression on TS format change (mostly HLS)
+ * Fix adaptive regression on TS format change (mostly HLS)
 
 Packetizers:
  * Fixes H264/HEVC incomplete draining in some cases
@@ -19,6 +19,7 @@ Decoder:
 
 macOS:
  * Fix Apple Remote support on macOS Catalina
+ * Add support for pausing Apple Music on macOS Catalina
 
 Misc:
  * Add missing .wpl & .zpl file associations on Windows
diff --git a/modules/gui/macosx/SPMediaKeyTap.m 
b/modules/gui/macosx/SPMediaKeyTap.m
index 3083660bde..5b9505995a 100644
--- a/modules/gui/macosx/SPMediaKeyTap.m
+++ b/modules/gui/macosx/SPMediaKeyTap.m
@@ -177,6 +177,7 @@ static CGEventRef tapEventCallback(CGEventTapProxy proxy, 
CGEventType type, CGEv
 [[NSBundle mainBundle] bundleIdentifier], // your app
 @"com.spotify.client",
 @"com.apple.iTunes",
+@"com.apple.Music",
 @"com.apple.QuickTimePlayerX",
 @"com.apple.quicktimeplayer",
 @"com.apple.iWork.Keynote",
diff --git a/modules/gui/macosx/VLCInputManager.m 
b/modules/gui/macosx/VLCInputManager.m
index f4ada0f9a3..2b736dc2da 100644
--- a/modules/gui/macosx/VLCInputManager.m
+++ b/modules/gui/macosx/VLCInputManager.m
@@ -158,8 +158,9 @@ static int InputEvent(vlc_object_t *p_this, const char 
*psz_var,
 
 IOPMAssertionID userActivityAssertionID;
 
-/* iTunes/Spotify play/pause support */
+/* iTunes/Apple Music/Spotify play/pause support */
 BOOL b_has_itunes_paused;
+BOOL b_has_applemusic_paused;
 BOOL b_has_spotify_paused;
 
 NSTimer *hasEndedTimer;
@@ -368,6 +369,18 @@ static int InputEvent(vlc_object_t *p_this, const char 
*psz_var,
 }
 }
 
+// pause Apple Music
+if (!b_has_applemusic_paused) {
+iTunesApplication *iTunesApp = (iTunesApplication *) [SBApplication 
applicationWithBundleIdentifier:@"com.apple.Music"];
+if (iTunesApp && [iTunesApp isRunning]) {
+if ([iTunesApp playerState] == iTunesEPlSPlaying) {
+msg_Dbg(p_intf, "pausing Apple Music");
+[iTunesApp pause];
+b_has_itunes_paused = YES;
+}
+}
+}
+
 // pause Spotify
 if (!b_has_spotify_paused) {
 SpotifyApplication *spotifyApp = (SpotifyApplication *) [SBApplication 
applicationWithBundleIdentifier:@"com.spotify.client"];
@@ -398,6 +411,16 @@ static int InputEvent(vlc_object_t *p_this, const char 
*psz_var,
 }
 }
 
+if (b_has_applemusic_paused) {
+iTunesApplication *iTunesApp = (iTunesApplication *) 
[SBApplication applicationWithBundleIdentifier:@"com.apple.Music"];
+if (iTunesApp && [iTunesApp isRunning]) {
+if ([iTunesApp playerState] == iTunesEPlSPaused) {
+msg_Dbg(p_intf, "unpausing Apple Music");
+[iTunesApp playpause];
+}
+}
+}
+
 if (b_has_spotify_paused) {
 SpotifyApplication *spotifyApp = (SpotifyApplication *) 
[SBApplication applicationWithBundleIdentifier:@"com.spotify.client"];
 if (spotifyApp) {
@@ -412,6 +435,7 @@ static int InputEvent(vlc_object_t *p_this, const char 
*psz_var,
 }
 
 b_has_itunes_paused = NO;
+b_has_applemusic_paused = NO;
 b_has_spotify_paused = NO;
 }
 

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

[vlc-commits] macosx: add support for Apple Music

2019-11-12 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Wed Nov 13 07:38:39 
2019 +0100| [20bf0e212f349d9dffe61a7a34e99d15fd6d4787] | committer: Felix Paul 
Kühne

macosx: add support for Apple Music

This matches the previous iTunes support.

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

 .../macosx/imported/SPMediaKeyTap/SPMediaKeyTap.m  |  1 +
 modules/gui/macosx/playlist/VLCPlayerController.m  | 25 +-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/modules/gui/macosx/imported/SPMediaKeyTap/SPMediaKeyTap.m 
b/modules/gui/macosx/imported/SPMediaKeyTap/SPMediaKeyTap.m
index 3083660bde..5b9505995a 100644
--- a/modules/gui/macosx/imported/SPMediaKeyTap/SPMediaKeyTap.m
+++ b/modules/gui/macosx/imported/SPMediaKeyTap/SPMediaKeyTap.m
@@ -177,6 +177,7 @@ static CGEventRef tapEventCallback(CGEventTapProxy proxy, 
CGEventType type, CGEv
 [[NSBundle mainBundle] bundleIdentifier], // your app
 @"com.spotify.client",
 @"com.apple.iTunes",
+@"com.apple.Music",
 @"com.apple.QuickTimePlayerX",
 @"com.apple.quicktimeplayer",
 @"com.apple.iWork.Keynote",
diff --git a/modules/gui/macosx/playlist/VLCPlayerController.m 
b/modules/gui/macosx/playlist/VLCPlayerController.m
index 5d98c3cc3b..1698f9b36f 100644
--- a/modules/gui/macosx/playlist/VLCPlayerController.m
+++ b/modules/gui/macosx/playlist/VLCPlayerController.m
@@ -88,8 +88,9 @@ const CGFloat VLCVolumeDefault = 1.;
 /* remote control support */
 VLCRemoteControlService *_remoteControlService;
 
-/* iTunes/Spotify play/pause support */
+/* iTunes/Apple Music/Spotify play/pause support */
 BOOL _iTunesPlaybackWasPaused;
+BOOL _appleMusicPlaybackWasPaused;
 BOOL _SpotifyPlaybackWasPaused;
 
 NSTimer *_playbackHasTruelyEndedTimer;
@@ -862,6 +863,17 @@ static int BossCallback(vlc_object_t *p_this,
 }
 }
 
+if (!_appleMusicPlaybackWasPaused) {
+iTunesApplication *iTunesApp = (iTunesApplication *) [SBApplication 
applicationWithBundleIdentifier:@"com.apple.Music"];
+if (iTunesApp && [iTunesApp isRunning]) {
+if ([iTunesApp playerState] == iTunesEPlSPlaying) {
+msg_Dbg(p_intf, "pausing Apple Music");
+[iTunesApp pause];
+_appleMusicPlaybackWasPaused = YES;
+}
+}
+}
+
 // pause Spotify
 if (!_SpotifyPlaybackWasPaused) {
 SpotifyApplication *spotifyApp = (SpotifyApplication *) [SBApplication 
applicationWithBundleIdentifier:@"com.spotify.client"];
@@ -891,6 +903,16 @@ static int BossCallback(vlc_object_t *p_this,
 }
 }
 
+if (_appleMusicPlaybackWasPaused) {
+iTunesApplication *iTunesApp = (iTunesApplication *) 
[SBApplication applicationWithBundleIdentifier:@"com.apple.Music"];
+if (iTunesApp && [iTunesApp isRunning]) {
+if ([iTunesApp playerState] == iTunesEPlSPaused) {
+msg_Dbg(p_intf, "unpausing Apple Music");
+[iTunesApp playpause];
+}
+}
+}
+
 if (_SpotifyPlaybackWasPaused) {
 SpotifyApplication *spotifyApp = (SpotifyApplication *) 
[SBApplication applicationWithBundleIdentifier:@"com.spotify.client"];
 if (spotifyApp) {
@@ -905,6 +927,7 @@ static int BossCallback(vlc_object_t *p_this,
 }
 
 _iTunesPlaybackWasPaused = NO;
+_appleMusicPlaybackWasPaused = NO;
 _SpotifyPlaybackWasPaused = NO;
 }
 

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

[vlc-commits] macosx/build: add flag to disable debug mode

2019-11-09 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Sun Nov 10 11:00:28 
2019 +0900| [0a53308907f6444a79d7a488c996037b63acafd9] | committer: Felix Paul 
Kühne

macosx/build: add flag to disable debug mode

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

 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 3bf377d4a3..0f3d0f67c9 100755
--- a/extras/package/macosx/build.sh
+++ b/extras/package/macosx/build.sh
@@ -37,6 +37,7 @@ OPTIONS:
-a  Use the specified arch (default: $ARCH)
-CUse the specified VLC build dir
-b   Enable breakpad support and send crash reports to this URL
+   -dDisable debug mode (on by default)
 EOF
 
 }
@@ -51,7 +52,7 @@ spopd()
 popd > /dev/null
 }
 
-while getopts "hvrcpi:k:a:j:C:b:" OPTION
+while getopts "hvrcdpi:k:a:j:C:b:" OPTION
 do
  case $OPTION in
  h)
@@ -62,6 +63,9 @@ do
  set +x
  QUIET="yes"
  ;;
+ d)
+ NODEBUG="yes"
+ ;;
  r)
  REBUILD="yes"
  ;;
@@ -197,6 +201,9 @@ CONFIGFLAGS=""
 if [ ! -z "$BREAKPAD" ]; then
  CONFIGFLAGS="$CONFIGFLAGS --with-breakpad=$BREAKPAD"
 fi
+if [ "$NODEBUG" = "yes" ]; then
+ CONFIGFLAGS="$CONFIGFLAGS --disable-debug"
+fi
 
 if [ "${vlcroot}/configure" -nt Makefile ]; then
 
@@ -209,7 +216,6 @@ if [ "${vlcroot}/configure" -nt Makefile ]; then
   $VLC_CONFIGURE_ARGS > $out
 fi
 
-
 #
 # make
 #

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

[vlc-commits] macosx: fix pointer mismatch

2019-11-08 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Sat Nov  9 10:06:07 
2019 +0900| [13e18f3182e2a7b425411ce70ed83161108c3d1f] | committer: Felix Paul 
Kühne

macosx: fix pointer mismatch

A instance of VLCOpenBlockDeviceDescription was casted to NSDictionary leading 
to a runtime exception (#23091).

This patch addresses the problem and prevents future issues by setting the 
class on the arrays.

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

 modules/gui/macosx/windows/VLCOpenWindowController.m | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/gui/macosx/windows/VLCOpenWindowController.m 
b/modules/gui/macosx/windows/VLCOpenWindowController.m
index 3f79a3fe9c..6d93043fbc 100644
--- a/modules/gui/macosx/windows/VLCOpenWindowController.m
+++ b/modules/gui/macosx/windows/VLCOpenWindowController.m
@@ -95,9 +95,9 @@ NSString *const VLCOpenTextFieldWasClicked = 
@"VLCOpenTextFieldWasClicked";
 BOOL b_nodvdmenus;
 NSView *_currentOpticalMediaView;
 NSImageView *_currentOpticalMediaIconView;
-NSMutableArray *_allMediaDevices;
-NSArray *_opticalDevices;
-NSMutableArray *_specialMediaFolders;
+NSMutableArray *_allMediaDevices;
+NSArray *_opticalDevices;
+NSMutableArray *_specialMediaFolders;
 NSString *_filePath;
 NSString *_fileSlavePath;
 NSString *_subPath;
@@ -835,8 +835,8 @@ NSString *const VLCOpenTextFieldWasClicked = 
@"VLCOpenTextFieldWasClicked";
 NSUInteger count = [self->_allMediaDevices count];
 if (count > 0) {
 for (NSUInteger i = 0; i < count ; i++) {
-NSDictionary *deviceDict = [self->_allMediaDevices 
objectAtIndex:i];
-[self->_discSelectorPopup addItemWithTitle: [[NSFileManager 
defaultManager] displayNameAtPath:[deviceDict objectForKey:@"path"]]];
+VLCOpenBlockDeviceDescription *deviceDescription = 
[self->_allMediaDevices objectAtIndex:i];
+[self->_discSelectorPopup addItemWithTitle: [[NSFileManager 
defaultManager] displayNameAtPath:deviceDescription.path]];
 }
 
 if ([self->_discSelectorPopup numberOfItems] <= 1)

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

[vlc-commits] macosx: add custom window close button

2019-11-03 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Fri Nov  1 09:16:17 
2019 +0100| [72e49c8ea3e55bcbfb40c3a36b598b0352760bde] | committer: Felix Paul 
Kühne

macosx: add custom window close button

This is based on legacy code of the 3.0 branch

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

 .../package/macosx/VLC.xcodeproj/project.pbxproj   |   6 +
 modules/gui/macosx/Makefile.am |  16 +-
 .../Button-Icons/window-close-graphite.png | Bin 0 -> 228 bytes
 .../Button-Icons/window-close-graph...@2x.png  | Bin 0 -> 381 bytes
 .../Button-Icons/window-close-on-graphite.png  | Bin 0 -> 278 bytes
 .../Button-Icons/window-close-on-graph...@2x.png   | Bin 0 -> 441 bytes
 .../Resources/Button-Icons/window-close-on.png | Bin 0 -> 286 bytes
 .../Resources/Button-Icons/window-close...@2x.png  | Bin 0 -> 477 bytes
 .../Button-Icons/window-close-over-graphite.png| Bin 0 -> 253 bytes
 .../Button-Icons/window-close-over-graph...@2x.png | Bin 0 -> 437 bytes
 .../Resources/Button-Icons/window-close-over.png   | Bin 0 -> 293 bytes
 .../Button-Icons/window-close-o...@2x.png  | Bin 0 -> 449 bytes
 .../macosx/Resources/Button-Icons/window-close.png | Bin 0 -> 248 bytes
 .../Resources/Button-Icons/window-cl...@2x.png | Bin 0 -> 379 bytes
 modules/gui/macosx/views/VLCCustomWindowButton.h   |  56 +
 modules/gui/macosx/views/VLCCustomWindowButton.m   | 262 +
 po/POTFILES.in |   2 +
 17 files changed, 341 insertions(+), 1 deletion(-)

diff --git a/extras/package/macosx/VLC.xcodeproj/project.pbxproj 
b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
index 84bb08d28e..c6a4fde941 100644
--- a/extras/package/macosx/VLC.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
@@ -120,6 +120,7 @@
7D445D8B22032B9200263D34 /* VLCPlaylistTableView.m in Sources 
*/ = {isa = PBXBuildFile; fileRef = 7D445D8A22032B9200263D34 /* 
VLCPlaylistTableView.m */; };
7D445D8E2203375100263D34 /* VLCPlaylistMenuController.m in 
Sources */ = {isa = PBXBuildFile; fileRef = 7D445D8D2203375100263D34 /* 
VLCPlaylistMenuController.m */; };
7D460B0C229EB4C700097948 /* VLCDragDropView.m in Sources */ = 
{isa = PBXBuildFile; fileRef = 7D460B0B229EB4C700097948 /* VLCDragDropView.m 
*/; };
+   7D61DCE4236C1937008133CF /* VLCCustomWindowButton.m in Sources 
*/ = {isa = PBXBuildFile; fileRef = 7D61DCE3236C1937008133CF /* 
VLCCustomWindowButton.m */; };
7D66D4362200BC340040D04A /* VLCClickerManager.m in Sources */ = 
{isa = PBXBuildFile; fileRef = 7D66D4352200BC340040D04A /* VLCClickerManager.m 
*/; };
7D66D4392200C5B80040D04A /* VLCVideoFilterHelper.m in Sources 
*/ = {isa = PBXBuildFile; fileRef = 7D66D4382200C5B80040D04A /* 
VLCVideoFilterHelper.m */; };
7D66D43C2200D6090040D04A /* VLCDetachedVideoWindow.m in Sources 
*/ = {isa = PBXBuildFile; fileRef = 7D66D43B2200D6090040D04A /* 
VLCDetachedVideoWindow.m */; };
@@ -497,6 +498,8 @@
7D5678EC1D5BA1DC002698F3 /* VLCApplication.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path 
= VLCApplication.m; sourceTree = ""; };
7D5678EE1D5BA397002698F3 /* VLCMainWindowControlsBar.h */ = 
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; 
path = VLCMainWindowControlsBar.h; sourceTree = ""; };
7D5678EF1D5BA397002698F3 /* VLCMainWindowControlsBar.m */ = 
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = 
sourcecode.c.objc; path = VLCMainWindowControlsBar.m; sourceTree = ""; };
+   7D61DCE2236C1937008133CF /* VLCCustomWindowButton.h */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.h; path = 
VLCCustomWindowButton.h; sourceTree = ""; };
+   7D61DCE3236C1937008133CF /* VLCCustomWindowButton.m */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = 
VLCCustomWindowButton.m; sourceTree = ""; };
7D66D4342200BC340040D04A /* VLCClickerManager.h */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.h; path = 
VLCClickerManager.h; sourceTree = ""; };
7D66D4352200BC340040D04A /* VLCClickerManager.m */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = 
VLCClickerManager.m; sourceTree = ""; };
7D66D4372200C5B80040D04A /* VLCVideoFilterHelper.h */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.h; path = 
VLCVideoFilterHelper.h; sourceTree = ""; };
@@ -825,6 +828,8 @@
1C1ED5062204AB7C00811EC0 /* views */ = {
isa = PBXGroup;
children = (
+

[vlc-commits] macosx/image view: add API to disable rounded corner masking

2019-11-03 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Sun Nov  3 18:44:36 
2019 +0100| [bcef1373d83e76e094aa4474a24b918cf1c08fa9] | committer: Felix Paul 
Kühne

macosx/image view: add API to disable rounded corner masking

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

 modules/gui/macosx/views/VLCImageView.h |  1 +
 modules/gui/macosx/views/VLCImageView.m | 22 +++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/modules/gui/macosx/views/VLCImageView.h 
b/modules/gui/macosx/views/VLCImageView.h
index 4008d299da..9bb3094f04 100644
--- a/modules/gui/macosx/views/VLCImageView.h
+++ b/modules/gui/macosx/views/VLCImageView.h
@@ -41,6 +41,7 @@ typedef NS_ENUM(NSInteger, VLCImageViewContentGravity) {
 
 @property (readwrite, retain, nonatomic, nullable) NSImage *image;
 @property (readwrite) VLCImageViewContentGravity contentGravity;
+@property (readwrite) BOOL cropsImagesToRoundedCorners;
 
 - (void)setImageURL:(NSURL * _Nonnull)url placeholderImage:(NSImage * 
_Nullable)image;
 
diff --git a/modules/gui/macosx/views/VLCImageView.m 
b/modules/gui/macosx/views/VLCImageView.m
index bd4184cbfd..53294a0c2e 100644
--- a/modules/gui/macosx/views/VLCImageView.m
+++ b/modules/gui/macosx/views/VLCImageView.m
@@ -49,12 +49,28 @@
 self.layer = [[CALayer alloc] init];
 self.contentGravity = VLCImageViewContentGravityResizeAspectFill;
 self.wantsLayer = YES;
-self.layer.cornerRadius = 5.;
-self.layer.masksToBounds = YES;
-self.layer.borderWidth = 1.;
+[self setCropsImagesToRoundedCorners:YES];
 [self setupBorderColor];
 }
 
+- (void)setCropsImagesToRoundedCorners:(BOOL)cropsImagesToRoundedCorners
+{
+if (cropsImagesToRoundedCorners) {
+self.layer.cornerRadius = 5.;
+self.layer.masksToBounds = YES;
+self.layer.borderWidth = 1.;
+} else {
+self.layer.cornerRadius = 0.;
+self.layer.masksToBounds = NO;
+self.layer.borderWidth = 0.;
+}
+}
+
+- (BOOL)cropsImagesToRoundedCorners
+{
+return self.layer.masksToBounds;
+}
+
 - (void)setupBorderColor
 {
 self.layer.borderColor = self.shouldShowDarkAppearance ? [NSColor 
VLClibrarySeparatorDarkColor].CGColor : [NSColor 
VLClibrarySeparatorLightColor].CGColor;

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

[vlc-commits] macosx/detached audio window: add close button and animations

2019-11-03 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Sun Nov  3 19:13:43 
2019 +0100| [62c62bac312e3c1606325f683a90b1589e7ead8b] | committer: Felix Paul 
Kühne

macosx/detached audio window: add close button and animations

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

 .../package/macosx/VLC.xcodeproj/project.pbxproj   |  32 
 modules/gui/macosx/UI/VLCDetachedAudioWindow.xib   | 198 -
 .../gui/macosx/windows/VLCDetachedAudioWindow.h|   1 +
 .../gui/macosx/windows/VLCDetachedAudioWindow.m|  15 +-
 4 files changed, 157 insertions(+), 89 deletions(-)

diff --git a/extras/package/macosx/VLC.xcodeproj/project.pbxproj 
b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
index c6a4fde941..76c85cb66d 100644
--- a/extras/package/macosx/VLC.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
@@ -500,6 +500,18 @@
7D5678EF1D5BA397002698F3 /* VLCMainWindowControlsBar.m */ = 
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = 
sourcecode.c.objc; path = VLCMainWindowControlsBar.m; sourceTree = ""; };
7D61DCE2236C1937008133CF /* VLCCustomWindowButton.h */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.h; path = 
VLCCustomWindowButton.h; sourceTree = ""; };
7D61DCE3236C1937008133CF /* VLCCustomWindowButton.m */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = 
VLCCustomWindowButton.m; sourceTree = ""; };
+   7D61DCE7236C6A3D008133CF /* window-close.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; name = "window-close.png"; 
path = "Button-Icons/window-close.png"; sourceTree = ""; };
+   7D61DCE8236C6A3D008133CF /* window-close-on-graph...@2x.png */ 
= {isa = PBXFileReference; lastKnownFileType = image.png; name = 
"window-close-on-graph...@2x.png"; path = 
"Button-Icons/window-close-on-graph...@2x.png"; sourceTree = ""; };
+   7D61DCE9236C6A3D008133CF /* window-close-over-graphite.png */ = 
{isa = PBXFileReference; lastKnownFileType = image.png; name = 
"window-close-over-graphite.png"; path = 
"Button-Icons/window-close-over-graphite.png"; sourceTree = ""; };
+   7D61DCEA236C6A3D008133CF /* window-close-o...@2x.png */ = {isa 
= PBXFileReference; lastKnownFileType = image.png; name = 
"window-close-o...@2x.png"; path = "Button-Icons/window-close-o...@2x.png"; 
sourceTree = ""; };
+   7D61DCEB236C6A3D008133CF /* window-close-on-graphite.png */ = 
{isa = PBXFileReference; lastKnownFileType = image.png; name = 
"window-close-on-graphite.png"; path = 
"Button-Icons/window-close-on-graphite.png"; sourceTree = ""; };
+   7D61DCEC236C6A3D008133CF /* window-close...@2x.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; name = 
"window-close...@2x.png"; path = "Button-Icons/window-close...@2x.png"; 
sourceTree = ""; };
+   7D61DCED236C6A3D008133CF /* window-close-graph...@2x.png */ = 
{isa = PBXFileReference; lastKnownFileType = image.png; name = 
"window-close-graph...@2x.png"; path = 
"Button-Icons/window-close-graph...@2x.png"; sourceTree = ""; };
+   7D61DCEE236C6A3D008133CF /* window-close-on.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; name = "window-close-on.png"; 
path = "Button-Icons/window-close-on.png"; sourceTree = ""; };
+   7D61DCEF236C6A3D008133CF /* window-close-over-graph...@2x.png 
*/ = {isa = PBXFileReference; lastKnownFileType = image.png; name = 
"window-close-over-graph...@2x.png"; path = 
"Button-Icons/window-close-over-graph...@2x.png"; sourceTree = ""; };
+   7D61DCF0236C6A3D008133CF /* window-close-over.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; name = 
"window-close-over.png"; path = "Button-Icons/window-close-over.png"; 
sourceTree = ""; };
+   7D61DCF1236C6A3D008133CF /* window-cl...@2x.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; name = "window-cl...@2x.png"; 
path = "Button-Icons/window-cl...@2x.png"; sourceTree = ""; };
+   7D61DCF2236C6A3D008133CF /* window-close-graphite.png */ = {isa 
= PBXFileReference; lastKnownFileType = image.png; name = 
"window-close-graphite.png"; path = "Button-Icons/window-close-graphite.png"; 
sourceTree = ""; };
7D66D4342200BC340040D04A /* VLCClickerManager.h */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.h; path = 
VLCClickerManager.h; sourceTree = ""; };
7D66D4352200BC34004

[vlc-commits] macosx/tracking view: add API to animate transitions

2019-11-03 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Sun Nov  3 19:12:50 
2019 +0100| [096145ee1df4fc5ce40ba95daf73efc683678cab] | committer: Felix Paul 
Kühne

macosx/tracking view: add API to animate transitions

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

 modules/gui/macosx/views/VLCTrackingView.h |  1 +
 modules/gui/macosx/views/VLCTrackingView.m | 25 +++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/modules/gui/macosx/views/VLCTrackingView.h 
b/modules/gui/macosx/views/VLCTrackingView.h
index 2c4a6976ed..c115a7f17c 100644
--- a/modules/gui/macosx/views/VLCTrackingView.h
+++ b/modules/gui/macosx/views/VLCTrackingView.h
@@ -26,6 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface VLCTrackingView : NSView
 
+@property (readwrite) BOOL animatesTransition;
 @property (readwrite, assign, nullable) NSView *viewToHide;
 
 @end
diff --git a/modules/gui/macosx/views/VLCTrackingView.m 
b/modules/gui/macosx/views/VLCTrackingView.m
index 01fb4cf7f1..bc07fa830b 100644
--- a/modules/gui/macosx/views/VLCTrackingView.m
+++ b/modules/gui/macosx/views/VLCTrackingView.m
@@ -32,12 +32,33 @@
 
 - (void)mouseExited:(NSEvent *)event
 {
-self.viewToHide.hidden = YES;
+if (self.animatesTransition) {
+[self.viewToHide setAlphaValue:1.0];
+__weak typeof(self.viewToHide) weakViewToHide = self.viewToHide;
+[NSAnimationContext runAnimationGroup:^(NSAnimationContext *context){
+[[NSAnimationContext currentContext] setDuration:0.9];
+[[weakViewToHide animator] setAlphaValue:0.0];
+} completionHandler:^{
+[weakViewToHide setHidden:YES];
+}];
+} else {
+self.viewToHide.hidden = YES;
+}
 }
 
 - (void)mouseEntered:(NSEvent *)event
 {
-self.viewToHide.hidden = NO;
+if (self.animatesTransition) {
+[self.viewToHide setAlphaValue:.0];
+[self.viewToHide setHidden:NO];
+__weak typeof(self.viewToHide) weakViewToHide = self.viewToHide;
+[NSAnimationContext runAnimationGroup:^(NSAnimationContext *context){
+[[NSAnimationContext currentContext] setDuration:0.9];
+[[weakViewToHide animator] setAlphaValue:1.0];
+} completionHandler:nil];
+} else {
+self.viewToHide.hidden = NO;
+}
 }
 
 - (void)updateTrackingAreas

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

[vlc-commits] macosx: remove unused resources

2019-10-30 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Wed Oct 30 10:03:08 
2019 +0100| [6206d1c944f8aa860fa134095910ea2a4682af84] | committer: Felix Paul 
Kühne

macosx: remove unused resources

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

 extras/package/macosx/VLC.xcodeproj/project.pbxproj |  16 
 modules/gui/macosx/Makefile.am  |   8 
 .../macosx/Resources/sidebar-icons/sidebar-local.png| Bin 396 -> 0 bytes
 .../macosx/Resources/sidebar-icons/sidebar-lo...@2x.png | Bin 1142 -> 0 bytes
 .../macosx/Resources/sidebar-icons/sidebar-pictures.png | Bin 201 -> 0 bytes
 .../Resources/sidebar-icons/sidebar-pictu...@2x.png | Bin 237 -> 0 bytes
 .../macosx/Resources/sidebar-icons/sidebar-playlist.png | Bin 233 -> 0 bytes
 .../Resources/sidebar-icons/sidebar-playl...@2x.png | Bin 303 -> 0 bytes
 .../macosx/Resources/sidebar-icons/sidebar-podcast.png  | Bin 336 -> 0 bytes
 .../Resources/sidebar-icons/sidebar-podc...@2x.png  | Bin 734 -> 0 bytes
 modules/gui/macosx/menus/VLCStatusBarIcon.h |   1 -
 modules/gui/macosx/menus/VLCStatusBarIcon.m |   6 --
 12 files changed, 31 deletions(-)

diff --git a/extras/package/macosx/VLC.xcodeproj/project.pbxproj 
b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
index e437332b11..84bb08d28e 100644
--- a/extras/package/macosx/VLC.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
@@ -407,18 +407,10 @@
6B8229C21E4D2CFC00833BE1 /* VLCInterfaceCone.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; path = VLCInterfaceCone.png; 
sourceTree = ""; };
6B8229C31E4D2CFC00833BE1 /* VLCSubtitleCone.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; path = VLCSubtitleCone.png; 
sourceTree = ""; };
6B8229C41E4D2CFC00833BE1 /* VLCVideoCone.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; path = VLCVideoCone.png; 
sourceTree = ""; };
-   6B8229CC1E4D2D4700833BE1 /* sidebar-local.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; path = "sidebar-local.png"; 
sourceTree = ""; };
-   6B8229CD1E4D2D4700833BE1 /* sidebar-lo...@2x.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; path = "sidebar-lo...@2x.png"; 
sourceTree = ""; };
6B8229CE1E4D2D4700833BE1 /* sidebar-movie.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; path = "sidebar-movie.png"; 
sourceTree = ""; };
6B8229CF1E4D2D4700833BE1 /* sidebar-mo...@2x.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; path = "sidebar-mo...@2x.png"; 
sourceTree = ""; };
6B8229D01E4D2D4700833BE1 /* sidebar-music.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; path = "sidebar-music.png"; 
sourceTree = ""; };
6B8229D11E4D2D4700833BE1 /* sidebar-mu...@2x.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; path = "sidebar-mu...@2x.png"; 
sourceTree = ""; };
-   6B8229D21E4D2D4700833BE1 /* sidebar-pictures.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; path = "sidebar-pictures.png"; 
sourceTree = ""; };
-   6B8229D31E4D2D4700833BE1 /* sidebar-pictu...@2x.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; path = 
"sidebar-pictu...@2x.png"; sourceTree = ""; };
-   6B8229D41E4D2D4700833BE1 /* sidebar-playlist.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; path = "sidebar-playlist.png"; 
sourceTree = ""; };
-   6B8229D51E4D2D4700833BE1 /* sidebar-playl...@2x.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; path = 
"sidebar-playl...@2x.png"; sourceTree = ""; };
-   6B8229D61E4D2D4700833BE1 /* sidebar-podcast.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; path = "sidebar-podcast.png"; 
sourceTree = ""; };
-   6B8229D71E4D2D4700833BE1 /* sidebar-podc...@2x.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; path = 
"sidebar-podc...@2x.png"; sourceTree = ""; };
6B8229FD1E4D2DB400833BE1 /* noart.png */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; path = noart.png; sourceTree = 
""; };
6B8229FF1E4D2DD100833BE1 /* vlc.scriptSuite */ = {isa = 
PBXFileReference; lastKnownFileType = text.plist.scriptSuite; path = 
vlc.scriptSuite; sourceTree = ""; };
6B822A001E4D2DD100833BE1 /* vlc.scriptTerminology */ = {isa = 
PBXFileReference; lastKnownFileType = text.pl

[vlc-commits] macosx: update .gitignore

2019-10-30 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Wed Oct 30 10:05:31 
2019 +0100| [f968e8791106bda1e9f3f386b9e7a136524bda22] | committer: Felix Paul 
Kühne

macosx: update .gitignore

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

 extras/package/macosx/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extras/package/macosx/.gitignore b/extras/package/macosx/.gitignore
index b55edfd88d..b65fd70408 100644
--- a/extras/package/macosx/.gitignore
+++ b/extras/package/macosx/.gitignore
@@ -6,3 +6,4 @@ Info.plist
 *.xcworkspace
 xcuserdata
 XCBuildData
+xcshareddata

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

[vlc-commits] macosx: add detached audio playback window

2019-10-30 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Tue Oct 29 09:30:56 
2019 +0100| [c3da5bdfc9aec5a08bb7714bf8af1c59a184f35d] | committer: Felix Paul 
Kühne

macosx: add detached audio playback window

This implements #2886.

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

 .../package/macosx/VLC.xcodeproj/project.pbxproj   |   8 +
 modules/gui/macosx/Makefile.am |   3 +
 modules/gui/macosx/UI/VLCDetachedAudioWindow.xib   | 175 +
 modules/gui/macosx/UI/VLCStatusBarIconMainMenu.xib |  34 ++--
 modules/gui/macosx/menus/VLCStatusBarIcon.h|   1 +
 modules/gui/macosx/menus/VLCStatusBarIcon.m|  14 ++
 .../gui/macosx/windows/VLCDetachedAudioWindow.h|  40 +
 .../gui/macosx/windows/VLCDetachedAudioWindow.m|  89 +++
 po/POTFILES.in |   2 +
 9 files changed, 352 insertions(+), 14 deletions(-)

diff --git a/extras/package/macosx/VLC.xcodeproj/project.pbxproj 
b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
index 2a3dcdcb9d..e437332b11 100644
--- a/extras/package/macosx/VLC.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
@@ -175,6 +175,7 @@
7DFBDCBE226CED7200B700A5 /* VLCMediaSource.m in Sources */ = 
{isa = PBXBuildFile; fileRef = 7DFBDCBD226CED7200B700A5 /* VLCMediaSource.m */; 
};
7DFBDCC1226DC16200B700A5 /* VLCInputItem.m in Sources */ = {isa 
= PBXBuildFile; fileRef = 7DFBDCC0226DC16200B700A5 /* VLCInputItem.m */; };
7DFBDCC4226E445500B700A5 /* VLCMediaSourceBaseDataSource.m in 
Sources */ = {isa = PBXBuildFile; fileRef = 7DFBDCC3226E445500B700A5 /* 
VLCMediaSourceBaseDataSource.m */; };
+   7DFFF90123682D4800C8B0C9 /* VLCDetachedAudioWindow.m in Sources 
*/ = {isa = PBXBuildFile; fileRef = 7DFFF90023682D4800C8B0C9 /* 
VLCDetachedAudioWindow.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -600,6 +601,9 @@
7DFBDCC0226DC16200B700A5 /* VLCInputItem.m */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCInputItem.m; 
sourceTree = ""; };
7DFBDCC2226E445500B700A5 /* VLCMediaSourceBaseDataSource.h */ = 
{isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = 
VLCMediaSourceBaseDataSource.h; sourceTree = ""; };
7DFBDCC3226E445500B700A5 /* VLCMediaSourceBaseDataSource.m */ = 
{isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = 
VLCMediaSourceBaseDataSource.m; sourceTree = ""; };
+   7DFFF8FE23682CE400C8B0C9 /* VLCDetachedAudioWindow.xib */ = 
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = 
VLCDetachedAudioWindow.xib; sourceTree = ""; };
+   7DFFF8FF23682D4800C8B0C9 /* VLCDetachedAudioWindow.h */ = {isa 
= PBXFileReference; lastKnownFileType = sourcecode.c.h; path = 
VLCDetachedAudioWindow.h; sourceTree = ""; };
+   7DFFF90023682D4800C8B0C9 /* VLCDetachedAudioWindow.m */ = {isa 
= PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = 
VLCDetachedAudioWindow.m; sourceTree = ""; };
8E49720006417F6800370C9F /* VLCInformationWindowController.h */ 
= {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = 
sourcecode.c.h; path = VLCInformationWindowController.h; sourceTree = 
""; };
8E49720106417F6800370C9F /* VLCInformationWindowController.m */ 
= {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = 
sourcecode.c.objc; path = VLCInformationWindowController.m; sourceTree = 
""; };
8E55FB7F0459B0FD00FB3317 /* VLCOutput.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
VLCOutput.h; sourceTree = ""; };
@@ -892,6 +896,8 @@
7DC21A7322049A6600F98A02 /* 
VLCOpenInputMetadata.m */,
8ED6C28103E2EB1C0059A3A7 /* 
VLCOpenWindowController.h */,
8ED6C28203E2EB1C0059A3A7 /* 
VLCOpenWindowController.m */,
+   7DFFF8FF23682D4800C8B0C9 /* 
VLCDetachedAudioWindow.h */,
+   7DFFF90023682D4800C8B0C9 /* 
VLCDetachedAudioWindow.m */,
);
path = windows;
sourceTree = "";
@@ -1569,6 +1575,7 @@
6B8224131E4D2A9000833BE1 /* StreamOutput.xib */,
6B8224151E4D2A9000833BE1 /* TextfieldPanel.xib 
*/,
6B8224161E4D2A9000833BE1 /* 
TimeSelectionPanel.xib */,
+   7DFFF8FE23682CE400C8B0C9 /* 
VLCDetachedAudioWindow.xib */,
);
name = XIBs;
path = ../../.

[vlc-commits] macosx/Apple Remote: fix play button cookie

2019-10-27 Thread Felix Paul Kühne

vlc/vlc-3.0 | branch: master | Felix Paul Kühne  | Sun Oct 27 
18:15:32 2019 +0100| [68127e4f3e8fa46ad60b91ab4172b66cc7550781] | committer: 
Felix Paul Kühne

macosx/Apple Remote: fix play button cookie

The 2005 white-plastic Apple Remote uses a different play button cookie than 
the 2009 aluminium version.

This patch fixes control by both devices.

(cherry picked from commit 229f99c2f3eb45f129fbd59088c74d76548497c4)

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

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

diff --git a/modules/gui/macosx/AppleRemote.m b/modules/gui/macosx/AppleRemote.m
index 7395e0b563..91cc731aad 100644
--- a/modules/gui/macosx/AppleRemote.m
+++ b/modules/gui/macosx/AppleRemote.m
@@ -79,7 +79,7 @@ const NSTimeInterval HOLD_RECOGNITION_TIME_INTERVAL=0.4;
 [mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonVolume_Plus]
forKey:@"35_23_22_17_14_4_3_35_23_22_4_3_"];
 [mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonVolume_Minus]   
forKey:@"35_23_22_18_14_4_3_35_23_22_4_3_"];
 [mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonMenu]   
forKey:@"35_24_23_22_4_3_35_24_23_22_4_3_"];
-[mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonPlay]   
forKey:@"35_23_22_10_4_3_35_23_22_10_4_3_"];
+[mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonPlay]   
forKey:@"35_25_23_22_4_3_35_25_23_22_4_3_"];
 [mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonRight]  
forKey:@"35_26_23_22_4_3_35_26_23_22_4_3_"];
 [mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonLeft]   
forKey:@"35_27_23_22_4_3_35_27_23_22_4_3_"];
 [mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonRight_Hold] forKey:@"35_23_22_16_14_4_3_"];

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

[vlc-commits] macosx/Apple Remote: fix play button cookie

2019-10-27 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Sun Oct 27 18:15:32 
2019 +0100| [229f99c2f3eb45f129fbd59088c74d76548497c4] | committer: Felix Paul 
Kühne

macosx/Apple Remote: fix play button cookie

The 2005 white-plastic Apple Remote uses a different play button cookie than 
the 2009 aluminium version.

This patch fixes control by both devices.

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

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

diff --git a/modules/gui/macosx/imported/AppleRemote/AppleRemote.m 
b/modules/gui/macosx/imported/AppleRemote/AppleRemote.m
index 44d22c665e..168654b40c 100644
--- a/modules/gui/macosx/imported/AppleRemote/AppleRemote.m
+++ b/modules/gui/macosx/imported/AppleRemote/AppleRemote.m
@@ -78,7 +78,7 @@ const NSTimeInterval HOLD_RECOGNITION_TIME_INTERVAL=0.4;
 [mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonVolume_Plus]
forKey:@"35_23_22_17_14_4_3_35_23_22_4_3_"];
 [mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonVolume_Minus]   
forKey:@"35_23_22_18_14_4_3_35_23_22_4_3_"];
 [mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonMenu]   
forKey:@"35_24_23_22_4_3_35_24_23_22_4_3_"];
-[mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonPlay]   
forKey:@"35_23_22_10_4_3_35_23_22_10_4_3_"];
+[mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonPlay]   
forKey:@"35_25_23_22_4_3_35_25_23_22_4_3_"];
 [mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonRight]  
forKey:@"35_26_23_22_4_3_35_26_23_22_4_3_"];
 [mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonLeft]   
forKey:@"35_27_23_22_4_3_35_27_23_22_4_3_"];
 [mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonRight_Hold] forKey:@"35_23_22_16_14_4_3_"];

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

[vlc-commits] macosx/Apple Remote: add support for macOS 10.15 (fixes #22976)

2019-10-25 Thread Felix Paul Kühne

vlc/vlc-3.0 | branch: master | Felix Paul Kühne  | Fri Oct 25 
07:57:18 2019 +0200| [c8cee0ad8beba188662ce66987c0c37fa6b3bf8b] | committer: 
Felix Paul Kühne

macosx/Apple Remote: add support for macOS 10.15 (fixes #22976)

Manual back-port of b3c389bf

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

 NEWS|  3 ++
 modules/gui/macosx/AppleRemote.m| 50 ++---
 modules/gui/macosx/CompatibilityFixes.h |  3 +-
 3 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/NEWS b/NEWS
index 931fcd4e4f..66755c1961 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,9 @@ Packetizers:
 Decoder:
  * avcodec: revector video decoder to fix incomplete drain
 
+macOS:
+ * Fix Apple Remote support on macOS Catalina
+
 Misc:
  * Add missing .wpl & .zpl file associations on Windows
 
diff --git a/modules/gui/macosx/AppleRemote.m b/modules/gui/macosx/AppleRemote.m
index 452a1e5d22..7395e0b563 100644
--- a/modules/gui/macosx/AppleRemote.m
+++ b/modules/gui/macosx/AppleRemote.m
@@ -75,23 +75,39 @@ const NSTimeInterval HOLD_RECOGNITION_TIME_INTERVAL=0.4;
 hidDeviceInterface = NULL;
 NSMutableDictionary * mutableCookieToButtonMapping = 
[[NSMutableDictionary alloc] init];
 
-[mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonVolume_Plus]forKey:@"33_31_30_21_20_2_"];
-[mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonVolume_Minus]   forKey:@"33_32_30_21_20_2_"];
-[mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonMenu]   
forKey:@"33_22_21_20_2_33_22_21_20_2_"];
-[mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonPlay]   
forKey:@"33_23_21_20_2_33_23_21_20_2_"];
-[mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonRight]  
forKey:@"33_24_21_20_2_33_24_21_20_2_"];
-[mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonLeft]   
forKey:@"33_25_21_20_2_33_25_21_20_2_"];
-[mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonRight_Hold] forKey:@"33_21_20_14_12_2_"];
-[mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonLeft_Hold]  forKey:@"33_21_20_13_12_2_"];
-[mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonMenu_Hold]  forKey:@"33_21_20_2_33_21_20_2_"];
-[mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonPlay_Sleep] 
forKey:@"37_33_21_20_2_37_33_21_20_2_"];
-[mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:k2009RemoteButtonPlay]   
forKey:@"33_21_20_8_2_33_21_20_8_2_"];
-[mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:k2009RemoteButtonFullscreen] 
forKey:@"33_21_20_3_2_33_21_20_3_2_"];
-[mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteControl_Switched] 
forKey:@"42_33_23_21_20_2_33_23_21_20_2_"];
-
-if (OSX_HIGH_SIERRA_AND_HIGHER) {
-[mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonVolume_Plus]forKey:@"33_21_20_15_12_2_"];
-[mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonVolume_Minus]   forKey:@"33_21_20_16_12_2_"];
+if (OSX_CATALINA_AND_HIGHER) {
+[mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonVolume_Plus]
forKey:@"35_23_22_17_14_4_3_35_23_22_4_3_"];
+[mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonVolume_Minus]   
forKey:@"35_23_22_18_14_4_3_35_23_22_4_3_"];
+[mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonMenu]   
forKey:@"35_24_23_22_4_3_35_24_23_22_4_3_"];
+[mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonPlay]   
forKey:@"35_23_22_10_4_3_35_23_22_10_4_3_"];
+[mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonRight]  
forKey:@"35_26_23_22_4_3_35_26_23_22_4_3_"];
+[mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonLeft]   
forKey:@"35_27_23_22_4_3_35_27_23_22_4_3_"];
+[mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonRight_Hold] forKey:@"35_23_22_16_14_4_3_"];
+[mutableCookieToButtonMapping setObject:[NSNumber 
numberWithInt:kRemoteButtonLeft_Hold]  forKey:@"35_23_22_15_14_4_3_"];
+[mutableCookieToButtonMapping setObject:[NSNum

1 2 3 4 5 6 7 8 9 10 >

1 - 100 of 2560 matches

Mail list logo