Packman Build Service PMBS

_service:obs_scm:vlc-beta-20260206.36decaa0b.obscpio/contrib/src/gcrypt/0001-compat-provide-a-getpid-replacement-that-works-on-Wi.patch Deleted

_service:obs_scm:vlc-beta-20260206.36decaa0b.obscpio/contrib/src/gcrypt/fix-pthread-detection.patch Deleted

@@ -1,38 +0,0 @@
-From 54a245738b12ad8985935de0ffea24980ce48db9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
-Date: Thu, 20 Apr 2017 17:26:02 +0200
-Subject: PATCH 2/5 Fix pthread detection
-
----
- configure.ac | 8 +++-----
- 1 file changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6ea38f53..781f3163 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -239,7 +239,6 @@ LIBGCRYPT_THREAD_MODULES=""
- # Other definitions.
- have_w32_system=no
- have_w32ce_system=no
--have_pthread=no
- 
- 
- # Setup some stuff depending on host.
-@@ -828,10 +827,9 @@ AC_SUBST(PTH_LIBS)
- # Check whether pthreads is available
- #
- if test "$have_w32_system" != yes; then
--  AC_CHECK_LIB(pthread,pthread_create,have_pthread=yes)
--  if test "$have_pthread" = yes; then
--    AC_DEFINE(HAVE_PTHREAD, 1 ,Define if we have pthread.)
--  fi
-+  AC_SEARCH_LIBS(pthread_create, pthread,
-+      AC_DEFINE(HAVE_PTHREAD, 1 ,Define if we have pthread.)
-+  )
- fi
- 
- 
--- 
-2.37.3.windows.1
-

_service:obs_scm:vlc-beta-20260206.36decaa0b.obscpio/NEWS -> _service:obs_scm:vlc-beta-20260208.37e0097a4.obscpio/NEWS Changed

_service:obs_scm:vlc-beta-20260206.36decaa0b.obscpio/contrib/src/gcrypt/SHA512SUMS -> _service:obs_scm:vlc-beta-20260208.37e0097a4.obscpio/contrib/src/gcrypt/SHA512SUMS Changed

_service:obs_scm:vlc-beta-20260206.36decaa0b.obscpio/contrib/src/gcrypt/gcrypt-uwp-getpid.patch -> _service:obs_scm:vlc-beta-20260208.37e0097a4.obscpio/contrib/src/gcrypt/gcrypt-uwp-getpid.patch Changed

@@ -1,16 +1,31 @@
---- gcrypt/compat/libcompat.h.orig	2019-06-23 17:35:08.000000000 +0200
-+++ gcrypt/compat/libcompat.h	2023-05-23 14:09:47.426668700 +0200
-@@ -26,6 +26,13 @@ const char *_gcry_compat_identification
- #ifndef HAVE_GETPID
- pid_t _gcry_getpid (void);
- #define getpid() _gcry_getpid ()
-+#elif defined(_WIN32)
+From 7e079a2afe445eb629157a89ab2a75c104cbe151 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4@ycbcr.xyz>
+Date: Tue, 23 May 2023 14:32:17 +0200
+Subject: PATCH 4/4 void getpid calls on Windows
+
+It's not available in UWP.
+---
+ compat/libcompat.h | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/compat/libcompat.h b/compat/libcompat.h
+index 411a27be..90f937c6 100644
+--- a/compat/libcompat.h
++++ b/compat/libcompat.h
+@@ -22,4 +22,13 @@
+ 
+ const char *_gcry_compat_identification (void);
+ 
++#if defined(_WIN32)
 +#include <winapifamily.h>
 +# if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
 +# include <windows.h>
 +   /* getpid is incorrectly detected, it's not available in this case */
 +#  define getpid() GetCurrentProcessId ()
 +# endif
- #endif
- 
- #ifndef HAVE_CLOCK
++#endif
++
+ #endif /*GCRY_LIBCOMPAT_H*/
+-- 
+2.52.0.windows.1
+

