<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ff4f915c8c936d393256ed6a8c16acc9bd7944dd">https://github.com/macports/macports-ports/commit/ff4f915c8c936d393256ed6a8c16acc9bd7944dd</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ff4f915c8c936d393256ed6a8c16acc9bd7944dd
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Mon Mar 25 09:08:07 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> VLC2: fix building app
</span>---
multimedia/VLC2/Portfile | 69 +++++++++++++---------
...ot-build-a-broken-securetransport-module.patch} | 0
...tch => 0003-Fix-macosx.m-in-video_output.patch} | 0
...0004-Makefile.am-avoid-breaking-destroot.patch} | 0
...> 0005-Do-not-err-out-on-no-acceleration.patch} | 0
...cOS.patch => 0006-Enable-gnutls-on-macOS.patch} | 0
...llow-SDL-out.patch => 0007-Allow-SDL-out.patch} | 0
...y-ref.-from-getConnectionEndpointAddress.patch} | 0
...-module.patch => 0009-Fix-for-Qt4-module.patch} | 0
...> 0010-Alt-fix-for-searchlineedit-in-Qt4.patch} | 0
multimedia/VLC2/files/no-sparkle.patch | 43 ++++++++++++++
multimedia/VLC2/files/patch-fix-packaging.diff | 30 ++++++++++
12 files changed, 115 insertions(+), 27 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC2/Portfile b/multimedia/VLC2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e1d0bc9df1e..d2f2aa7f15f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/VLC2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,6 +2,7 @@
</span>
PortSystem 1.0
PortGroup active_variants 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compiler_blacklist_versions 1.0
</span> PortGroup legacysupport 1.1
PortGroup openssl 1.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -150,7 +151,9 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span> depends_lib-append port:lua
# Some plugins require C++11
<span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fatal error: 'stdatomic.h' file not found
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.blacklist-append {clang < 601}
</span>
patchfiles patch-buildsystem.diff \
PR-34741-no__clang_version__.patch \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -162,6 +165,10 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span> patchfiles-append \
patch-static_assert.diff \
patch-buildsystem-fp-flags.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Wno-incompatible-function-pointer-types
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Wno-reserved-user-defined-literal
</span> } elseif {[string match *gcc* ${configure.compiler}]} {
patchfiles-append \
0001-Fixes-for-modern-GCC.patch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -175,22 +182,22 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span> patch-vda-ffmpeg34+.diff
if {${os.major} < 11} {
patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0002-Fix-for-Qt4-module.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0003-Alt-fix-for-searchlineedit-in-Qt4.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0004-Enable-gnutls-on-macOS.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0005-Do-not-build-a-broken-securetransport-module.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0006-Fix-macosx.m-in-video_output.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0007-Makefile.am-avoid-breaking-destroot.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0002-Do-not-build-a-broken-securetransport-module.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0003-Fix-macosx.m-in-video_output.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0004-Makefile.am-avoid-breaking-destroot.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0005-Do-not-err-out-on-no-acceleration.patch
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0006-Enable-gnutls-on-macOS.patch
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Notice, VLC2 assumes SDL1, not SDL2. It will not build against SDL2,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # unless needed changes are backported.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append 0008-Allow-SDL-out.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0009-Do-not-err-out-on-no-acceleration.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Notice, VLC2 assumes SDL1, not SDL2. It will not build against SDL2,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # unless needed changes are backported.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0007-Allow-SDL-out.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
# https://bugs.gentoo.org/795798
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append 0010-Get-addr-by-ref.-from-getConnectionEndpointAddress.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append 0008-Get-addr-by-ref.-from-getConnectionEndpointAddress.patch
</span>
# FFMpeg 4 compatibility (by RJVB)
patchfiles-append patch-ffmpeg4-compat.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -437,24 +444,33 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span> }
# Variants for graphics:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant qt4 description "Enable Qt4 support" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant qt4 conflicts quartz description "Enable Qt4 support" {
</span> PortGroup qt4 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append 0009-Fix-for-Qt4-module.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0010-Alt-fix-for-searchlineedit-in-Qt4.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-replace --disable-qt --enable-qt
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant quartz {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete port:libsamplerate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant quartz conflicts qt4 x11 {
</span> depends_lib-append port:BGHUDAppKit
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # SDL needs X11:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # sdl.c: error: Xlib required due to XInitThreads
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete port:libsdl port:libsdl_image port:libsamplerate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-fix-packaging.diff
</span>
configure.args-replace --disable-macosx --enable-macosx \
--disable-macosx-quartztext --enable-macosx-quartztext \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-samplerate --disable-samplerate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-samplerate --disable-samplerate \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-sdl --disable-sdl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-sdl-image --disable-sdl-image
</span> # taken from VLC's own configure.sh script for OS X:
configure.args-append --enable-merge-ffmpeg
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant x11 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant x11 conflicts quartz {
</span> depends_lib-append \
port:mesa \
port:xorg-libX11 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -529,15 +545,14 @@ if {(${subport} eq ${name}) || (${subport} eq "lib${name}")} {
</span>
if {![info exists replaced_by]} {
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-## now in patch-buildsystem.diff :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# reinplace "/Sparkle.framework/d" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ${worksrcpath}/extras/package/macosx/vlc.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# reinplace "/SDKROOT/d" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ${worksrcpath}/extras/package/macosx/vlc.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# reinplace "/Growl.framework/d" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ${worksrcpath}/extras/package/macosx/package.mak
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# reinplace "s:LD_LIBRARY_PATH:DYLD_LIBRARY_PATH:g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ${worksrcpath}/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "/Sparkle.framework/d" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/extras/package/macosx/vlc.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "/SDKROOT/d" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/extras/package/macosx/vlc.xcodeproj/project.pbxproj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "/Growl.framework/d" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/extras/package/macosx/package.mak
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s:LD_LIBRARY_PATH:DYLD_LIBRARY_PATH:g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/Makefile.am
</span>
if {![file exists ${worksrcpath}/contrib/BGHUDAppKit.framework]} {
ln -s ${frameworks_dir}/BGHUDAppKit.framework ${worksrcpath}/contrib/BGHUDAppKit.framework
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC2/files/0005-Do-not-build-a-broken-securetransport-module.patch b/multimedia/VLC2/files/0002-Do-not-build-a-broken-securetransport-module.patch
</span>similarity index 100%
rename from multimedia/VLC2/files/0005-Do-not-build-a-broken-securetransport-module.patch
rename to multimedia/VLC2/files/0002-Do-not-build-a-broken-securetransport-module.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC2/files/0006-Fix-macosx.m-in-video_output.patch b/multimedia/VLC2/files/0003-Fix-macosx.m-in-video_output.patch
</span>similarity index 100%
rename from multimedia/VLC2/files/0006-Fix-macosx.m-in-video_output.patch
rename to multimedia/VLC2/files/0003-Fix-macosx.m-in-video_output.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC2/files/0007-Makefile.am-avoid-breaking-destroot.patch b/multimedia/VLC2/files/0004-Makefile.am-avoid-breaking-destroot.patch
</span>similarity index 100%
rename from multimedia/VLC2/files/0007-Makefile.am-avoid-breaking-destroot.patch
rename to multimedia/VLC2/files/0004-Makefile.am-avoid-breaking-destroot.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC2/files/0009-Do-not-err-out-on-no-acceleration.patch b/multimedia/VLC2/files/0005-Do-not-err-out-on-no-acceleration.patch
</span>similarity index 100%
rename from multimedia/VLC2/files/0009-Do-not-err-out-on-no-acceleration.patch
rename to multimedia/VLC2/files/0005-Do-not-err-out-on-no-acceleration.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC2/files/0004-Enable-gnutls-on-macOS.patch b/multimedia/VLC2/files/0006-Enable-gnutls-on-macOS.patch
</span>similarity index 100%
rename from multimedia/VLC2/files/0004-Enable-gnutls-on-macOS.patch
rename to multimedia/VLC2/files/0006-Enable-gnutls-on-macOS.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC2/files/0008-Allow-SDL-out.patch b/multimedia/VLC2/files/0007-Allow-SDL-out.patch
</span>similarity index 100%
rename from multimedia/VLC2/files/0008-Allow-SDL-out.patch
rename to multimedia/VLC2/files/0007-Allow-SDL-out.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC2/files/0010-Get-addr-by-ref.-from-getConnectionEndpointAddress.patch b/multimedia/VLC2/files/0008-Get-addr-by-ref.-from-getConnectionEndpointAddress.patch
</span>similarity index 100%
rename from multimedia/VLC2/files/0010-Get-addr-by-ref.-from-getConnectionEndpointAddress.patch
rename to multimedia/VLC2/files/0008-Get-addr-by-ref.-from-getConnectionEndpointAddress.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC2/files/0002-Fix-for-Qt4-module.patch b/multimedia/VLC2/files/0009-Fix-for-Qt4-module.patch
</span>similarity index 100%
rename from multimedia/VLC2/files/0002-Fix-for-Qt4-module.patch
rename to multimedia/VLC2/files/0009-Fix-for-Qt4-module.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC2/files/0003-Alt-fix-for-searchlineedit-in-Qt4.patch b/multimedia/VLC2/files/0010-Alt-fix-for-searchlineedit-in-Qt4.patch
</span>similarity index 100%
rename from multimedia/VLC2/files/0003-Alt-fix-for-searchlineedit-in-Qt4.patch
rename to multimedia/VLC2/files/0010-Alt-fix-for-searchlineedit-in-Qt4.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC2/files/no-sparkle.patch b/multimedia/VLC2/files/no-sparkle.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 395ade6a517..f2e64983d99 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/VLC2/files/no-sparkle.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/VLC2/files/no-sparkle.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -187,3 +187,46 @@ index 1d48150..c61a4aa 100644
</span> #pragma mark Media Key support
-(void)mediaKeyTap:(SPMediaKeyTap*)keyTap receivedMediaKeyEvent:(NSEvent*)event
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- extras/package/macosx/Info.plist.in 2017-08-27 23:58:56.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ extras/package/macosx/Info.plist.in 2024-03-25 06:03:52.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1342,12 +1342,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <string>Binary</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </dict>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </array>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <key>SUFeedURL</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <string>http://update.videolan.org/vlc/sparkle/vlc-intel64.xml</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <key>SUPublicDSAKeyFile</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <string>dsa_pub.pem</string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <key>SUAllowsAutomaticUpdates</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <false/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>NSAppTransportSecurity</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <dict>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <key>NSAllowsArbitraryLoads</key>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- extras/package/macosx/ub.sh 2014-06-14 23:14:12.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ extras/package/macosx/ub.sh 2024-03-25 06:08:00.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -43,11 +43,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -Rf $SRCROOT/VLC.app/$LIBS/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -Rf $SRCROOT/VLC.app/Contents/MacOS/VLC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -Rf $SRCROOT/VLC.app/$PLUGINS/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-rm -Rf $SRCROOT/VLC.app/$FRAMEWORKS/Growl.framework/Versions/A/Growl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -Rf $SRCROOT/VLC.app/$FRAMEWORKS/BGHUDAppKit.framework/BGHUDAppKit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -Rf $SRCROOT/VLC.app/$FRAMEWORKS/BGHUDAppKit.framework/Versions/A/BGHUDAppKit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-rm -Rf $SRCROOT/VLC.app/$FRAMEWORKS/Sparkle.framework/Versions/A/Sparkle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-rm -Rf $SRCROOT/VLC.app/$FRAMEWORKS/Sparkle.framework/Resources/relaunch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ function do_lipo {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file="$1"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -86,11 +83,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "Installing frameworks"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-do_lipo $FRAMEWORKS/Growl.framework/Versions/A/Growl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ do_lipo $FRAMEWORKS/BGHUDAppKit.framework/BGHUDAppKit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ do_lipo $FRAMEWORKS/BGHUDAppKit.framework/Versions/A/BGHUDAppKit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-do_lipo $FRAMEWORKS/Sparkle.framework/Versions/A/Sparkle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-do_lipo $FRAMEWORKS/Sparkle.framework/Resources/relaunch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "Installing VLC"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ do_lipo Contents/MacOS/VLC
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/VLC2/files/patch-fix-packaging.diff b/multimedia/VLC2/files/patch-fix-packaging.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..78fe1c5f800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/VLC2/files/patch-fix-packaging.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,30 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- extras/package/macosx/package.mak 2015-08-04 00:43:00.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ extras/package/macosx/package.mak 2024-03-25 07:06:59.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -49,7 +49,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp -R $(top_builddir)/tmp/build/Default/VLC.bundle $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkdir -p $@/Contents/Frameworks && cp -R $(CONTRIB_DIR)/Growl.framework $@/Contents/Frameworks/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkdir -p $@/Contents/MacOS/share/locale/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cp -r "$(prefix)/lib/vlc/lua" "$(prefix)/share/vlc/lua" $@/Contents/MacOS/share/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkdir -p $@/Contents/MacOS/include/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (cd "$(prefix)/include" && $(AMTAR) -c --exclude "plugins" vlc) | $(AMTAR) -x -C $@/Contents/MacOS/include/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -m 644 $(srcdir)/share/vlc512x512.png $@/Contents/MacOS/share/vlc512x512.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,19 +67,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd $(srcdir); cp AUTHORS COPYING README THANKS NEWS $(abs_top_builddir)/vlc-$(VERSION)/Goodies/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp $(srcdir)/extras/package/macosx/README.MacOSX.rtf $(top_builddir)/vlc-$(VERSION)/Read\ Me.rtf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(LN_S) -f /Applications $(top_builddir)/vlc-$(VERSION)/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rm -f "$(top_builddir)/vlc-$(VERSION)-rw.dmg"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- hdiutil create -verbose -srcfolder "$(top_builddir)/vlc-$(VERSION)" "$(top_builddir)/vlc-$(VERSION)-rw.dmg" -scrub -format UDRW
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mkdir -p ./mount
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- hdiutil attach -readwrite -noverify -noautoopen -mountRoot ./mount "vlc-$(VERSION)-rw.dmg"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -osascript "$(srcdir)"/extras/package/macosx/dmg_setup.scpt "vlc-$(VERSION)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- hdiutil detach ./mount/"vlc-$(VERSION)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Make sure the image is not writable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Note: We can't directly create a read only dmg as we do the bless stuff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rm -f "$(top_builddir)/vlc-$(VERSION).dmg"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- hdiutil convert "$(top_builddir)/vlc-$(VERSION)-rw.dmg" -format UDBZ -o "$(top_builddir)/vlc-$(VERSION).dmg"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ls -l "$(top_builddir)/vlc-$(VERSION).dmg"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rm -f "$(top_builddir)/vlc-$(VERSION)-rw.dmg"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rm -rf "$(top_builddir)/vlc-$(VERSION)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ package-macosx-zip: VLC.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkdir -p $(top_builddir)/vlc-$(VERSION)/Goodies/
</span></pre><pre style='margin:0'>
</pre>