From gitlab at videolan.org Sun Sep 7 17:20:32 2025 From: gitlab at videolan.org (Jean-Baptiste Kempf (@jbk)) Date: Sun, 07 Sep 2025 19:20:32 +0200 Subject: [libbluray-devel] [Git][videolan/libbluray][master] 6 commits: Add mailmap Message-ID: <68bdbee065016_80cff7f820822104244@gitlab.mail> Jean-Baptiste Kempf pushed to branch master at VideoLAN / libbluray Commits: 9da42868 by Rob Hall at 2025-09-05T14:25:21+01:00 Add mailmap - - - - - 415c691b by Rob Hall at 2025-09-05T14:49:43+01:00 meson: Lint fixes - - - - - e53beafc by Rob Hall at 2025-09-07T13:58:26+01:00 Fixes for building with MSVC - - - - - 0024cc3c by Rob Hall at 2025-09-07T13:58:27+01:00 Update libudfread submodule - - - - - 765bcbdc by Rob Hall at 2025-09-07T13:58:43+01:00 Move installed programs to src/tools dir - - - - - d41111c1 by Rob Hall at 2025-09-07T13:58:45+01:00 Add getopt.c from libdav1d Uses the MinGW implementation of getopt when building for MSVC and other platforms that don't provide it in unistd.h. - - - - - 15 changed files: - .gitignore - + .mailmap - contrib/libudfread - meson.build - + src/compat/getopt.c - + src/compat/include/getopt.h - + src/compat/include/unistd.h - src/devtools/meson.build - src/examples/meson.build - src/libbluray/bdj/meson.build - src/libbluray/bdnav/meta_parse.c - src/examples/bd_info.c ? src/tools/bd_info.c - src/examples/list_titles.c ? src/tools/bd_list_titles.c - src/examples/bdsplice.c ? src/tools/bd_splice.c - + src/tools/meson.build Changes: ===================================== .gitignore ===================================== @@ -40,3 +40,4 @@ hdmv_test *.exe src/libbluray/bdj/build stamp-h1 +.wraplock ===================================== .mailmap ===================================== @@ -0,0 +1 @@ +Rob Hall ===================================== contrib/libudfread ===================================== @@ -1 +1 @@ -Subproject commit c3cd5cbb097924557ea4d9da1ff76a74620c51a8 +Subproject commit 139a2194525f2745b98a98e4d8fa627d07440176 ===================================== meson.build ===================================== @@ -42,9 +42,11 @@ extra_dependencies = [] if host_machine.system() == 'windows' test_args += ['-D_WIN32_WINNT=0x0502', '-D_WIN32_IE=0x0501'] - if cc.get_argument_syntax() != 'msvc' + if cc.get_define('_MSC_VER') == '' extra_dependencies += cc.find_library('ssp') test_args += '-D__USE_MINGW_ANSI_STDIO=1' + else + test_args += ['-D_CRT_NONSTDC_NO_WARNINGS', '-D_CRT_SECURE_NO_WARNINGS'] endif else test_args += '-D_POSIX_C_SOURCE=200809L' @@ -143,6 +145,14 @@ if cc.has_function('dladdr', prefix: '#include ', args: [test_args, dla cdata.set('HAVE_DLADDR', 1) endif +if not cc.has_function('getopt', prefix: '#include ', args: test_args) + getopt_dependency = declare_dependency( + sources: 'src/compat/getopt.c', + include_directories: 'src/compat/include') +else + getopt_dependency = [] +endif + # External dependencies and libraries if host_machine.system() == 'windows' @@ -212,6 +222,8 @@ if cc.get_argument_syntax() != 'msvc' if get_option('buildtype') not in ['debug', 'plain'] optional_arguments += '-fomit-frame-pointer' endif +else + optional_arguments += '/wd4267' # Disable warning C4267: conversion from 'size_t' to 'int' endif add_project_arguments(cc.get_supported_arguments(optional_arguments), language: 'c') @@ -219,7 +231,7 @@ add_project_link_arguments(cc.get_supported_link_arguments(optional_link_argumen add_project_arguments(test_args, language: 'c') # Generate config.h -config_h_target = configure_file(output: 'config.h', configuration: cdata) +configure_file(output: 'config.h', configuration: cdata) # Include subdir meson.build files @@ -235,6 +247,8 @@ subdir('src/devtools') subdir('src/examples') +subdir('src/tools') + subdir('doc') summary(java_summary + { ===================================== src/compat/getopt.c ===================================== @@ -0,0 +1,568 @@ +/* $OpenBSD: getopt_long.c,v 1.23 2007/10/31 12:34:57 chl Exp $ */ +/* $NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $ */ + +/* + * Copyright (c) 2002 Todd C. Miller + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * Sponsored in part by the Defense Advanced Research Projects + * Agency (DARPA) and Air Force Research Laboratory, Air Force + * Materiel Command, USAF, under agreement number F39502-99-1-0512. + */ +/*- + * Copyright (c) 2000 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Dieter Baron and Thomas Klausner. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include +#include +#ifdef _WIN32 +#include +#else +#include +#endif + +#define REPLACE_GETOPT /* use this getopt as the system getopt(3) */ + +#ifdef REPLACE_GETOPT +int opterr = 1; /* if error message should be printed */ +int optind = 1; /* index into parent argv vector */ +int optopt = '?'; /* character checked for validity */ +#undef optreset /* see getopt.h */ +#define optreset __mingw_optreset +int optreset; /* reset getopt */ +char *optarg; /* argument associated with option */ +#endif + +#define PRINT_ERROR ((opterr) && (*options != ':')) + +#define FLAG_PERMUTE 0x01 /* permute non-options to the end of argv */ +#define FLAG_ALLARGS 0x02 /* treat non-options as args to option "-1" */ +#define FLAG_LONGONLY 0x04 /* operate as getopt_long_only */ + +/* return values */ +#define BADCH (int)'?' +#define BADARG ((*options == ':') ? (int)':' : (int)'?') +#define INORDER (int)1 + +#ifdef __CYGWIN__ +static char EMSG[] = ""; +#else +#define EMSG "" +#endif + +static int getopt_internal(int, char * const *, const char *, + const struct option *, int *, int); +static int parse_long_options(char * const *, const char *, + const struct option *, int *, int); +static int gcd(int, int); +static void permute_args(int, int, int, char * const *); + +static char *place = EMSG; /* option letter processing */ + +/* XXX: set optreset to 1 rather than these two */ +static int nonopt_start = -1; /* first non option argument (for permute) */ +static int nonopt_end = -1; /* first option after non options (for permute) */ + +/* Error messages */ +static const char recargchar[] = "option requires an argument -- %c"; +static const char recargstring[] = "option requires an argument -- %s"; +static const char ambig[] = "ambiguous option -- %.*s"; +static const char noarg[] = "option doesn't take an argument -- %.*s"; +static const char illoptchar[] = "unknown option -- %c"; +static const char illoptstring[] = "unknown option -- %s"; + +#ifdef _WIN32 +#ifndef __CYGWIN__ +#define __progname __argv[0] +#else +extern char __declspec(dllimport) *__progname; +#endif + +static void +_vwarnx(const char *fmt,va_list ap) +{ + (void)fprintf(stderr,"%s: ",__progname); + if (fmt != NULL) + (void)vfprintf(stderr,fmt,ap); + (void)fprintf(stderr,"\n"); +} + +static void +warnx(const char *fmt,...) +{ + va_list ap; + va_start(ap,fmt); + _vwarnx(fmt,ap); + va_end(ap); +} +#endif + +/* + * Compute the greatest common divisor of a and b. + */ +static int +gcd(int a, int b) +{ + int c; + + c = a % b; + while (c != 0) { + a = b; + b = c; + c = a % b; + } + + return (b); +} + +/* + * Exchange the block from nonopt_start to nonopt_end with the block + * from nonopt_end to opt_end (keeping the same order of arguments + * in each block). + */ +static void +permute_args(int panonopt_start, int panonopt_end, int opt_end, + char * const *nargv) +{ + int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos; + char *swap; + + /* + * compute lengths of blocks and number and size of cycles + */ + nnonopts = panonopt_end - panonopt_start; + nopts = opt_end - panonopt_end; + ncycle = gcd(nnonopts, nopts); + cyclelen = (opt_end - panonopt_start) / ncycle; + + for (i = 0; i < ncycle; i++) { + cstart = panonopt_end+i; + pos = cstart; + for (j = 0; j < cyclelen; j++) { + if (pos >= panonopt_end) + pos -= nnonopts; + else + pos += nopts; + swap = nargv[pos]; + /* LINTED const cast */ + ((char **) nargv)[pos] = nargv[cstart]; + /* LINTED const cast */ + ((char **)nargv)[cstart] = swap; + } + } +} + +/* + * parse_long_options -- + * Parse long options in argc/argv argument vector. + * Returns -1 if short_too is set and the option does not match long_options. + */ +static int +parse_long_options(char * const *nargv, const char *options, + const struct option *long_options, int *idx, int short_too) +{ + char *current_argv, *has_equal; + size_t current_argv_len; + int i, ambiguous, match; + +#define IDENTICAL_INTERPRETATION(_x, _y) \ + (long_options[(_x)].has_arg == long_options[(_y)].has_arg && \ + long_options[(_x)].flag == long_options[(_y)].flag && \ + long_options[(_x)].val == long_options[(_y)].val) + + current_argv = place; + match = -1; + ambiguous = 0; + + optind++; + + if ((has_equal = strchr(current_argv, '=')) != NULL) { + /* argument found (--option=arg) */ + current_argv_len = has_equal - current_argv; + has_equal++; + } else + current_argv_len = strlen(current_argv); + + for (i = 0; long_options[i].name; i++) { + /* find matching long option */ + if (strncmp(current_argv, long_options[i].name, + current_argv_len)) + continue; + + if (strlen(long_options[i].name) == current_argv_len) { + /* exact match */ + match = i; + ambiguous = 0; + break; + } + /* + * If this is a known short option, don't allow + * a partial match of a single character. + */ + if (short_too && current_argv_len == 1) + continue; + + if (match == -1) /* partial match */ + match = i; + else if (!IDENTICAL_INTERPRETATION(i, match)) + ambiguous = 1; + } + if (ambiguous) { + /* ambiguous abbreviation */ + if (PRINT_ERROR) + warnx(ambig, (int)current_argv_len, + current_argv); + optopt = 0; + return (BADCH); + } + if (match != -1) { /* option found */ + if (long_options[match].has_arg == no_argument + && has_equal) { + if (PRINT_ERROR) + warnx(noarg, (int)current_argv_len, + current_argv); + /* + * XXX: GNU sets optopt to val regardless of flag + */ + if (long_options[match].flag == NULL) + optopt = long_options[match].val; + else + optopt = 0; + return (BADARG); + } + if (long_options[match].has_arg == required_argument || + long_options[match].has_arg == optional_argument) { + if (has_equal) + optarg = has_equal; + else if (long_options[match].has_arg == + required_argument) { + /* + * optional argument doesn't use next nargv + */ + optarg = nargv[optind++]; + } + } + if ((long_options[match].has_arg == required_argument) + && (optarg == NULL)) { + /* + * Missing argument; leading ':' indicates no error + * should be generated. + */ + if (PRINT_ERROR) + warnx(recargstring, + current_argv); + /* + * XXX: GNU sets optopt to val regardless of flag + */ + if (long_options[match].flag == NULL) + optopt = long_options[match].val; + else + optopt = 0; + --optind; + return (BADARG); + } + } else { /* unknown option */ + if (short_too) { + --optind; + return (-1); + } + if (PRINT_ERROR) + warnx(illoptstring, current_argv); + optopt = 0; + return (BADCH); + } + if (idx) + *idx = match; + if (long_options[match].flag) { + *long_options[match].flag = long_options[match].val; + return (0); + } else + return (long_options[match].val); +#undef IDENTICAL_INTERPRETATION +} + +/* + * getopt_internal -- + * Parse argc/argv argument vector. Called by user level routines. + */ +static int +getopt_internal(int nargc, char * const *nargv, const char *options, + const struct option *long_options, int *idx, int flags) +{ + char *oli; /* option letter list index */ + int optchar, short_too; + static int posixly_correct = -1; + + if (options == NULL) + return (-1); + + /* + * XXX Some GNU programs (like cvs) set optind to 0 instead of + * XXX using optreset. Work around this braindamage. + */ + if (optind == 0) + optind = optreset = 1; + + /* + * Disable GNU extensions if POSIXLY_CORRECT is set or options + * string begins with a '+'. + * + * CV, 2009-12-14: Check POSIXLY_CORRECT anew if optind == 0 or + * optreset != 0 for GNU compatibility. + */ + if (posixly_correct == -1 || optreset != 0) + posixly_correct = (getenv("POSIXLY_CORRECT") != NULL); + if (*options == '-') + flags |= FLAG_ALLARGS; + else if (posixly_correct || *options == '+') + flags &= ~FLAG_PERMUTE; + if (*options == '+' || *options == '-') + options++; + + optarg = NULL; + if (optreset) + nonopt_start = nonopt_end = -1; +start: + if (optreset || !*place) { /* update scanning pointer */ + optreset = 0; + if (optind >= nargc) { /* end of argument vector */ + place = EMSG; + if (nonopt_end != -1) { + /* do permutation, if we have to */ + permute_args(nonopt_start, nonopt_end, + optind, nargv); + optind -= nonopt_end - nonopt_start; + } + else if (nonopt_start != -1) { + /* + * If we skipped non-options, set optind + * to the first of them. + */ + optind = nonopt_start; + } + nonopt_start = nonopt_end = -1; + return (-1); + } + if (*(place = nargv[optind]) != '-' || + (place[1] == '\0' && strchr(options, '-') == NULL)) { + place = EMSG; /* found non-option */ + if (flags & FLAG_ALLARGS) { + /* + * GNU extension: + * return non-option as argument to option 1 + */ + optarg = nargv[optind++]; + return (INORDER); + } + if (!(flags & FLAG_PERMUTE)) { + /* + * If no permutation wanted, stop parsing + * at first non-option. + */ + return (-1); + } + /* do permutation */ + if (nonopt_start == -1) + nonopt_start = optind; + else if (nonopt_end != -1) { + permute_args(nonopt_start, nonopt_end, + optind, nargv); + nonopt_start = optind - + (nonopt_end - nonopt_start); + nonopt_end = -1; + } + optind++; + /* process next argument */ + goto start; + } + if (nonopt_start != -1 && nonopt_end == -1) + nonopt_end = optind; + + /* + * If we have "-" do nothing, if "--" we are done. + */ + if (place[1] != '\0' && *++place == '-' && place[1] == '\0') { + optind++; + place = EMSG; + /* + * We found an option (--), so if we skipped + * non-options, we have to permute. + */ + if (nonopt_end != -1) { + permute_args(nonopt_start, nonopt_end, + optind, nargv); + optind -= nonopt_end - nonopt_start; + } + nonopt_start = nonopt_end = -1; + return (-1); + } + } + + /* + * Check long options if: + * 1) we were passed some + * 2) the arg is not just "-" + * 3) either the arg starts with -- we are getopt_long_only() + */ + if (long_options != NULL && place != nargv[optind] && + (*place == '-' || (flags & FLAG_LONGONLY))) { + short_too = 0; + if (*place == '-') + place++; /* --foo long option */ + else if (*place != ':' && strchr(options, *place) != NULL) + short_too = 1; /* could be short option too */ + + optchar = parse_long_options(nargv, options, long_options, + idx, short_too); + if (optchar != -1) { + place = EMSG; + return (optchar); + } + } + + if ((optchar = (int)*place++) == (int)':' || + (optchar == (int)'-' && *place != '\0') || + (oli = strchr(options, optchar)) == NULL) { + /* + * If the user specified "-" and '-' isn't listed in + * options, return -1 (non-option) as per POSIX. + * Otherwise, it is an unknown option character (or ':'). + */ + if (optchar == (int)'-' && *place == '\0') + return (-1); + if (!*place) + ++optind; + if (PRINT_ERROR) + warnx(illoptchar, optchar); + optopt = optchar; + return (BADCH); + } + if (long_options != NULL && optchar == 'W' && oli[1] == ';') { + /* -W long-option */ + if (*place) /* no space */ + /* NOTHING */; + else if (++optind >= nargc) { /* no arg */ + place = EMSG; + if (PRINT_ERROR) + warnx(recargchar, optchar); + optopt = optchar; + return (BADARG); + } else /* white space */ + place = nargv[optind]; + optchar = parse_long_options(nargv, options, long_options, + idx, 0); + place = EMSG; + return (optchar); + } + if (*++oli != ':') { /* doesn't take argument */ + if (!*place) + ++optind; + } else { /* takes (optional) argument */ + optarg = NULL; + if (*place) /* no white space */ + optarg = place; + else if (oli[1] != ':') { /* arg not optional */ + if (++optind >= nargc) { /* no arg */ + place = EMSG; + if (PRINT_ERROR) + warnx(recargchar, optchar); + optopt = optchar; + return (BADARG); + } else + optarg = nargv[optind]; + } + place = EMSG; + ++optind; + } + /* dump back option letter */ + return (optchar); +} + +#ifdef REPLACE_GETOPT +/* + * getopt -- + * Parse argc/argv argument vector. + * + * [eventually this will replace the BSD getopt] + */ +int +getopt(int nargc, char * const *nargv, const char *options) +{ + + /* + * We don't pass FLAG_PERMUTE to getopt_internal() since + * the BSD getopt(3) (unlike GNU) has never done this. + * + * Furthermore, since many privileged programs call getopt() + * before dropping privileges it makes sense to keep things + * as simple (and bug-free) as possible. + */ + return (getopt_internal(nargc, nargv, options, NULL, NULL, 0)); +} +#endif /* REPLACE_GETOPT */ + +/* + * getopt_long -- + * Parse argc/argv argument vector. + */ +int +getopt_long(int nargc, char * const *nargv, const char *options, + const struct option *long_options, int *idx) +{ + + return (getopt_internal(nargc, nargv, options, long_options, idx, + FLAG_PERMUTE)); +} + +/* + * getopt_long_only -- + * Parse argc/argv argument vector. + */ +int +getopt_long_only(int nargc, char * const *nargv, const char *options, + const struct option *long_options, int *idx) +{ + + return (getopt_internal(nargc, nargv, options, long_options, idx, + FLAG_PERMUTE|FLAG_LONGONLY)); +} ===================================== src/compat/include/getopt.h ===================================== @@ -0,0 +1,97 @@ +#ifndef __GETOPT_H__ +/** + * DISCLAIMER + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the mingw-w64 runtime package. + * + * The mingw-w64 runtime package and its code is distributed in the hope that it + * will be useful but WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESSED OR + * IMPLIED ARE HEREBY DISCLAIMED. This includes but is not limited to + * warranties of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ + +#define __GETOPT_H__ + +/* All the headers include this file. */ +#ifdef _WIN32 +#include +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +extern int optind; /* index of first non-option in argv */ +extern int optopt; /* single option character, as parsed */ +extern int opterr; /* flag to enable built-in diagnostics... */ + /* (user may set to zero, to suppress) */ + +extern char *optarg; /* pointer to argument of current option */ + +extern int getopt(int nargc, char * const *nargv, const char *options); + +#ifdef _BSD_SOURCE +/* + * BSD adds the non-standard `optreset' feature, for reinitialisation + * of `getopt' parsing. We support this feature, for applications which + * proclaim their BSD heritage, before including this header; however, + * to maintain portability, developers are advised to avoid it. + */ +# define optreset __mingw_optreset +extern int optreset; +#endif +#ifdef __cplusplus +} +#endif +/* + * POSIX requires the `getopt' API to be specified in `unistd.h'; + * thus, `unistd.h' includes this header. However, we do not want + * to expose the `getopt_long' or `getopt_long_only' APIs, when + * included in this manner. Thus, close the standard __GETOPT_H__ + * declarations block, and open an additional __GETOPT_LONG_H__ + * specific block, only when *not* __UNISTD_H_SOURCED__, in which + * to declare the extended API. + */ +#if !defined(__UNISTD_H_SOURCED__) && !defined(__GETOPT_LONG_H__) +#define __GETOPT_LONG_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +struct option /* specification for a long form option... */ +{ + const char *name; /* option name, without leading hyphens */ + int has_arg; /* does it take an argument? */ + int *flag; /* where to save its status, or NULL */ + int val; /* its associated status value */ +}; + +enum /* permitted values for its `has_arg' field... */ +{ + no_argument = 0, /* option never takes an argument */ + required_argument, /* option always requires an argument */ + optional_argument /* option may take an argument */ +}; + +extern int getopt_long(int nargc, char * const *nargv, const char *options, + const struct option *long_options, int *idx); +extern int getopt_long_only(int nargc, char * const *nargv, const char *options, + const struct option *long_options, int *idx); +/* + * Previous MinGW implementation had... + */ +#ifndef HAVE_DECL_GETOPT +/* + * ...for the long form API only; keep this for compatibility. + */ +# define HAVE_DECL_GETOPT 1 +#endif + +#ifdef __cplusplus +} +#endif + +#endif /* !defined(__UNISTD_H_SOURCED__) && !defined(__GETOPT_LONG_H__) */ + +#endif /* !defined(__GETOPT_H__) */ ===================================== src/compat/include/unistd.h ===================================== @@ -0,0 +1,6 @@ +#ifndef __UNISTD_H__ +#define __UNISTD_H__ + +#include + +#endif // __UNISTD_H__ \ No newline at end of file ===================================== src/devtools/meson.build ===================================== @@ -8,11 +8,11 @@ if get_option('enable_devtools') include_directories: libbluray_inc_dirs) executable('bdj_test', 'bdj_test.c', - dependencies: libbluray_dep, + dependencies: [libbluray_dep, getopt_dependency], include_directories: libbluray_inc_dirs) executable('clpi_dump', ['clpi_dump.c', 'util.c'], - dependencies: libbluray_dep, + dependencies: [libbluray_dep, getopt_dependency], include_directories: libbluray_inc_dirs) executable('hdmv_test', 'hdmv_test.c', @@ -23,8 +23,10 @@ if get_option('enable_devtools') dependencies: libbluray_dep, include_directories: libbluray_inc_dirs) + # Doesn't build on MSVC due to missing dirent.h and libgen.h executable('mpls_dump', ['mpls_dump.c', 'util.c'], - dependencies: libbluray_dep, + dependencies: [libbluray_dep, getopt_dependency], + build_by_default: cdata.has('HAVE_DIRENT_H'), include_directories: libbluray_inc_dirs) endif ===================================== src/examples/meson.build ===================================== @@ -1,25 +1,6 @@ # Copyright (C) 2025 Rob Hall # SPDX-License-Identifier: MIT -if get_option('enable_tools') - - executable('bd_info', 'bd_info.c', - dependencies: libbluray_dep, - include_directories: libbluray_inc_dirs, - install: true) - - executable('bd_list_titles', 'list_titles.c', - dependencies: libbluray_dep, - include_directories: libbluray_inc_dirs, - install: true) - - executable('bd_splice', 'bdsplice.c', - dependencies: libbluray_dep, - include_directories: libbluray_inc_dirs, - install: true) - -endif - if get_option('enable_examples') executable('index_dump', 'index_dump.c', ===================================== src/libbluray/bdj/meson.build ===================================== @@ -29,7 +29,7 @@ endif awt_src = bdj_type == 'j2me' ? 'java-j2me' : 'java-j2se:java-build-support' -jar = custom_target('bdj-jar', +custom_target('bdj-jar', command: [ant, '-f', files('build.xml'), '-Dbuild=' + meson.project_build_root() / '@PRIVATE_DIR@', '-Ddist=' + meson.current_build_dir(), ===================================== src/libbluray/bdnav/meta_parse.c ===================================== @@ -48,6 +48,9 @@ #define DEFAULT_LANGUAGE "eng" +#ifdef _MSC_VER +#define strncasecmp _strnicmp +#endif #define BAD_CAST_CONST (const xmlChar *) #define XML_FREE(p) (xmlFree(p), p = NULL) ===================================== src/examples/bd_info.c ? src/tools/bd_info.c ===================================== ===================================== src/examples/list_titles.c ? src/tools/bd_list_titles.c ===================================== ===================================== src/examples/bdsplice.c ? src/tools/bd_splice.c ===================================== @@ -20,7 +20,6 @@ #include #include #include -#include #include #include "bluray.h" ===================================== src/tools/meson.build ===================================== @@ -0,0 +1,21 @@ +# Copyright (C) 2025 Rob Hall +# SPDX-License-Identifier: MIT + +if get_option('enable_tools') + + executable('bd_info', 'bd_info.c', + dependencies: [libbluray_dep, getopt_dependency], + include_directories: libbluray_inc_dirs, + install: true) + + executable('bd_list_titles', 'bd_list_titles.c', + dependencies: [libbluray_dep, getopt_dependency], + include_directories: libbluray_inc_dirs, + install: true) + + executable('bd_splice', 'bd_splice.c', + dependencies: [libbluray_dep, getopt_dependency], + include_directories: libbluray_inc_dirs, + install: true) + +endif View it on GitLab: https://code.videolan.org/videolan/libbluray/-/compare/8e5ef374c8ff3603a8ed4e1f48d4d5399e2e8044...d41111c1eb05a278f8dc37fb220d6ef9a13e3291 -- View it on GitLab: https://code.videolan.org/videolan/libbluray/-/compare/8e5ef374c8ff3603a8ed4e1f48d4d5399e2e8044...d41111c1eb05a278f8dc37fb220d6ef9a13e3291 You're receiving this email because of your account on code.videolan.org. VideoLAN code repository instance