_service:obs_scm:vlc-beta-20260206.36decaa0b.obscpio/contrib/src/gcrypt/rules.mak -> _service:obs_scm:vlc-beta-20260208.37e0097a4.obscpio/contrib/src/gcrypt/rules.mak Changed

@@ -1,5 +1,5 @@
 # GCRYPT
-GCRYPT_VERSION := 1.10.1
+GCRYPT_VERSION := 1.12.0
 GCRYPT_URL := $(GNUGPG)/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2
 
 PKGS += gcrypt
@@ -21,25 +21,18 @@
 	$(call pkg_static,"src/libgcrypt.pc.in")
 	# $(call update_autoconfig,build-aux)
 	$(APPLY) $(SRC)/gcrypt/disable-tests-compilation.patch
-	$(APPLY) $(SRC)/gcrypt/fix-pthread-detection.patch
-	$(APPLY) $(SRC)/gcrypt/0001-compat-provide-a-getpid-replacement-that-works-on-Wi.patch
 	$(APPLY) $(SRC)/gcrypt/0007-random-don-t-use-API-s-that-are-forbidden-in-UWP-app.patch
 	$(APPLY) $(SRC)/gcrypt/0008-random-only-use-wincrypt-in-UWP-builds-if-WINSTORECO.patch
 
 	# don't use getpid in UWP as it's not actually available
 	$(APPLY) $(SRC)/gcrypt/gcrypt-uwp-getpid.patch
-ifdef HAVE_CROSS_COMPILE
-	# disable cross-compiled command line tools that can't be run
-	sed -i.orig -e 's,^bin_PROGRAMS ,bin_PROGRAMS_disabled ,g' $(UNPACK_DIR)/src/Makefile.am
-endif
-
 	$(MOVE)
 
 DEPS_gcrypt = gpg-error $(DEPS_gpg-error)
 
 GCRYPT_CONF = \
 	--enable-ciphers=aes,des,rfc2268,arcfour,chacha20 \
-	--enable-digests=sha1,md5,rmd160,sha256,sha512,blake2 \
+	--enable-digests=sha1,md5,rmd160,sha256,sha512,blake2,sha3 \
 	--enable-pubkey-ciphers=dsa,rsa,ecc \
 	--disable-doc
 
@@ -71,6 +64,6 @@
 	$(RECONF)
 	$(MAKEBUILDDIR)
 	$(MAKECONFIGURE) $(GCRYPT_CONF)
-	+$(MAKEBUILD)
-	+$(MAKEBUILD) install
+	+$(MAKEBUILD) bin_PROGRAMS=
+	+$(MAKEBUILD) bin_PROGRAMS= install
 	touch $@

_service:obs_scm:vlc-beta-20260206.36decaa0b.obscpio/contrib/src/sparkle/SHA512SUMS -> _service:obs_scm:vlc-beta-20260208.37e0097a4.obscpio/contrib/src/sparkle/SHA512SUMS Changed

_service:obs_scm:vlc-beta-20260208.37e0097a4.obscpio/contrib/src/sparkle/macos12-compilation.patch Added

_service:obs_scm:vlc-beta-20260206.36decaa0b.obscpio/contrib/src/sparkle/rules.mak -> _service:obs_scm:vlc-beta-20260208.37e0097a4.obscpio/contrib/src/sparkle/rules.mak Changed

_service:obs_scm:vlc-beta-20260206.36decaa0b.obscpio/extras/package/apple/build.conf -> _service:obs_scm:vlc-beta-20260208.37e0097a4.obscpio/extras/package/apple/build.conf Changed

_service:obs_scm:vlc-beta-20260206.36decaa0b.obscpio/extras/package/macosx/VLC.xcodeproj/project.pbxproj -> _service:obs_scm:vlc-beta-20260208.37e0097a4.obscpio/extras/package/macosx/VLC.xcodeproj/project.pbxproj Changed

@@ -2259,7 +2259,7 @@
 					};
 				};
 			};
