[vlc-commits] [Git][videolan/vlc][3.0.x] 2 commits: contrib: libmpeg2: disable subfolders we don't want to build

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC


Commits:
b608cace by Steve Lhomme at 2025-08-25T16:08:36+00:00
contrib: libmpeg2: disable subfolders we don't want to build

Selecting the folder to run make doesn't work, nor passing SUBDIRS directly
as it's also used in subfolders.

- - - - -
7fdc139e by Steve Lhomme at 2025-08-25T16:08:36+00:00
contrib: caca: use MAKE contrib macros

Otherwise it builds more things that we don't need.

- - - - -


2 changed files:

- contrib/src/caca/rules.mak
- contrib/src/libmpeg2/rules.mak


Changes:

=====================================
contrib/src/caca/rules.mak
=====================================
@@ -61,6 +61,8 @@ CACA_CONF += \
 	CPPFLAGS="$(CPPFLAGS) -DCACA_STATIC"
 
 .caca: caca
-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(CACA_CONF)
-	$(MAKE) -C $< -C $< install
+	$(MAKEBUILDDIR)
+	$(MAKECONFIGURE) $(CACA_CONF)
+	+$(MAKEBUILD) -C $<
+	+$(MAKEBUILD) -C $< install
 	touch $@


=====================================
contrib/src/libmpeg2/rules.mak
=====================================
@@ -20,6 +20,8 @@ libmpeg2: libmpeg2-$(LIBMPEG2_VERSION).tar.gz .sum-libmpeg2
 	$(APPLY) $(SRC)/libmpeg2/libmpeg2-arm-pld.patch
 	$(APPLY) $(SRC)/libmpeg2/libmpeg2-inline.patch
 	$(APPLY) $(SRC)/libmpeg2/libmpeg2-mc-neon.patch
+	sed -i.orig -e 's,libvo src test vc++,,' $(UNPACK_DIR)/Makefile.am
+	sed -i.orig -e 's,SUBDIRS,# SUBDIRS,' $(UNPACK_DIR)/libmpeg2/Makefile.am
 	$(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub .auto
 	$(MOVE)
 
@@ -29,6 +31,6 @@ LIBMPEG2_CONF := --without-x --disable-sdl
 	$(REQUIRE_GPL)
 	$(RECONF)
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(LIBMPEG2_CONF)
-	$(MAKE) -C $< -C libmpeg2 && $(MAKE) -C $< -C libmpeg2 install
-	$(MAKE) -C $< -C include && $(MAKE) -C $< -C include install
+	$(MAKE) -C $<
+	$(MAKE) -C $< install
 	touch $@



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/4ce93430234330ab7d5ef15b6dfd864e75e150cb...7fdc139ef5bdd96d8e58f82fc709df8104aeb030

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


VideoLAN code repository instance