<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class=""><br class=""><div><br class=""><blockquote type="cite" class=""><div class="">Am 02.12.2019 um 12:49 schrieb Marvin Scholz <<a href="mailto:epirat07@gmail.com" class="">epirat07@gmail.com</a>>:</div><br class="Apple-interchange-newline"><div class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">Hi, thanks a lot for this patch.</span><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">In general it looks fine, just some remark inline.</span><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">On 2 Dec 2019, at 10:05,<span class="Apple-converted-space"> </span></span><a href="mailto:david.fuhrmann@gmail.com" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px;" class="">david.fuhrmann@gmail.com</a><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class=""><span class="Apple-converted-space"> </span>wrote:</span><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><blockquote type="cite" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; text-decoration: none;" class="">From: David Fuhrmann <<a href="mailto:dfuhrmann@videolan.org" class="">dfuhrmann@videolan.org</a>><br class=""><br class="">This gets rid of a prefix inside our build dir, and uses DESTDIR<br class="">when installing the content. This way, the install directory<br class="">can be reused for further packaging introduced in the next commits.<br class="">---<br class="">bin/Makefile.am                    |  2 +-<br class="">extras/package/macosx/configure.sh |  2 +-<br class="">extras/package/macosx/package.mak  | 27 ++++++++++++++++++---------<br class="">3 files changed, 20 insertions(+), 11 deletions(-)<br class=""><br class="">diff --git a/bin/Makefile.am b/bin/Makefile.am<br class="">index 0bfa668806e0..699fbd4bf0b2 100644<br class="">--- a/bin/Makefile.am<br class="">+++ b/bin/Makefile.am<br class="">@@ -132,7 +132,7 @@ MOSTLYCLEANFILES = $(noinst_DATA)<br class="">if HAVE_OSX<br class="">if BUILD_VLC<br class="">install-data-local:<br class="">-<span class="Apple-tab-span" style="white-space: pre;">        </span>cd $(bindir); mv vlc-osx vlc<br class="">+<span class="Apple-tab-span" style="white-space: pre;">        </span>cd "$(DESTDIR)$(bindir)"; mv vlc-osx vlc<br class=""><br class="">endif<br class="">endif<br class="">diff --git a/extras/package/macosx/configure.sh b/extras/package/macosx/configure.sh<br class="">index 92f0218a25e1..d2746e61d76f 100755<br class="">--- a/extras/package/macosx/configure.sh<br class="">+++ b/extras/package/macosx/configure.sh<br class="">@@ -15,7 +15,7 @@ case "${ARCH}" in<br class="">esac<br class=""><br class="">OPTIONS="<br class="">-        --prefix=`pwd`/vlc_install_dir<br class="">+        --prefix=/usr<br class=""></blockquote><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">Why use /usr here and not just /? So that the DESTDIR would end up with</span><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">just the bin shared, etc. folders instead of nesting them in /usr?</span><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""></div></blockquote><div><br class=""></div>Hi,</div><div><br class=""></div><div>/usr felt like the more standard choice for a prefix, but indeed, I see no reason why we should not use /. i’ll try it locally.</div><div><br class=""></div><div>BR. David</div><div><br class=""><blockquote type="cite" class=""><div class=""><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><blockquote type="cite" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px; text-decoration: none;" class="">        --enable-macosx<br class="">        --enable-merge-ffmpeg<br class="">        --enable-osx-notifications<br class="">diff --git a/extras/package/macosx/package.mak b/extras/package/macosx/package.mak<br class="">index e7c660e31426..9be48169a4ea 100644<br class="">--- a/extras/package/macosx/package.mak<br class="">+++ b/extras/package/macosx/package.mak<br class="">@@ -1,3 +1,6 @@<br class="">+macos_destdir=$(abs_top_builddir)/macos-install<br class="">+<br class="">+<br class="">if HAVE_DARWIN<br class="">noinst_DATA = pseudo-bundle<br class="">endif<br class="">@@ -10,12 +13,18 @@ pseudo-bundle:<br class=""><span class="Apple-tab-span" style="white-space: pre;">    </span>$(LN_S) -hf $(CONTRIB_DIR)/Frameworks<br class=""><span class="Apple-tab-span" style="white-space: pre;">        </span>cd $(top_builddir)/bin/Contents/Resources/ && find $(abs_top_srcdir)/modules/gui/macosx/Resources/ -type f -exec $(LN_S) -f {} \;<br class=""><br class="">+macos-install:<br class="">+<span class="Apple-tab-span" style="white-space: pre;">  </span>rm -Rf "$(macos_destdir)"<br class="">+<span class="Apple-tab-span" style="white-space: pre;"> </span>mkdir "$(macos_destdir)"<br class="">+<span class="Apple-tab-span" style="white-space: pre;">  </span>DESTDIR="$(macos_destdir)" $(MAKE) install<br class="">+<span class="Apple-tab-span" style="white-space: pre;">        </span>touch "$(macos_destdir)"<br class="">+<br class=""># VLC.app for packaging and giving it to your friends<br class=""># use package-macosx to get a nice dmg<br class="">-VLC.app: install<br class="">+VLC.app: macos-install<br class=""><span class="Apple-tab-span" style="white-space: pre;">      </span>rm -Rf $@<br class=""><span class="Apple-tab-span" style="white-space: pre;">    </span>## Copy Contents<br class="">-<span class="Apple-tab-span" style="white-space: pre;">    </span>cp -R "$(datadir)/macosx/" $@<br class="">+<span class="Apple-tab-span" style="white-space: pre;">     </span>cp -R "$(macos_destdir)$(datadir)/macosx/" $@<br class=""><span class="Apple-tab-span" style="white-space: pre;">      </span>## Copy .strings file and .nib files<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>cp -R "$(top_builddir)/modules/gui/macosx/UI" $@/Contents/Resources/Base.lproj<br class=""><span class="Apple-tab-span" style="white-space: pre;">     </span>## Copy Info.plist and convert to binary<br class="">@@ -33,23 +42,23 @@ endif<br class=""><span class="Apple-tab-span" style="white-space: pre;">       </span>mkdir -p $@/Contents/MacOS/<br class="">if BUILD_LUA<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>## Copy lua scripts<br class="">-<span class="Apple-tab-span" style="white-space: pre;"> </span>cp -r "$(pkgdatadir)/lua" $@/Contents/Resources/share/<br class="">-<span class="Apple-tab-span" style="white-space: pre;">    </span>cp -r "$(pkglibexecdir)/lua" $@/Contents/Frameworks/<br class="">+<span class="Apple-tab-span" style="white-space: pre;">      </span>cp -r "$(macos_destdir)$(pkgdatadir)/lua" $@/Contents/Resources/share/<br class="">+<span class="Apple-tab-span" style="white-space: pre;">    </span>cp -r "$(macos_destdir)$(pkglibexecdir)/lua" $@/Contents/Frameworks/<br class="">endif<br class=""><span class="Apple-tab-span" style="white-space: pre;">     </span>## HRTFs<br class=""><span class="Apple-tab-span" style="white-space: pre;">     </span>cp -r "$(srcdir)/share/hrtfs" $@/Contents/Resources/share/<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>## Copy translations<br class="">-<span class="Apple-tab-span" style="white-space: pre;">        </span>-cp -a "$(datadir)/locale" $@/Contents/Resources/share/<br class="">+<span class="Apple-tab-span" style="white-space: pre;">   </span>-cp -a "$(macos_destdir)$(datadir)/locale" $@/Contents/Resources/share/<br class=""><span class="Apple-tab-span" style="white-space: pre;">    </span>printf "APPLVLC#" >| $@/Contents/PkgInfo<br class=""><span class="Apple-tab-span" style="white-space: pre;">        </span>## Copy libs<br class="">-<span class="Apple-tab-span" style="white-space: pre;">        </span>cp -a "$(libdir)"/libvlc*.dylib $@/Contents/Frameworks/<br class="">+<span class="Apple-tab-span" style="white-space: pre;">   </span>cp -a "$(macos_destdir)$(libdir)"/libvlc*.dylib $@/Contents/Frameworks/<br class=""><span class="Apple-tab-span" style="white-space: pre;">    </span>## Copy plugins<br class=""><span class="Apple-tab-span" style="white-space: pre;">      </span>mkdir -p $@/Contents/Frameworks/plugins<br class="">-<span class="Apple-tab-span" style="white-space: pre;">     </span>find "$(pkglibdir)/plugins" -name 'lib*_plugin.dylib' -maxdepth 2 -exec cp -a {} $@/Contents/Frameworks/plugins \;<br class="">+<span class="Apple-tab-span" style="white-space: pre;">        </span>find "$(macos_destdir)$(pkglibdir)/plugins" -name 'lib*_plugin.dylib' -maxdepth 2 -exec cp -a {} $@/Contents/Frameworks/plugins \;<br class=""><span class="Apple-tab-span" style="white-space: pre;"> </span>## Copy libbluray jar<br class=""><span class="Apple-tab-span" style="white-space: pre;">        </span>-cp -a "$(CONTRIB_DIR)"/share/java/libbluray*.jar $@/Contents/Frameworks/plugins/<br class=""><span class="Apple-tab-span" style="white-space: pre;">  </span>## Install binary<br class="">-<span class="Apple-tab-span" style="white-space: pre;">   </span>cp "$(prefix)/bin/vlc" $@/Contents/MacOS/VLC<br class="">+<span class="Apple-tab-span" style="white-space: pre;">      </span>cp "$(macos_destdir)$(prefix)/bin/vlc" $@/Contents/MacOS/VLC<br class=""><span class="Apple-tab-span" style="white-space: pre;">       </span>install_name_tool -rpath "$(libdir)" "@executable_path/../Frameworks/" $@/Contents/MacOS/VLC<br class=""><span class="Apple-tab-span" style="white-space: pre;">     </span>## Generate plugin cache<br class=""><span class="Apple-tab-span" style="white-space: pre;">     </span>VLC_LIB_PATH="$@/Contents/Frameworks" bin/vlc-cache-gen $@/Contents/Frameworks/plugins<br class="">@@ -117,7 +126,7 @@ package-translations:<br class=""><span class="Apple-tab-span" style="white-space: pre;">       </span>$(AMTAR) chof - $(srcdir)/vlc-translations-$(VERSION) \<br class=""><span class="Apple-tab-span" style="white-space: pre;">      </span><span class="Apple-converted-space"> </span> | GZIP=$(GZIP_ENV) gzip -c >$(srcdir)/vlc-translations-$(VERSION).tar.gz<br class=""><br class="">-.PHONY: package-macosx package-macosx-zip package-macosx-release package-translations pseudo-bundle<br class="">+.PHONY: package-macosx package-macosx-zip package-macosx-release package-translations pseudo-bundle macos-install<br class=""><br class="">###############################################################################<br class=""># Mac OS X project<br class="">--<span class="Apple-converted-space"> </span><br class="">2.21.0 (Apple Git-122.2)<br class=""><br class="">_______________________________________________<br class="">vlc-devel mailing list<br class="">To unsubscribe or modify your subscription options:<br class=""><a href="https://mailman.videolan.org/listinfo/vlc-devel" class="">https://mailman.videolan.org/listinfo/vlc-devel</a><br class=""></blockquote><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">_______________________________________________</span><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">vlc-devel mailing list</span><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><span style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none; float: none; display: inline !important;" class="">To unsubscribe or modify your subscription options:</span><br style="caret-color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class=""><a href="https://mailman.videolan.org/listinfo/vlc-devel" style="font-family: Helvetica; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-size-adjust: auto; -webkit-text-stroke-width: 0px;" class="">https://mailman.videolan.org/listinfo/vlc-devel</a></div></blockquote></div><br class=""></body></html>