-			buildConfigurationList = C2F2A6EA09588F1B00018C74 /* Build configuration list for PBXProject "VLC" */;
+			buildConfigurationList = C2F2A6EA09588F1B00018C74 /* Build configuration list for PBXProject "vlc" */;
 			compatibilityVersion = "Xcode 6.3";
 			developmentRegion = en;
 			hasScannedForEncodings = 1;
@@ -2565,6 +2565,7 @@
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/../../../build/share/macosx/Info.plist";
 				LIBRARY_SEARCH_PATHS = "${VLC_SRC_DIR}/build/macos-install/lib";
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"-lvlccore",
@@ -2606,6 +2607,7 @@
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/../../../build/share/macosx/Info.plist";
 				LIBRARY_SEARCH_PATHS = "${VLC_SRC_DIR}/build/macos-install/lib";
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				OTHER_LDFLAGS = (
 					"-lvlccore",
 					"-framework",
@@ -2646,6 +2648,7 @@
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/../../../build/share/macosx/Info.plist";
 				LIBRARY_SEARCH_PATHS = "${VLC_SRC_DIR}/build/macos-install/lib";
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				OTHER_LDFLAGS = (
 					"-lvlccore",
 					"-framework",
@@ -2684,6 +2687,7 @@
 					../../../modules/gui/macosx,
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/../../../build/share/macosx/Info.plist";
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"-lvlccore",
@@ -2723,6 +2727,7 @@
 					../../../modules/gui/macosx,
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/../../../build/share/macosx/Info.plist";
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				OTHER_LDFLAGS = (
 					"-lvlccore",
 					"-framework",
@@ -2761,6 +2766,7 @@
 					../../../modules/gui/macosx,
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/../../../build/share/macosx/Info.plist";
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				OTHER_LDFLAGS = (
 					"-lvlccore",
 					"-framework",
@@ -2814,7 +2820,7 @@
 					../../../modules/codec/,
 				);
 				LIBRARY_SEARCH_PATHS = "${VLC_SRC_DIR}/build/vlc_install_dir/lib";
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				OBJROOT = "${BUILD_PATH}";
 				ONLY_ACTIVE_ARCH = YES;
 				PATH = $VLC_PATH;
@@ -2868,7 +2874,7 @@
 					../../../modules/codec/,
 				);
 				LIBRARY_SEARCH_PATHS = "${VLC_SRC_DIR}/build/vlc_install_dir/lib";
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				OBJROOT = "${BUILD_PATH}";
 				PATH = $VLC_PATH;
 				PRODUCT_NAME = VLC;
@@ -2921,7 +2927,7 @@
 					../../../modules/codec/,
 				);
 				LIBRARY_SEARCH_PATHS = "${VLC_SRC_DIR}/build/vlc_install_dir/lib";
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				OBJROOT = "${BUILD_PATH}";
 				PATH = $VLC_PATH;
 				PRODUCT_NAME = VLC;
@@ -2956,7 +2962,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Default;
 		};
