forked from agherzan/meta-raspberrypi
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
rpidistro-vlc: upgrade 3.0.17 -> 3.0.18
Signed-off-by: Vincent Davis Jr <[email protected]>
- Loading branch information
1 parent
b7fa9b4
commit 50e9bc5
Showing
21 changed files
with
23,494 additions
and
12,119 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
From: Sebastian Ramacher <[email protected]> | ||
Date: Mon, 19 Aug 2019 21:08:26 +0200 | ||
Date: Mon, 19 Aug 2019 21:04:56 +0200 | ||
Subject: Revert "configure: Require libmodplug >= 0.8.9" | ||
|
||
Upstream-Status: Inappropriate | ||
|
@@ -12,11 +12,9 @@ This reverts commit 48f014768dc22ecad23d0e9f53c38805a3aff832. | |
configure.ac | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/configure.ac b/configure.ac | ||
index df26367..b8580ec 100644 | ||
--- a/configure.ac | ||
+++ b/configure.ac | ||
@@ -2207,7 +2207,7 @@ AC_ARG_ENABLE(mod, | ||
@@ -2176,7 +2176,7 @@ | ||
[AS_HELP_STRING([--disable-mod], | ||
[do not use libmodplug (default auto)])]) | ||
if test "${enable_mod}" != "no" ; then | ||
|
83 changes: 0 additions & 83 deletions
83
...-layers/multimedia-layer/recipes-multimedia/rpidistro-vlc/files/0003-CVE-2022-41325.patch
This file was deleted.
Oops, something went wrong.
77 changes: 77 additions & 0 deletions
77
...ayer/recipes-multimedia/rpidistro-vlc/files/0003-Do-not-generate-cache-during-build.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
From: Sebastian Ramacher <[email protected]> | ||
Date: Tue, 7 Jul 2020 00:18:39 +0200 | ||
Subject: Do not generate cache during build | ||
|
||
Upstream-Status: Inappropriate | ||
|
||
RPI-Distro repo forks original vlc and applies patches | ||
to enable raspiberry pi support. | ||
|
||
The generated cache is not used in the package. It causes spurious build | ||
failures on the arm64 and ppc64el builds, that are not reproducible | ||
elsewhere. | ||
--- | ||
Makefile.am | 16 ---------------- | ||
bin/Makefile.am | 18 ------------------ | ||
2 files changed, 34 deletions(-) | ||
|
||
diff --git a/Makefile.am b/Makefile.am | ||
index 5179198..08ad316 100644 | ||
--- a/Makefile.am | ||
+++ b/Makefile.am | ||
@@ -163,22 +163,6 @@ endif | ||
TESTS = test/run_vlc.sh | ||
dist_noinst_SCRIPTS += test/run_vlc.sh | ||
|
||
-if BUILD_VLC | ||
-############################################################################### | ||
-# Installing plugins cache | ||
-############################################################################### | ||
-install-exec-hook: | ||
- if test "$(build)" = "$(host)"; then \ | ||
- PATH="$(DESTDIR)$(bindir):$$PATH" \ | ||
- LD_LIBRARY_PATH="$(DESTDIR)$(libdir):$$LD_LIBRARY_PATH" \ | ||
- DYLD_LIBRARY_PATH="$(DESTDIR)$(libdir):$$DYLD_LIBRARY_PATH" \ | ||
- "$(DESTDIR)$(vlclibdir)/vlc-cache-gen$(EXEEXT)" \ | ||
- "$(DESTDIR)$(vlclibdir)/plugins" ; \ | ||
- else \ | ||
- echo "Cross-compilation: cache generation skipped!" ; \ | ||
- fi | ||
-endif | ||
- | ||
uninstall-hook: | ||
rm -f -- "$(DESTDIR)$(vlclibdir)/plugins/plugins.dat" | ||
|
||
diff --git a/bin/Makefile.am b/bin/Makefile.am | ||
index 4de299d..a2acc3c 100644 | ||
--- a/bin/Makefile.am | ||
+++ b/bin/Makefile.am | ||
@@ -124,14 +124,6 @@ vlc_cache_gen_LDFLAGS = -Wc,-static | ||
vlc_cache_gen_DEPENDENCIES = vlc_win32_rc.$(OBJEXT) | ||
endif | ||
|
||
-# | ||
-# Plug-ins cache | ||
-# | ||
-if HAVE_DYNAMIC_PLUGINS | ||
-noinst_DATA = ../modules/plugins.dat | ||
-endif | ||
-MOSTLYCLEANFILES = $(noinst_DATA) | ||
- | ||
if HAVE_OSX | ||
if BUILD_VLC | ||
install-data-local: | ||
@@ -139,13 +131,3 @@ install-data-local: | ||
|
||
endif | ||
endif | ||
- | ||
-.PHONY: ../modules/plugins.dat | ||
- | ||
-../modules/plugins.dat: vlc-cache-gen$(EXEEXT) | ||
- $(AM_V_at)rm -f ../modules/plugins.dat | ||
- $(AM_V_GEN)if test "$(build)" = "$(host)"; then \ | ||
- ./vlc-cache-gen$(EXEEXT) `realpath ../modules` ; \ | ||
- else \ | ||
- echo "Cross-compilation: cache generation skipped!" ; \ | ||
- fi |
Oops, something went wrong.