[vlc-commits] win32: package: Fix plugins packaging

Hugo Beauzée-Luyssen git at videolan.org
Fri Mar 9 15:10:37 CET 2018


vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Fri Mar  9 10:57:12 2018 +0100| [e8c785df139887228e8cca947bdfc4c3fa704bff] | committer: Hugo Beauzée-Luyssen

win32: package: Fix plugins packaging

cp --parents was copying the entire hierarchy leading to the plugins
folder, causing resulting builds to fail to load any plugins

(cherry picked from commit 73f6b44df6a7193962b562e6ad47517c7867f00f)
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

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

 extras/package/win32/package.mak | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/extras/package/win32/package.mak b/extras/package/win32/package.mak
index 2c2ccfff52..066ca2e0b4 100644
--- a/extras/package/win32/package.mak
+++ b/extras/package/win32/package.mak
@@ -50,8 +50,11 @@ package-win-common: package-win-install package-win-sdk
 	done
 
 	cp $(srcdir)/share/icons/vlc.ico $(win32_destdir)
-	mkdir -p "$(win32_destdir)"/plugins
-	find $(prefix)/lib/vlc/plugins/ -type f \( -not -name '*.la' -and -not -name '*.a' \) -exec cp -v --parents "{}" "$(win32_destdir)/plugins/" \;
+	for plugindir in $(prefix)/lib/vlc/plugins/*/; do \
+		plugin_destdir="$(win32_destdir)/plugins/`basename $$plugindir`"; \
+		mkdir -p "$$plugin_destdir"; \
+		find "$$plugindir" -type f \( -not -name '*.la' -and -not -name '*.a' \) -exec cp -v "{}" "$$plugin_destdir" \; ;\
+	done
 	-cp -r $(prefix)/share/locale $(win32_destdir)
 
 # BD-J JAR



More information about the vlc-commits mailing list