-		C2F2A6EA09588F1B00018C74 /* Build configuration list for PBXProject "VLC" */ = {
+		C2F2A6EA09588F1B00018C74 /* Build configuration list for PBXProject "vlc" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				C2F2A6EB09588F1B00018C74 /* Development */,

_service:obs_scm:vlc-beta-20260206.36decaa0b.obscpio/extras/package/macosx/codesign.sh -> _service:obs_scm:vlc-beta-20260208.37e0097a4.obscpio/extras/package/macosx/codesign.sh Changed

@@ -110,9 +110,9 @@
 
 info "Signing frameworks"
 
-sign "VLC.app/Contents/Frameworks/Sparkle.framework/Versions/A/Resources/Autoupdate.app/Contents/MacOS/fileop"
-sign "VLC.app/Contents/Frameworks/Sparkle.framework/Resources/Autoupdate.app"
-sign "VLC.app/Contents/Frameworks/Sparkle.framework/Versions/A"
+sign "VLC.app/Contents/Frameworks/Sparkle.framework/Versions/B/Autoupdate"
+sign "VLC.app/Contents/Frameworks/Sparkle.framework/Versions/B/Updater.app"
+sign "VLC.app/Contents/Frameworks/Sparkle.framework/"
 
 if  -e "VLC.app/Contents/Frameworks/Breakpad.framework" ; then
     sign "VLC.app/Contents/Frameworks/Breakpad.framework/Resources/breakpadUtilities.dylib"
@@ -161,7 +161,7 @@
 codesign --verify -vv VLC.app/Contents/Frameworks/Sparkle.framework
 
 info "Validating autoupdate app"
-codesign --verify -vv VLC.app/Contents/Frameworks/Sparkle.framework/Versions/Current/Resources/Autoupdate.app
+codesign --verify -vv VLC.app/Contents/Frameworks/Sparkle.framework/Versions/Current/Updater.app
 
 info "Validating complete bundle"
 codesign --verify --deep --strict --verbose=4 VLC.app

_service:obs_scm:vlc-beta-20260206.36decaa0b.obscpio/extras/package/macosx/env.build.sh -> _service:obs_scm:vlc-beta-20260208.37e0097a4.obscpio/extras/package/macosx/env.build.sh Changed

_service:obs_scm:vlc-beta-20260206.36decaa0b.obscpio/extras/package/macosx/package.mak -> _service:obs_scm:vlc-beta-20260208.37e0097a4.obscpio/extras/package/macosx/package.mak Changed

_service:obs_scm:vlc-beta-20260206.36decaa0b.obscpio/modules/demux/mkv/matroska_segment_parse.cpp -> _service:obs_scm:vlc-beta-20260208.37e0097a4.obscpio/modules/demux/mkv/matroska_segment_parse.cpp Changed

@@ -39,6 +39,7 @@
 
 #include "vlc_colors.h"
 
+#include <vlc_iso_lang.h>
 #include <vlc_codecs.h>
 #include <stdexcept>
 #include <limits>
@@ -249,6 +250,8 @@
       demux_t            * p_demuxer;
       bool&                bSupported;
       int                  level;
+      std::string          lang;
+      bool                 lang_is_ietf;
       struct {
         unsigned int i_crop_right;
         unsigned int i_crop_left;
@@ -269,7 +272,7 @@
       } pose;
 
     } metadata_payload = {
-      this, p_track, &sys.demuxer, bSupported, 3, { }, { }
+      this, p_track, &sys.demuxer, bSupported, 3, "eng", false, { }, { }
     };
 
     MKV_SWITCH_CREATE( EbmlTypeDispatcher, MetaDataHandlers, MetaDataCapture )
@@ -367,12 +370,25 @@
         }
         E_CASE( KaxTrackLanguage, lang )
         {
-            free( vars.tk->fmt.psz_language );
             const std::string slang ( lang );
             size_t pos = slang.find_first_of( '-' );
-            vars.tk->fmt.psz_language = pos != std::string::npos ? strndup( slang.c_str (), pos ) : strdup( slang.c_str() );
-            debug( vars, "Track Language=`%s'", vars.tk->fmt.psz_language ? vars.tk->fmt.psz_language : "(null)" );
+            const std::string l = std::string::npos ? slang.substr(0, pos) : slang;
+            debug( vars, "Track Language=`%s'", !l.empty() ? l.c_str() : "(null)" );
+            if (!vars.lang_is_ietf)
+            {
+                vars.lang = l;
+            }
         }
