[vlc-commits] [Git][videolan/vlc][master] 5 commits: macosx: fix casing of Resources folder

[Felix Paul Kühne (@fkuehne)]

Felix Paul Kühne pushed to branch master at VideoLAN / VLC


Commits:
65645698 by Steve Lhomme at 2025-07-12T16:15:47+00:00
macosx: fix casing of Resources folder

In line with the rest of the usage in the file.

- - - - -
716fff8e by Steve Lhomme at 2025-07-12T16:15:47+00:00
macosx: ignore new generated files

Since 9a01b3e48cfc25f7f068e1b19944a936f18d08af.

- - - - -
3c040b6d by Steve Lhomme at 2025-07-12T16:15:47+00:00
demux/json: ignore generated lexicon file

Similar to 465ed5f36fb3718f7ebafddeeb3a51615938b5e0.

- - - - -
1974b5e1 by Steve Lhomme at 2025-07-12T16:15:47+00:00
package/macos: fetch contribs in parallel

- - - - -
7a58c476 by Steve Lhomme at 2025-07-12T16:15:47+00:00
package/macos: build gettext via dependencies

It's already working for other targets. If a dependency is not properly defined
it needs to be fixed.

- - - - -


4 changed files:

- extras/package/macosx/build.sh
- modules/demux/json/.gitignore
- modules/gui/macosx/.gitignore
- modules/gui/macosx/Makefile.am


Changes:

=====================================
extras/package/macosx/build.sh
=====================================
@@ -206,8 +206,7 @@ else
     PREBUILT_FAILED=yes
 fi
 if [ -n "$PREBUILT_FAILED" ]; then
-    make fetch
-    make -j$JOBS .gettext
+    make -j$JOBS fetch
     make -j$JOBS -k || make -j1
 
     if [ "$PACKAGE" = "yes" ]; then


=====================================
modules/demux/json/.gitignore
=====================================
@@ -1,3 +1,4 @@
 grammar.c
 grammar.h
 lexicon.c
+*-lexicon.c


=====================================
modules/gui/macosx/.gitignore
=====================================
@@ -1,2 +1,4 @@
 *.nib
 Resources/Assets.car
+Resources/Shaders.metallib
+shaders/VLCSnowShader.air


=====================================
modules/gui/macosx/Makefile.am
=====================================
@@ -56,7 +56,7 @@ metallib_verbose__0 = $(metallib_verbose_0)
 
 libmacosx_plugin_la_METAL_SOURCES = gui/macosx/shaders/VLCSnowShader.metal
 libmacosx_plugin_la_METAL_AIR_FILES = $(libmacosx_plugin_la_METAL_SOURCES:.metal=.air)
-libmacosx_plugin_la_METAL_LIBRARY = gui/macosx/resources/Shaders.metallib
+libmacosx_plugin_la_METAL_LIBRARY = gui/macosx/Resources/Shaders.metallib
 
 $(libmacosx_plugin_la_METAL_LIBRARY): $(libmacosx_plugin_la_METAL_AIR_FILES)
 	$(AM_V_at)$(MKDIR_P) "gui/macosx/shaders"



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/8d0a5ccc2a5b32d92827739a263477bf8504377b...7a58c476ffeeb5e00c260b74be2ac9a6631ddacd

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/8d0a5ccc2a5b32d92827739a263477bf8504377b...7a58c476ffeeb5e00c260b74be2ac9a6631ddacd
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance