[vlc-commits] [Git][videolan/vlc][master] 3 commits: contrib: dvdcss: require GPL to build

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
cf9f8a35 by Steve Lhomme at 2025-01-27T13:27:22+00:00
contrib: dvdcss: require GPL to build

It's only picked as a dependency from the dvdread contrib which also requires GPL.
But it's cleaner to make it explicit.

- - - - -
bb472e9b by Steve Lhomme at 2025-01-27T13:27:22+00:00
contrib: dvbcsa: require GPL to build

lbdvbcsa is GPLv2 [^1].

[^1] https://code.videolan.org/videolan/libdvbcsa/-/blob/1.1.0/COPYING

- - - - -
a4376ecd by Steve Lhomme at 2025-01-27T13:27:22+00:00
apple/build: remove GPL dvbcsa from watchos build

It was added by mistake.

- - - - -


3 changed files:

- contrib/src/dvbcsa/rules.mak
- contrib/src/dvdcss/rules.mak
- extras/package/apple/build.conf


Changes:

=====================================
contrib/src/dvbcsa/rules.mak
=====================================
@@ -3,7 +3,9 @@
 DVBCSA_VERSION := 1.1.0
 DVBCSA_URL := $(VIDEOLAN)/libdvbcsa/$(DVBCSA_VERSION)/libdvbcsa-$(DVBCSA_VERSION).tar.gz
 
+ifdef GPL
 PKGS += dvbcsa
+endif
 ifeq ($(call need_pkg,"libdvbcsa >= 1.1.0"),)
 PKGS_FOUND += dvbcsa
 endif
@@ -20,6 +22,7 @@ libdvbcsa: libdvbcsa-$(DVBCSA_VERSION).tar.gz .sum-dvbcsa
 	$(MOVE)
 
 .dvbcsa: libdvbcsa
+	$(REQUIRE_GPL)
 	$(RECONF)
 	$(MAKEBUILDDIR)
 	$(MAKECONFIGURE)


=====================================
contrib/src/dvdcss/rules.mak
=====================================
@@ -20,6 +20,7 @@ dvdcss: libdvdcss-$(DVDCSS_VERSION).tar.bz2 .sum-dvdcss
 DVDCSS_CONF := --disable-doc
 
 .dvdcss: dvdcss
+	$(REQUIRE_GPL)
 	$(MAKEBUILDDIR)
 	$(MAKECONFIGURE) $(DVDCSS_CONF)
 	+$(MAKEBUILD)


=====================================
extras/package/apple/build.conf
=====================================
@@ -109,7 +109,6 @@ export VLC_CONTRIB_OPTIONS_WATCHOS=(
     --disable-gnuv3
     --enable-ad-clauses
     --disable-all
-    --enable-dvbcsa
     --enable-dvbpsi
     --enable-ebml
     --enable-ffmpeg



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/b606a740e85520f3f1e6f49811ef71da14ea13e1...a4376ecd59ea2051bee3502bc3c6fbe4cfdf0190

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


VideoLAN code repository instance