diff options
author | James Brink | 2020-07-27 10:53:53 -0700 |
---|---|---|
committer | James Brink | 2020-07-27 10:53:53 -0700 |
commit | d9fc05dba5faf6b65267bd19414d0858691288fd (patch) | |
tree | bddf5b8d3088bd3708671de5430daf0b0a369f5c | |
parent | e55efc0281b036be5cd3aebb4797f81634d794ae (diff) | |
download | aur-darling.tar.gz |
Add missing submodules
Added missing submodules which have been added upstream as requirements
-rw-r--r-- | .SRCINFO | 40 | ||||
-rw-r--r-- | PKGBUILD | 65 |
2 files changed, 85 insertions, 20 deletions
@@ -1,8 +1,8 @@ pkgbase = darling pkgdesc = Darwin/macOS emulation layer for Linux (Stable) - pkgver = r2573.4b120631 + pkgver = r3131.fa5348c8a pkgrel = 1 - url = http://www.darlinghq.org/ + url = http://www.darlinghq.org arch = x86_64 groups = darling license = GPL3 @@ -20,6 +20,7 @@ pkgbase = darling makedepends = libbsd makedepends = python2 makedepends = linux-headers + makedepends = libavresample depends = xz depends = fuse depends = libxml2 @@ -38,6 +39,7 @@ pkgbase = darling depends = python depends = gawk depends = libunwind + depends = libavresample options = !buildflags source = dkms.conf source = git+https://github.com/darlinghq/cctools-port.git @@ -61,7 +63,9 @@ pkgbase = darling source = git+https://github.com/darlinghq/darling-corefoundation.git source = git+https://github.com/darlinghq/darling-coretls.git source = git+https://github.com/darlinghq/darling-crontabs.git + source = git+https://github.com/darlinghq/darling-cups.git source = git+https://github.com/darlinghq/darling-curl.git + source = git+https://github.com/darlinghq/darling-dbuskit.git source = git+https://github.com/darlinghq/darling-DirectoryService.git source = git+https://github.com/darlinghq/darling-dmg.git source = git+https://github.com/darlinghq/darling-doc_cmds.git @@ -72,6 +76,7 @@ pkgbase = darling source = git+https://github.com/darlinghq/darling-file.git source = git+https://github.com/darlinghq/darling-files.git source = git+https://github.com/darlinghq/darling-foundation.git + source = git+https://github.com/darlinghq/darling-glut.git source = git+https://github.com/darlinghq/darling-gnudiff.git source = git+https://github.com/darlinghq/darling-gnutar.git source = git+https://github.com/darlinghq/darling-gpatch.git @@ -80,6 +85,8 @@ pkgbase = darling source = git+https://github.com/darlinghq/darling-Heimdal.git source = git+https://github.com/darlinghq/darling-icu.git source = git+https://github.com/darlinghq/darling-installer.git + source = git+https://github.com/darlinghq/darling-iokitd.git + source = git+https://github.com/darlinghq/darling-IOKitTools.git source = git+https://github.com/darlinghq/darling-iokituser.git source = git+https://github.com/darlinghq/darling-IONetworkingFamily.git source = git+https://github.com/darlinghq/darling-iostoragefamily.git @@ -91,11 +98,13 @@ pkgbase = darling source = git+https://github.com/darlinghq/darling-libcxx.git source = git+https://github.com/darlinghq/darling-libcxxabi.git source = git+https://github.com/darlinghq/darling-libdispatch.git + source = git+https://github.com/darlinghq/darling-libffi.git source = git+https://github.com/darlinghq/darling-libkqueue.git source = git+https://github.com/darlinghq/darling-liblzma.git source = git+https://github.com/darlinghq/darling-libplatform.git source = git+https://github.com/darlinghq/darling-libpthread.git source = git+https://github.com/darlinghq/darling-libtelnet.git + source = git+https://github.com/darlinghq/darling-libtrace.git source = git+https://github.com/darlinghq/darling-libxml2.git source = git+https://github.com/darlinghq/darling-libxpc.git source = git+https://github.com/darlinghq/darling-libxslt.git @@ -106,16 +115,20 @@ pkgbase = darling source = git+https://github.com/darlinghq/darling-network_cmds.git source = git+https://github.com/darlinghq/darling-newlkm.git source = git+https://github.com/darlinghq/darling-objc4.git + source = git+https://github.com/darlinghq/darling-openal.git + source = git+https://github.com/darlinghq/darling-opendirectory.git source = git+https://github.com/darlinghq/darling-openpam.git source = git+https://github.com/darlinghq/darling-openssh.git source = git+https://github.com/darlinghq/darling-openssl_certificates.git source = git+https://github.com/darlinghq/darling-openssl.git + source = git+https://github.com/darlinghq/darling-pam_modules.git source = git+https://github.com/darlinghq/darling-patch_cmds.git source = git+https://github.com/darlinghq/darling-pcre.git source = git+https://github.com/darlinghq/darling-perl.git source = git+https://github.com/darlinghq/darling-python_modules.git source = git+https://github.com/darlinghq/darling-python.git source = git+https://github.com/darlinghq/darling-remote_cmds.git + source = git+https://github.com/darlinghq/darling-rsync.git source = git+https://github.com/darlinghq/darling-ruby.git source = git+https://github.com/darlinghq/darling-screen.git source = git+https://github.com/darlinghq/darling-security.git @@ -123,19 +136,22 @@ pkgbase = darling source = git+https://github.com/darlinghq/darling-shell_cmds.git source = git+https://github.com/darlinghq/darling-SmartCardServices.git source = git+https://github.com/darlinghq/darling-sqlite.git + source = git+https://github.com/darlinghq/darling-swift.git source = git+https://github.com/darlinghq/darling-syslog.git source = git+https://github.com/darlinghq/darling-system_cmds.git source = git+https://github.com/darlinghq/darling-tcsh.git source = git+https://github.com/darlinghq/darling-text_cmds.git source = git+https://github.com/darlinghq/darling-TextEdit.git source = git+https://github.com/darlinghq/darling-top.git + source = git+https://github.com/darlinghq/darling-usertemplate.git source = git+https://github.com/darlinghq/darling-vim.git source = git+https://github.com/darlinghq/darling-WebCore.git source = git+https://github.com/darlinghq/darling-WTF.git source = git+https://github.com/darlinghq/darling-zip.git source = git+https://github.com/darlinghq/darling-zlib.git source = git+https://github.com/darlinghq/darling-zsh.git - source = git+https://github.com/darlinghq/darling.git#commit=4b120631eaebdadf7b77a4bf5c4eeecfe2ea594b + source = git+https://github.com/darlinghq/darling.git#commit=fa5348c8a9b338746b91a53a801343a8d046a66d + source = git+https://github.com/darlinghq/fmdb.git source = git+https://github.com/darlinghq/lzfse.git source = git+https://github.com/darlinghq/xcbuild.git md5sums = 21481865cc96f636f3a47f4d04980fce @@ -237,12 +253,26 @@ pkgbase = darling md5sums = SKIP md5sums = SKIP md5sums = SKIP + md5sums = SKIP + md5sums = SKIP + md5sums = SKIP + md5sums = SKIP + md5sums = SKIP + md5sums = SKIP + md5sums = SKIP + md5sums = SKIP + md5sums = SKIP + md5sums = SKIP + md5sums = SKIP + md5sums = SKIP + md5sums = SKIP + md5sums = SKIP pkgname = darling install = darling.install depends = darling-mach-dkms provides = darling - conflicts = darling-git + conflicts = darling pkgname = darling-mach-dkms depends = dkms @@ -251,5 +281,5 @@ pkgname = darling-mach-dkms optdepends = linux-zen-headers: build modules against the ZEN kernel optdepends = linux-grsec-headers: build modules against the GRSEC kernel provides = darling-mach-dkms - conflicts = darling-mach-dkms-git + conflicts = darling-mach-dkms @@ -4,17 +4,17 @@ _gitname=darling pkgbase=$_gitname pkgname=('darling' 'darling-mach-dkms') -pkgver=r2573.4b120631 +pkgver=r3131.fa5348c8a pkgrel=1 pkgdesc="Darwin/macOS emulation layer for Linux (Stable)" arch=('x86_64') -url="http://www.darlinghq.org/" +url="http://www.darlinghq.org" license=('GPL3') groups=('darling') depends=('xz' 'fuse' 'libxml2' 'icu' 'openssl' 'bzip2' 'zlib' 'libsystemd' - 'wget' 'curl' 'sqlite' 'ruby' 'sed' 'libarchive' 'file' 'python' 'gawk' 'libunwind') # namcap complains about them + 'wget' 'curl' 'sqlite' 'ruby' 'sed' 'libarchive' 'file' 'python' 'gawk' 'libunwind' 'libavresample') # namcap complains about them _depends_x86_64=('lib32-clang' 'lib32-bzip2' 'lib32-systemd' 'lib32-libxslt' 'libpng' 'cairo' 'libtiff' 'glu' 'libbsd' 'python2') -makedepends=('git' 'cmake' 'clang' 'dkms' 'bison' 'flex' 'binutils>=2.28' 'libpng' 'cairo' 'libtiff' 'glu' 'libbsd' 'python2' 'linux-headers') +makedepends=('git' 'cmake' 'clang' 'dkms' 'bison' 'flex' 'binutils>=2.28' 'libpng' 'cairo' 'libtiff' 'glu' 'libbsd' 'python2' 'linux-headers' 'libavresample') _make_depends_x86_64=('gcc-multilib') # Darling git repo and all submodules. @@ -40,7 +40,9 @@ source=('dkms.conf' 'git+https://github.com/darlinghq/darling-corefoundation.git' 'git+https://github.com/darlinghq/darling-coretls.git' 'git+https://github.com/darlinghq/darling-crontabs.git' + 'git+https://github.com/darlinghq/darling-cups.git' 'git+https://github.com/darlinghq/darling-curl.git' + 'git+https://github.com/darlinghq/darling-dbuskit.git' 'git+https://github.com/darlinghq/darling-DirectoryService.git' 'git+https://github.com/darlinghq/darling-dmg.git' 'git+https://github.com/darlinghq/darling-doc_cmds.git' @@ -51,6 +53,7 @@ source=('dkms.conf' 'git+https://github.com/darlinghq/darling-file.git' 'git+https://github.com/darlinghq/darling-files.git' 'git+https://github.com/darlinghq/darling-foundation.git' + 'git+https://github.com/darlinghq/darling-glut.git' 'git+https://github.com/darlinghq/darling-gnudiff.git' 'git+https://github.com/darlinghq/darling-gnutar.git' 'git+https://github.com/darlinghq/darling-gpatch.git' @@ -59,6 +62,8 @@ source=('dkms.conf' 'git+https://github.com/darlinghq/darling-Heimdal.git' 'git+https://github.com/darlinghq/darling-icu.git' 'git+https://github.com/darlinghq/darling-installer.git' + 'git+https://github.com/darlinghq/darling-iokitd.git' + 'git+https://github.com/darlinghq/darling-IOKitTools.git' 'git+https://github.com/darlinghq/darling-iokituser.git' 'git+https://github.com/darlinghq/darling-IONetworkingFamily.git' 'git+https://github.com/darlinghq/darling-iostoragefamily.git' @@ -70,11 +75,13 @@ source=('dkms.conf' 'git+https://github.com/darlinghq/darling-libcxx.git' 'git+https://github.com/darlinghq/darling-libcxxabi.git' 'git+https://github.com/darlinghq/darling-libdispatch.git' + 'git+https://github.com/darlinghq/darling-libffi.git' 'git+https://github.com/darlinghq/darling-libkqueue.git' 'git+https://github.com/darlinghq/darling-liblzma.git' 'git+https://github.com/darlinghq/darling-libplatform.git' 'git+https://github.com/darlinghq/darling-libpthread.git' 'git+https://github.com/darlinghq/darling-libtelnet.git' + 'git+https://github.com/darlinghq/darling-libtrace.git' 'git+https://github.com/darlinghq/darling-libxml2.git' 'git+https://github.com/darlinghq/darling-libxpc.git' 'git+https://github.com/darlinghq/darling-libxslt.git' @@ -85,16 +92,20 @@ source=('dkms.conf' 'git+https://github.com/darlinghq/darling-network_cmds.git' 'git+https://github.com/darlinghq/darling-newlkm.git' 'git+https://github.com/darlinghq/darling-objc4.git' + 'git+https://github.com/darlinghq/darling-openal.git' + 'git+https://github.com/darlinghq/darling-opendirectory.git' 'git+https://github.com/darlinghq/darling-openpam.git' 'git+https://github.com/darlinghq/darling-openssh.git' 'git+https://github.com/darlinghq/darling-openssl_certificates.git' 'git+https://github.com/darlinghq/darling-openssl.git' + 'git+https://github.com/darlinghq/darling-pam_modules.git' 'git+https://github.com/darlinghq/darling-patch_cmds.git' 'git+https://github.com/darlinghq/darling-pcre.git' 'git+https://github.com/darlinghq/darling-perl.git' 'git+https://github.com/darlinghq/darling-python_modules.git' 'git+https://github.com/darlinghq/darling-python.git' 'git+https://github.com/darlinghq/darling-remote_cmds.git' + 'git+https://github.com/darlinghq/darling-rsync.git' 'git+https://github.com/darlinghq/darling-ruby.git' 'git+https://github.com/darlinghq/darling-screen.git' 'git+https://github.com/darlinghq/darling-security.git' @@ -102,19 +113,22 @@ source=('dkms.conf' 'git+https://github.com/darlinghq/darling-shell_cmds.git' 'git+https://github.com/darlinghq/darling-SmartCardServices.git' 'git+https://github.com/darlinghq/darling-sqlite.git' + 'git+https://github.com/darlinghq/darling-swift.git' 'git+https://github.com/darlinghq/darling-syslog.git' 'git+https://github.com/darlinghq/darling-system_cmds.git' 'git+https://github.com/darlinghq/darling-tcsh.git' 'git+https://github.com/darlinghq/darling-text_cmds.git' 'git+https://github.com/darlinghq/darling-TextEdit.git' 'git+https://github.com/darlinghq/darling-top.git' + 'git+https://github.com/darlinghq/darling-usertemplate.git' 'git+https://github.com/darlinghq/darling-vim.git' 'git+https://github.com/darlinghq/darling-WebCore.git' 'git+https://github.com/darlinghq/darling-WTF.git' 'git+https://github.com/darlinghq/darling-zip.git' 'git+https://github.com/darlinghq/darling-zlib.git' 'git+https://github.com/darlinghq/darling-zsh.git' - 'git+https://github.com/darlinghq/darling.git#commit=4b120631eaebdadf7b77a4bf5c4eeecfe2ea594b' + 'git+https://github.com/darlinghq/darling.git#commit=fa5348c8a9b338746b91a53a801343a8d046a66d' + 'git+https://github.com/darlinghq/fmdb.git' 'git+https://github.com/darlinghq/lzfse.git' 'git+https://github.com/darlinghq/xcbuild.git') @@ -129,7 +143,9 @@ md5sums=('21481865cc96f636f3a47f4d04980fce' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' - 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP') + 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' + 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' + 'SKIP' 'SKIP') options=('!buildflags') pkgver() { @@ -166,8 +182,10 @@ prepare() { git config submodule.src/external/corefoundation.url "$srcdir/darling-corefoundation" git config submodule.src/external/coretls.url "$srcdir/darling-coretls" git config submodule.src/external/crontabs.url "$srcdir/darling-crontabs" + git config submodule.src/external/cups.url "$srcdir/darling-cups" git config submodule.src/external/curl.url "$srcdir/darling-curl" git config submodule.src/external/darling-dmg.url "$srcdir/darling-dmg" + git config submodule.src/external/dbuskit.url "$srcdir/darling-dbuskit" git config submodule.src/external/DirectoryService.url "$srcdir/darling-DirectoryService" git config submodule.src/external/doc_cmds.url "$srcdir/darling-doc_cmds" git config submodule.src/external/DSTools.url "$srcdir/darling-DSTools" @@ -176,7 +194,9 @@ prepare() { git config submodule.src/external/file_cmds.url "$srcdir/darling-file_cmds" git config submodule.src/external/file.url "$srcdir/darling-file" git config submodule.src/external/files.url "$srcdir/darling-files" + git config submodule.src/external/fmdb.url "$srcdir/fmdb" git config submodule.src/external/foundation.url "$srcdir/darling-foundation" + git config submodule.src/external/glut.url "$srcdir/darling-glut" git config submodule.src/external/gnudiff.url "$srcdir/darling-gnudiff" git config submodule.src/external/gnutar.url "$srcdir/darling-gnutar" git config submodule.src/external/gpatch.url "$srcdir/darling-gpatch" @@ -185,6 +205,8 @@ prepare() { git config submodule.src/external/Heimdal.url "$srcdir/darling-Heimdal" git config submodule.src/external/icu.url "$srcdir/darling-icu" git config submodule.src/external/installer.url "$srcdir/darling-installer" + git config submodule.src/external/iokitd.url "$srcdir/darling-iokitd" + git config submodule.src/external/IOKitTools.url "$srcdir/darling-IOKitTools" git config submodule.src/external/IOKitUser.url "$srcdir/darling-iokituser" git config submodule.src/external/IONetworkingFamily.url "$srcdir/darling-IONetworkingFamily" git config submodule.src/external/IOStorageFamily.url "$srcdir/darling-iostoragefamily" @@ -196,14 +218,17 @@ prepare() { git config submodule.src/external/libcxx.url "$srcdir/darling-libcxx" git config submodule.src/external/libcxxabi.url "$srcdir/darling-libcxxabi" git config submodule.src/external/libdispatch.url "$srcdir/darling-libdispatch" + git config submodule.src/external/libffi.url "$srcdir/darling-libffi" git config submodule.src/external/libkqueue.url "$srcdir/darling-libkqueue" git config submodule.src/external/liblzma.url "$srcdir/darling-liblzma" git config submodule.src/external/libplatform.url "$srcdir/darling-libplatform" git config submodule.src/external/libpthread.url "$srcdir/darling-libpthread" git config submodule.src/external/libtelnet.url "$srcdir/darling-libtelnet" + git config submodule.src/external/libtrace.url "$srcdir/darling-libtrace" git config submodule.src/external/libxml2.url "$srcdir/darling-libxml2" git config submodule.src/external/libxpc.url "$srcdir/darling-libxpc" git config submodule.src/external/libxslt.url "$srcdir/darling-libxslt" + git config submodule.src/external/lkm.url "$srcdir/darling-newlkm" git config submodule.src/external/lzfse.url "$srcdir/lzfse" git config submodule.src/external/mail_cmds.url "$srcdir/darling-mail_cmds" git config submodule.src/external/man.url "$srcdir/darling-man" @@ -211,6 +236,8 @@ prepare() { git config submodule.src/external/nano.url "$srcdir/darling-nano" git config submodule.src/external/network_cmds.url "$srcdir/darling-network_cmds" git config submodule.src/external/objc4.url "$srcdir/darling-objc4" + git config submodule.src/external/OpenAL.url "$srcdir/darling-openal" + git config submodule.src/external/OpenDirectory.url "$srcdir/darling-opendirectory" git config submodule.src/external/openpam.url "$srcdir/darling-openpam" git config submodule.src/external/openssh.url "$srcdir/darling-openssh" git config submodule.src/external/openssl_certificates.url "$srcdir/darling-openssl_certificates" @@ -221,6 +248,7 @@ prepare() { git config submodule.src/external/python_modules.url "$srcdir/darling-python_modules" git config submodule.src/external/python.url "$srcdir/darling-python" git config submodule.src/external/remote_cmds.url "$srcdir/darling-remote_cmds" + git config submodule.src/external/rsync.url "$srcdir/darling-rsync" git config submodule.src/external/ruby.url "$srcdir/darling-ruby" git config submodule.src/external/screen.url "$srcdir/darling-screen" git config submodule.src/external/security.url "$srcdir/darling-security" @@ -228,12 +256,14 @@ prepare() { git config submodule.src/external/shell_cmds.url "$srcdir/darling-shell_cmds" git config submodule.src/external/SmartCardServices.url "$srcdir/darling-SmartCardServices" git config submodule.src/external/sqlite.url "$srcdir/darling-sqlite" + git config submodule.src/external/swift.url "$srcdir/darling-swift" git config submodule.src/external/syslog.url "$srcdir/darling-syslog" git config submodule.src/external/system_cmds.url "$srcdir/darling-system_cmds" git config submodule.src/external/tcsh.url "$srcdir/darling-tcsh" git config submodule.src/external/text_cmds.url "$srcdir/darling-text_cmds" git config submodule.src/external/TextEdit.url "$srcdir/darling-TextEdit" git config submodule.src/external/top.url "$srcdir/darling-top" + git config submodule.src/external/usertemplate.url "$srcdir/darling-usertemplate" git config submodule.src/external/vim.url "$srcdir/darling-vim" git config submodule.src/external/WebCore.url "$srcdir/darling-WebCore" git config submodule.src/external/WTF.url "$srcdir/darling-WTF" @@ -241,12 +271,18 @@ prepare() { git config submodule.src/external/zip.url "$srcdir/darling-zip" git config submodule.src/external/zlib.url "$srcdir/darling-zlib" git config submodule.src/external/zsh.url "$srcdir/darling-zsh" - git config submodule.src/lkm.url "$srcdir/darling-newlkm" echo "Updating git submodules" git submodule update + echo "Updating recursive submodules" + cd "$srcdir/$_gitname/src/external/openpam/" + git submodule init + git config submodule.pam_modules.url "$srcdir/darling-pam_modules" + git submodule update + echo "Creating build directory." + cd "$srcdir/$_gitname" mkdir -pv "build" } @@ -257,26 +293,25 @@ build() { cmake .. -DCMAKE_INSTALL_PREFIX=/usr echo "Running make." - make + make echo "Run 'make lkm'..." - make lkm + make lkm } package_darling() { install=darling.install depends=('darling-mach-dkms') - conflicts=('darling-git') + conflicts=('darling') provides=('darling') cd "$srcdir/$_gitname/build" - make DESTDIR="$pkgdir" install - install -Dvm755 "$srcdir/$_gitname/src/setup-ld-so.sh" "$pkgdir/usr/bin/darling-setup-ld-so" + make DESTDIR="$pkgdir" install } package_darling-mach-dkms() { depends=('dkms') - conflicts=('darling-mach-dkms-git') + conflicts=('darling-mach-dkms') provides=('darling-mach-dkms') optdepends=('linux-headers: build modules against the Arch kernel' 'linux-lts-headers: build modules against the LTS kernel' @@ -287,8 +322,8 @@ package_darling-mach-dkms() { echo "Install module sources for DKMS." install -dm755 $(dirname "$_srcdest") - cp -r "$srcdir/$_gitname/src/lkm" "$_srcdest" - cp -r "$srcdir/$_gitname/build/src/lkm" "$_srcdest/migdir" + cp -r "$srcdir/$_gitname/src/external/lkm" "$_srcdest" + cp -r "$srcdir/$_gitname/build/src/external/lkm" "$_srcdest/migdir" # Copy missing header rtsig.h cp "$srcdir/$_gitname/build/src/startup/rtsig.h" "$_srcdest/include" |