+#if LIBMATROSKA_VERSION >= 0x010406
+        E_CASE( KaxLanguageIETF, lang )
+        {
+            vars.lang_is_ietf = true;
+            const std::string slang ( lang );
+            size_t pos = slang.find_first_of( '-' );
+            vars.lang = pos != std::string::npos ? slang.substr(0, pos) : slang;
+            debug( vars, "IETF Track Language=`%s'", !vars.lang.empty() ? vars.lang.c_str() : "(null)" );
+        }
+#endif
         E_CASE( KaxCodecID, codecid )
         {
             vars.tk->codec = std::string( codecid );
@@ -1074,11 +1090,6 @@
 
     MetaDataHandlers::Dispatcher().iterate ( m->begin(), m->end(), &metadata_payload );
 
-    vlc_viewpoint_from_euler( &p_track->fmt.video.pose,
-                              metadata_payload.pose.yaw,
-                              metadata_payload.pose.pitch,
-                              metadata_payload.pose.roll);
-
     if( p_track->i_number == 0 )
     {
         msg_Warn( &sys.demuxer, "Missing KaxTrackNumber, discarding track!" );
@@ -1088,6 +1099,16 @@
 
     if ( bSupported )
     {
+        auto *iso_lang = vlc_find_iso639(metadata_payload.lang.c_str(), false);
+        if (iso_lang != nullptr)
+            msg_Dbg( &sys.demuxer, "Unknown language %s!", metadata_payload.lang.c_str() );
+        p_track->fmt.psz_language = strdup(metadata_payload.lang.c_str());
+
+        vlc_viewpoint_from_euler( &p_track->fmt.video.pose,
+                                  metadata_payload.pose.yaw,
+                                  metadata_payload.pose.pitch,
+                                  metadata_payload.pose.roll);
+
 #ifdef HAVE_ZLIB
         if( p_track->i_compression_type == MATROSKA_COMPRESSION_ZLIB &&
             p_track->i_encoding_scope & MATROSKA_ENCODING_SCOPE_PRIVATE &&

_service:obs_scm:vlc-beta-20260206.36decaa0b.obscpio/modules/demux/mkv/mkv.cpp -> _service:obs_scm:vlc-beta-20260208.37e0097a4.obscpio/modules/demux/mkv/mkv.cpp Changed

_service:obs_scm:vlc-beta-20260206.36decaa0b.obscpio/modules/gui/macosx/Makefile.am -> _service:obs_scm:vlc-beta-20260208.37e0097a4.obscpio/modules/gui/macosx/Makefile.am Changed

_service:obs_scm:vlc-beta-20260206.36decaa0b.obscpio/share/Info.plist.in -> _service:obs_scm:vlc-beta-20260208.37e0097a4.obscpio/share/Info.plist.in Changed

_service:obs_scm:vlc-beta-20260206.36decaa0b.obscpio/src/darwin/dirs.m -> _service:obs_scm:vlc-beta-20260208.37e0097a4.obscpio/src/darwin/dirs.m Changed

@@ -68,6 +68,25 @@
     return NULL;
 }
 
+// Gets absolute path to auxiliary executable dir
+// Usually stored alongside main executables in appleOS bundles
+static char *config_getLibExecDir(const char *fallback)
+{
+    if (config_isBundle()) {
+        NSBundle *bundle = NSBundle mainBundle;
+        NSString *path = bundle pathForAuxiliaryExecutable: @"";
+        if (!path)
+            return NULL;
+
+        return strdup(path.UTF8String);
+    }
+
+    if (fallback)
+        return strdup(fallback);
+
+    return NULL;
+}
+
 static char *config_getDataDirReal(const char *fallback)
 {
     const char *dir = getenv("VLC_DATA_PATH");
@@ -119,12 +138,11 @@
             dir = config_getLibraryDirReal(LIBDIR);
             break;
 
-
         case VLC_PKG_LIBEXEC_DIR:
-            dir = config_getLibraryDirReal(PKGLIBEXECDIR);
+            dir = config_getLibExecDir(PKGLIBEXECDIR);
             break;
         case VLC_LIBEXEC_DIR:
-            dir = config_getLibraryDirReal(LIBEXECDIR);
+            dir = config_getLibExecDir(LIBEXECDIR);
             break;
 
         case VLC_LOCALE_DIR:

_service:obs_scm:vlc-beta-20260206.36decaa0b.obscpio/src/win32/process.c -> _service:obs_scm:vlc-beta-20260208.37e0097a4.obscpio/src/win32/process.c Changed

_service:obs_scm:vlc-beta.obsinfo Changed

Changes of Revision 259