vlc | branch: master | Steve Lhomme <[email protected]> | Mon Mar 18 11:27:15 
2019 +0100| [edb8a90e4a5894b28456f519e0ef1620d00c07e8] | committer: Steve Lhomme

contrib: sidplay2: fix the libresidc.la dependency

Otherwise in multithread builds it often tries to copy the file before it's
even built.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=edb8a90e4a5894b28456f519e0ef1620d00c07e8
---

 contrib/src/sidplay2/rules.mak                       |  1 +
 contrib/src/sidplay2/sidplay2-resid-dependency.patch | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/contrib/src/sidplay2/rules.mak b/contrib/src/sidplay2/rules.mak
index 319f770379..84c35ccfee 100644
--- a/contrib/src/sidplay2/rules.mak
+++ b/contrib/src/sidplay2/rules.mak
@@ -24,6 +24,7 @@ sidplay-libs: sidplay-libs-$(SID_VERSION).tar.gz .sum-sidplay2
        $(APPLY) $(SRC)/sidplay2/sidplay2-noutils.patch
        $(APPLY) $(SRC)/sidplay2/sidplay2-string.patch
        $(APPLY) $(SRC)/sidplay2/sidplay-fix-ln-s.patch
+       $(APPLY) $(SRC)/sidplay2/sidplay2-resid-dependency.patch
        $(MOVE)
 
 .sidplay2: sidplay-libs
diff --git a/contrib/src/sidplay2/sidplay2-resid-dependency.patch 
b/contrib/src/sidplay2/sidplay2-resid-dependency.patch
new file mode 100644
index 0000000000..d9377d2318
--- /dev/null
+++ b/contrib/src/sidplay2/sidplay2-resid-dependency.patch
@@ -0,0 +1,11 @@
+--- sidplay-libs/resid/Makefile.am.deps        2019-03-18 08:21:29.769206400 
+0100
++++ sidplay-libs/resid/Makefile.am     2019-03-18 11:13:13.915779800 +0100
+@@ -10,7 +10,7 @@ else
+ noinst_LTLIBRARIES = libresidc.la
+ noinst_HEADERS = $(resid_headers)
+ 
+-all-local:
++all-local: libresidc.la
+       $(LN_S)f libresidc.la libresid.la
+ 
+ endif

_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to