Mercurial > vanilla
changeset 1094:3dece1f7570b
vanilla: add many ghost dependencies
line wrap: on
line diff
--- a/accessibility/at-spi2-core/at-spi2-core.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/accessibility/at-spi2-core/at-spi2-core.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="LGPLv20" PKGSUMMARY="core definitions for at-spi" PKGDOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/$PKGNAME/2.32/$PKGNAME-$PKGVERSION.tar.xz" -PKGDEPENDS="meson:build" +PKGDEPENDS="dbus glib meson:build" PKGOPTIONS="X" : ${CC:=clang}
--- a/accessibility/atk/atk.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/accessibility/atk/atk.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="LGPLv20" PKGSUMMARY="accessibility toolkit" PKGDOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/$PKGNAME/2.32/$PKGNAME-$PKGVERSION.tar.xz" -PKGDEPENDS="meson:build" +PKGDEPENDS="glib meson:build" : ${CC:=clang} : ${CFLAGS:=-O2}
--- a/audio/jack2/jack2.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/audio/jack2/jack2.sh Mon Sep 09 21:10:00 2019 +0200 @@ -15,7 +15,7 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # -# TODO: add CELT, PORTAUDIO, SAMPLERATE options +# TODO: add CELT, PORTAUDIO options PKGNAME=jack2 PKGVERSION=1.9.12 @@ -23,8 +23,8 @@ PKGLICENSE="GPLv3" PKGSUMMARY="JACK Audio Connection Kit version 2" PKGDOWNLOAD="https://github.com/jackaudio/jack2/releases/download/v$PKGVERSION/$PKGNAME-$PKGVERSION.tar.gz" -PKGDEPENDS="" -PKGOPTIONS="ALSA DBUS DOXYGEN OPUS READLINE SNDFILE" +PKGDEPENDS="python2:build" +PKGOPTIONS="ALSA DBUS DOXYGEN OPUS COMPLETION SAMPLERATE SNDFILE" : ${CC:=clang} : ${CFLAGS:=-O2} @@ -32,10 +32,11 @@ : ${CXXFLAGS:=-O2} : ${LDFLAGS:=} : ${ALSA:=yes} +: ${COMPLETION:=yes} : ${DBUS:=yes} : ${DOXYGEN:=yes} : ${OPUS:=yes} -: ${READLINE:=yes} +: ${SAMPLERATE:=yes} : ${SNDFILE:=yes} if [ "$ALSA" = "yes" ]; then @@ -45,13 +46,27 @@ with_alsa="--alsa=no" fi +if [ "$COMPLETION" = "yes" ]; then + PKGDEPENDS="readline $PKGDEPENDS" + with_completion="--readline=yes" +else + with_completion="--readline=no" +fi + if [ "$DBUS" = "yes" ]; then - PKGDEPENDS="dbus $PKGDEPENDS" + PKGDEPENDS="dbus expat $PKGDEPENDS" with_dbus="--dbus" else with_dbus="--dbus" fi +if [ "$DOXYGEN" = "yes" ]; then + PKGDEPENDS="doxygen:build $PKGDEPENDS" + with_doxygen="--doxygen=yes" +else + with_doxygen="--doxygen=no" +fi + if [ "$OPUS" = "yes" ]; then PKGDEPENDS="opus $PKGDEPENDS" with_opus="--opus=yes" @@ -59,18 +74,11 @@ with_opus="--opus=no" fi -if [ "$DOXYGEN" = "yes" ]; then - PKGDEPENDS="doxygen:build $PKGDEPENDS" - with_doxygen="--doxygen=yes" +if [ "$SAMPLERATE" = "yes" ]; then + PKGDEPENDS="libsamplerate $PKGDEPENDS" + with_samplerate="--samplerate=yes" else - with_doxygen="--doxygen=no" -fi - -if [ "$READLINE" = "yes" ]; then - PKGDEPENDS="readline $PKGDEPENDS" - with_readline="--readline=yes" -else - with_readline="--readline=no" + with_samplerate="--samplerate=no" fi if [ "$SNDFILE" = "yes" ]; then @@ -95,7 +103,12 @@ python2 waf configure \ --prefix= \ $with_alsa \ - $with_dbus + $with_completion \ + $with_dbus \ + $with_doxygen \ + $with_opus \ + $with_samplerate \ + $with_sndfile python2 waf build python2 waf install --destdir=$DESTDIR
--- a/audio/lame/lame.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/audio/lame/lame.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="LGPLv20" PKGSUMMARY="MP3 encoder and frame analyzer" PKGDOWNLOAD="https://downloads.sourceforge.net/project/$PKGNAME/$PKGNAME/$PKGVERSION/$PKGNAME-$PKGVERSION.tar.gz" -PKGDEPENDS="nasm:build" +PKGDEPENDS="ncurses nasm:build" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl}
--- a/audio/libcanberra/libcanberra.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/audio/libcanberra/libcanberra.sh Mon Sep 09 21:10:00 2019 +0200 @@ -20,7 +20,8 @@ PKGREVISION=1 PKGLICENSE="LGPLv21" PKGSUMMARY="implementation of XDG sound theme specification" -PKGDOWNLOAD="http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.30.tar.xz" +PKGDOWNLOAD="http://0pointer.de/lennart/projects/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz" +PKGDEPENDS="libvorbis" PKGOPTIONS="ALSA GTK PULSEAUDIO UDEV" : ${CC:=clang}
--- a/audio/libcddb/libcddb.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/audio/libcddb/libcddb.sh Mon Sep 09 21:10:00 2019 +0200 @@ -33,13 +33,15 @@ tar xvf $PKGNAME-$PKGVERSION.tar.bz2 cd $PKGNAME-$PKGVERSION + # --without-cdio: avoid cyclic dependency with libcdio. CC="$CC" \ CFLAGS="$CFLAGS" \ LDFLAGS="$LDFLAGS" \ LIBS="$LIBS" \ ./configure \ --prefix= \ - --enable-shared + --enable-shared \ + --without-cdio make make install DESTDIR=$DESTDIR find $DESTDIR -type f -name "*.la" -delete
--- a/audio/libsamplerate/libsamplerate.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/audio/libsamplerate/libsamplerate.sh Mon Sep 09 21:10:00 2019 +0200 @@ -37,7 +37,7 @@ : ${SNDFILE:=yes} if [ "$SNDFILE" = "yes" ]; then - PKGDEPENDS="sndfile $PKGDEPENDS" + PKGDEPENDS="libsndfile $PKGDEPENDS" with_sndfile="--enable-sndfile" else with_sndfile="--disable-sndfile"
--- a/audio/libsndfile/libsndfile.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/audio/libsndfile/libsndfile.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="LGPLv21 GPLv3" PKGSUMMARY="C library for loading sampled sound files" PKGDOWNLOAD="http://www.mega-nerd.com/$PKGNAME/files/$PKGNAME-$PKGVERSION.tar.gz" -PKGDEPENDS="libvorbis flac" +PKGDEPENDS="libvorbis flac sqlite:optional" PKGOPTIONS="ALSA" : ${CHOST:=$(uname -m)-linux-musl}
--- a/audio/mpd/mpd.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/audio/mpd/mpd.sh Mon Sep 09 21:10:00 2019 +0200 @@ -30,7 +30,6 @@ # TREMOR # UDISKS # UPNP -# WAVPACK # WILDMIDI # YAML (yajl) # ZZIP @@ -42,11 +41,12 @@ PKGLICENSE="GPLv20" PKGSUMMARY="daemon for playing music of various formats" PKGDOWNLOAD="https://www.musicpd.org/download/mpd/${PKGVERSION%.*}/$PKGNAME-$PKGVERSION.tar.xz" -PKGDEPENDS="meson:build" +PKGDEPENDS="libmpdclient meson:build" PKGOPTIONS="AAC ALSA AO AUDIOFILE + AVAHI BZIP2 CD CURL @@ -74,8 +74,10 @@ SQLITE SYSLOG VORBIS + WAVPACK WEBDAV XML + YAML ZLIB" PKGPROTECT="etc/mpd.conf etc/rc.d/mpd" PKGUIDS="mpd:106" @@ -90,6 +92,7 @@ : ${ALSA:=yes} : ${AO:=yes} : ${AUDIOFILE:=yes} +: ${AVAHI:=yes} : ${BZIP2:=yes} : ${CD:=cdio cdio-paranoia} : ${CURL:=yes} @@ -119,6 +122,7 @@ : ${VORBIS:=yes} : ${WEBDAV:=yes} # Note: requires XML and CURL. : ${XML:=yes} # Note: XML support through expat dependency. +: ${YAML:=yes} # Note: YAML support through yajl dependency. : ${ZLIB:=yes} if [ "$AAC" = "yes" ]; then @@ -149,6 +153,13 @@ with_audiofile="-D audiofile=disabled" fi +if [ "$AVAHI" = "yes" ]; then + PKGDEPENDS="avahi $PKGDEPENDS" + with_avahi="-D zeroconf=avahi" +else + with_avahi="-D zeroconf=disabled" +fi + if [ "$BZIP2" = "yes" ]; then PKGDEPENDS="bzip2 $PKGDEPENDS" with_bzip2="-D bzip2=enabled" @@ -356,6 +367,13 @@ with_vorbis="-D vorbis=disabled" fi +if [ "$WAVPACK" = "yes" ]; then + PKGDEPENDS="wavpack $PKGDEPENDS" + with_wavpack="-D wavpack=enabled" +else + with_wavpack="-D wavpack=disabled" +fi + if [ "$WEBDAV" = "yes" ]; then with_webdav="-D webdav=enabled" else @@ -369,6 +387,13 @@ with_xml="-D expat=disabled" fi +if [ "$YAML" = "yes" ]; then + PKGDEPENDS="yaml $PKGDEPENDS" + with_yaml="-D yajl=enabled" +else + with_yaml="-D yajl=disabled" +fi + if [ "$ZLIB" = "yes" ]; then PKGDEPENDS="zlib $PKGDEPENDS" with_zlib="-D zlib=enabled" @@ -396,6 +421,7 @@ $with_alsa \ $with_ao \ $with_audiofile \ + $with_avahi \ $with_bzip2 \ $with_cdio \ $wiht_cdio_paranoia \ @@ -426,8 +452,10 @@ $with_sqlite \ $with_syslog \ $with_vorbis \ + $with_wavpack \ $with_webdav \ $with_xml \ + $with_yaml \ $with_zlib ninja -C build DESTDIR=$DESTDIR ninja -C build install
--- a/audio/ncmpc/ncmpc.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/audio/ncmpc/ncmpc.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="GPLv20" PKGSUMMARY="curses client for the Music Player Daemon" PKGDOWNLOAD="https://www.musicpd.org/download/ncmpc/0/$PKGNAME-$PKGVERSION.tar.xz" -PKGDEPENDS="meson:build ncurses" +PKGDEPENDS="libmpdclient meson:build ncurses" PKGOPTIONS="COLORS LOCALE MOUSE NLS REGEX" : ${CC:=clang}
--- a/audio/pulseaudio/pulseaudio.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/audio/pulseaudio/pulseaudio.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,7 +21,22 @@ PKGLICENSE="LGPLv21+" PKGSUMMARY="general-purpose sound server" PKGDOWNLOAD="https://www.freedesktop.org/software/$PKGNAME/releases/$PKGNAME-$PKGVERSION.tar.xz" -PKGOPTIONS="ALSA AVAHI BLUETOOTH GTK IPV6 JACK NLS OSS SSL UDEV X" +PKGDEPENDS="gdbm glib libtool libsndfile" +PKGOPTIONS="ALSA + AVAHI + BLUETOOTH + CAP + DBUS + GTK + IPV6 + JACK + NLS + OSS + SOXR + SPEEX + SSL + UDEV + X" PKGUIDS="pulse:102" PKGGIDS="pulse:102 pulse-rt:103 pulse-access:104" @@ -34,11 +49,15 @@ : ${ALSA:=yes} : ${AVAHI:=yes} : ${BLUETOOTH:=no} # TODO: set to on once sbc is there (for bluez) +: ${CAP:=yes} +: ${DBUS:=yes} : ${GTK:=yes} : ${IPV6:=yes} : ${JACK:=yes} : ${NLS:=yes} : ${OSS:=yes} +: ${SOXR:=yes} +: ${SPEEX:=yes} : ${SSL:=yes} : ${UDEV:=yes} : ${X:=yes} @@ -64,6 +83,20 @@ with_bluetooth="--disable-bluez5" fi +if [ "$CAP" = "yes" ]; then + PKGDEPENDS="libcap $PKGDEPENDS" + with_cap="--with-caps" +else + with_cap="--without-caps" +fi + +if [ "$DBUS" = "yes" ]; then + PKGDEPENDS="dbus $PKGDEPENDS" + with_dbus="--enable-dbus" +else + with_dbus="--disable-dbus" +fi + if [ "$GTK" = "yes" ]; then PKGDEPENDS="gtk at-spi2-atk $PKGDEPENDS" with_gtk="--enable-gtk3" @@ -97,6 +130,20 @@ with_oss="--disable-oss-output --disable-oss-wrapper" fi +if [ "$SOXR" = "yes" ]; then + PKGDEPENDS="soxr $PKGDEPENDS" + with_soxr="--with-soxr" +else + with_soxr="--without-soxr" +fi + +if [ "$SPEEX" = "yes" ]; then + PKGDEPENDS="speex $PKGDEPENDS" + with_speex="--with-speex" +else + with_speex="--without-speex" +fi + if [ "$SSL" = "yes" ]; then PKGDEPENDS="libressl $PKGDEPENDS" with_ssl="--enable-openssl" @@ -136,11 +183,15 @@ $with_alsa \ $with_avahi \ $with_bluetooth \ + $with_cap \ + $with_dbus \ $with_gtk \ $with_ipv6 \ $with_jack \ $with_nls \ $with_oss \ + $with_soxr \ + $with_speex \ $with_ssl \ $with_udev \ $with_x
--- a/compression/libarchive/libarchive.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/compression/libarchive/libarchive.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="BSD" PKGSUMMARY="multi-format archive and compression library" PKGDOWNLOAD="http://www.libarchive.org/downloads/$PKGNAME-$PKGVERSION.tar.gz" -PKGOPTIONS="ACL BZIP2 LZ4 LZMA LZO SSL ZLIB ZSTD XML" +PKGOPTIONS="ACL BZIP2 LZ4 LZMA LZO SSL XML ZLIB ZSTD" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl} @@ -97,6 +97,13 @@ with_ssl="--without-openssl" fi +if [ "$ZLIB" = "yes" ]; then + PKGDEPENDS="zlib $PKGDEPENDS" + with_zlib="--with-zlib" +else + with_zlib="--without-zlib" +fi + if [ "$ZSTD" = "yes" ]; then PKGDEPENDS="zstd $PKGDEPENDS" with_zstd="--with-zstd" @@ -133,8 +140,8 @@ $with_lzo \ $with_nettle \ $with_ssl \ + $with_zlib \ $with_zstd - make make install DESTDIR=$DESTDIR find $DESTDIR -type f -name "*.la" -delete
--- a/core/bc/bc.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/core/bc/bc.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="GPLv3+" PKGSUMMARY="GNU arbitrary precision numeric processing language" PKGDOWNLOAD="https://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz" -PKGDEPENDS="ed texinfo readline" +PKGDEPENDS="ed flex ncurses texinfo readline" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl}
--- a/core/coreutils/coreutils.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/core/coreutils/coreutils.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,6 +21,7 @@ PKGLICENSE="GPLv3+" PKGSUMMARY="GNU core utilities" PKGDOWNLOAD="https://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz" +PKGDEPENDS="acl attr libcap procps" PKGOPTIONS="GMP NLS SSL" : ${CHOST:=$(uname -m)-linux-musl}
--- a/core/cpio/cpio.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/core/cpio/cpio.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,6 +21,7 @@ PKGLICENSE="GPLv3" PKGSUMMARY="tool to copy files into/out of a cpio or tar archive" PKGDOWNLOAD="https://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz" +PKGDEPENDS="acl" PKGOPTIONS="NLS" : ${CHOST:=$(uname -m)-linux-musl}
--- a/core/e2fsprogs/e2fsprogs.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/core/e2fsprogs/e2fsprogs.sh Mon Sep 09 21:10:00 2019 +0200 @@ -22,7 +22,7 @@ PKGSUMMARY="ext2/3/4 filesystem utilities" PKGDOWNLOAD="https://sourceforge.net/projects/e2fsprogs/files/$PKGNAME/v$PKGVERSION/$PKGNAME-$PKGVERSION.tar.gz" PKGDEPENDS="util-linux" -PKGOPTIONS="NLS" +PKGOPTIONS="FUSE NLS" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl} @@ -30,8 +30,16 @@ : ${CFLAGS:=-O2} : ${LDFLAGS:=} : ${LIBS:=} +: ${FUSE:=yes} : ${NLS:=yes} +if [ "$FUSE" = "yes" ]; then + PKGDEPENDS="fuse2 $PKGDEPENDS" + with_fuse="--enable-fuse2fs" +else + with_fuse="--disable-fuse2fs" +fi + if [ "$NLS" = "yes" ]; then PKGDEPENDS="gettext $PKGDEPENDS" with_nls="--enable-nls" @@ -61,6 +69,7 @@ --disable-libblkid \ --enable-elf-shlibs \ --with-crond-dir=/etc/cron.d \ + $with_fuse $with_nls make make install install-libs DESTDIR=$DESTDIR
--- a/core/eudev/eudev.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/core/eudev/eudev.sh Mon Sep 09 21:10:00 2019 +0200 @@ -15,6 +15,8 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # +# TODO: enable SELINUX support + PKGNAME=eudev PKGVERSION=3.2.7 PKGREVISION=1 @@ -22,6 +24,7 @@ PKGSUMMARY="enhanced userland device daemon" PKGDOWNLOAD="https://github.com/gentoo/eudev/archive/v$PKGVERSION.tar.gz" PKGDEPENDS="util-linux" +PKGOPTIONS="KMOD" PKGPROTECT="/etc/udev/udev.conf" : ${CHOST:=$(uname -m)-linux-musl} @@ -30,6 +33,14 @@ : ${CFLAGS:=-O2} : ${LDFLAGS:=} : ${LIBS:=} +: ${KMOD:=yes} + +if [ "$KMOD" = "yes" ]; then + PKGDEPENDS="kmod $PKGDEPENDS" + with_kmod="--enable-kmod" +else + with_kmod="--disable-kmod" +fi build() { @@ -48,7 +59,8 @@ --prefix= \ --sbindir=/bin \ --disable-selinux \ - --enable-shared + --enable-shared \ + $with_kmod make make install DESTDIR=$DESTDIR find $DESTDIR -type f -name "*.la" -delete
--- a/core/gawk/gawk.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/core/gawk/gawk.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,6 +21,7 @@ PKGLICENSE="GPLv3" PKGSUMMARY="GNU awk" PKGDOWNLOAD="https://ftp.gnu.org/pub/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz" +PKGDEPENDS="gmp mpfr readline" PKGOPTIONS="NLS" : ${CHOST:=$(uname -m)-linux-musl} @@ -29,6 +30,7 @@ : ${CFLAGS:=-O2} : ${LDFLAGS:=} : ${LIBS:=} +: ${NLS:=yes} if [ "$NLS" = "yes" ]; then PKGDEPENDS="gettext $PKGDEPENDS"
--- a/core/less/less.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/core/less/less.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="GPLv3+ CUSTOM" PKGSUMMARY="program for viewing text files" PKGDOWNLOAD="http://www.greenwoodsoftware.com/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz" -PKGDEPENDS="pcre" +PKGDEPENDS="ncurses pcre" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl}
--- a/core/lvm2/lvm2.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/core/lvm2/lvm2.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,8 +21,8 @@ PKGLICENSE="GPLv2 LGPLv21" PKGSUMMARY="LVM utilities" PKGDOWNLOAD="https://mirrors.kernel.org/sourceware/$PKGNAME/LVM2.$PKGVERSION.tgz" -PKGDEPENDS="libaio" -PKGOPTIONS="READLINE" +PKGDEPENDS="eudev libaio util-linux" +PKGOPTIONS="COMPLETION" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl} @@ -30,13 +30,13 @@ : ${CFLAGS:=-O2} : ${LDFLAGS:=} : ${LIBS:=} -: ${READLINE:=yes} +: ${COMPLETION:=yes} -if [ "$READLINE" = "yes" ]; then +if [ "$COMPLETION" = "yes" ]; then PKGDEPENDS="readline $PKGDEPENDS" - with_readline="--enable-readline" + with_completion="--enable-readline" else - with_readline="--disable-readline" + with_completion="--disable-readline" fi build() @@ -62,7 +62,7 @@ --enable-pkgconfig \ --enable-udev_rules \ --enable-udev_sync \ - $with_readline + $with_completion make make install DESTDIR=$DESTDIR
--- a/core/pciutils/pciutils.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/core/pciutils/pciutils.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,14 +21,43 @@ PKGLICENSE="GPLv20" PKGSUMMARY="portable access to PCI bus configuration" PKGDOWNLOAD="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/$PKGNAME-$PKGVERSION.tar.gz" -PKGOPTIONS="DNS ZLIB" +PKGOPTIONS="DNS KMOD ZLIB UDEV" : ${CC:=clang} : ${CFLAGS:=-O2} : ${LDFLAGS:=} : ${DNS:=yes} +: ${KMOD:=yes} +: ${UDEV:=yes} : ${ZLIB:=yes} +if [ "$DNS" = "yes" ]; then + with_dns="DNS=yes" +else + with_dns="DNS=no" +fi + +if [ "$KMOD" = "yes" ]; then + PKGDEPENDS="kmod $PKGDEPENDS" + with_kmod="LIBKMOD=yes" +else + with_kmod="LIBKMOD=no" +fi + +if [ "$UDEV" = "yes" ]; then + PKGDEPENDS="udev $PKGDEPENDS" + with_udev="HWDB=yes" +else + with_udev="HWDB=no" +fi + +if [ "$ZLIB" = "yes" ]; then + PKGDEPENDS="zlib $PKGDEPENDS" + with_zlib="ZLIB=yes" +else + with_zlib="ZLIB=no" +fi + build() { rm -rf $PKGNAME-$PKGVERSION @@ -39,12 +68,14 @@ CC="$CC" \ CFLAGS="$CFLAGS" \ LDFLAGS="$LDFLAGS" \ - ZLIB="$ZLIB" \ - DNS="$DNS" \ PREFIX= \ SBINDIR=/bin \ MANDIR=/share/man \ DESTDIR=$DESTDIR \ + $with_dns \ + $with_kmod \ + $with_udev \ + $with_zlib \ all install cd ..
--- a/crypto/gcr/gcr.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/crypto/gcr/gcr.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="LGPLv20" PKGSUMMARY="library for displaying certificates and crypto UI" PKGDOWNLOAD="https://download.gnome.org/sources/$PKGNAME/${PKGVERSION%.*}/$PKGNAME-$PKGVERSION.tar.xz" -PKGDEPENDS="glib" +PKGDEPENDS="glib libgcrypt" PKGOPTIONS="GTK INTROSPECTION NLS VALA" : ${CHOST:=$(uname -m)-linux-musl}
--- a/crypto/gnutls/gnutls.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/crypto/gnutls/gnutls.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,7 +21,8 @@ PKGLICENSE="GPLv3 LGPLv21" PKGSUMMARY="SSL/TLS implementation" PKGDOWNLOAD="https://www.gnupg.org/ftp/gcrypt/$PKGNAME/v3.6/$PKGNAME-$PKGVERSION.tar.xz" -PKGDEPENDS="nettle libtasn1 p11-kit" +PKGDEPENDS="gmp nettle libtasn1 libunistring p11-kit" +PKGOPTIONS="IDN2 NLS" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl} @@ -31,6 +32,22 @@ : ${CXXFLAGS:=-O2} : ${LDFLAGS:=} : ${LIBS:=} +: ${IDN2:=yes} +: ${NLS:=yes} + +if [ "$IDN2" = "yes" ]; then + PKGDEPENDS="libidn2 $PKGDEPENDS" + with_idn2="--with-idn" +else + with_idn2="--without-idn" +fi + +if [ "$NLS" = "yes" ]; then + PKGDEPENDS="gettext $PKGDEPENDS" + with_nls="--enable-nls" +else + with_nls="--disable-nls" +fi build() { @@ -47,7 +64,10 @@ ./configure \ --build=$CBUILD \ --host=$CHOST \ - --prefix= + --prefix= \ + --without-included-unistring \ + $with_idn2 \ + $with_nls make make install DESTDIR=$DESTDIR find $DESTDIR -type f -name "*.la" -delete
--- a/crypto/libgcrypt/libgcrypt.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/crypto/libgcrypt/libgcrypt.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,6 +21,7 @@ PKGLICENSE="GPLv2 LGPLv21" PKGSUMMARY="general purpose crypto library from GnuPG" PKGDOWNLOAD="https://www.gnupg.org/ftp/gcrypt/$PKGNAME/$PKGNAME-$PKGVERSION.tar.bz2" +PKGDEPENDS="libgpg-error" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl}
--- a/crypto/p11-kit/p11-kit.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/crypto/p11-kit/p11-kit.sh Mon Sep 09 21:10:00 2019 +0200 @@ -22,6 +22,7 @@ PKGSUMMARY="PKCS#11 library" PKGDOWNLOAD="https://github.com/p11-glue/p11-kit/releases/download/$PKGVERSION/$PKGNAME-$PKGVERSION.tar.gz" PKGDEPENDS="libtasn1 libffi" +PKGOPTIONS="NLS" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl} @@ -29,6 +30,14 @@ : ${CFLAGS:=-O2} : ${LDFLAGS:=} : ${LIBS:=} +: ${NLS:=yes} + +if [ "$NLS" = "yes" ]; then + PKGDEPENDS="gettext $PKGDEPENDS" + with_nls="--enable-nls" +else + with_nls="--disable-nls" +fi build() { @@ -45,7 +54,8 @@ --host=$CHOST \ --prefix= \ --without-systemd \ - --with-trust-paths=/etc/pki/anchors + --with-trust-paths=/etc/pki/anchors \ + $with_nls make make install DESTDIR=$DESTDIR find $DESTDIR -type f -name "*.la" -delete
--- a/databases/gdbm/gdbm.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/databases/gdbm/gdbm.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,6 +21,8 @@ PKGLICENSE="GPLv3+" PKGSUMMARY="GNU database library" PKGDOWNLOAD="http://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz" +PKGDEPENDS="" +PKGOPTIONS="COMPLETION NLS" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl} @@ -28,6 +30,22 @@ : ${CFLAGS:=-O2} : ${LDFLAGS:=} : ${LIBS:=} +: ${COMPLETION:=yes} +: ${NLS:=yes} + +if [ "$COMPLETION" = "yes" ]; then + PKGDEPENDS="readline $PKGDEPENDS" + with_completion="--with-readline" +else + with_completion="--without-readline" +fi + +if [ "$NLS" = "yes" ]; then + PKGDEPENDS="gettext $PKGDEPENDS" + with_nls="--enable-nls" +else + with_nls="--disable-nls" +fi build() { @@ -45,7 +63,9 @@ --build=$CBUILD \ --host=$CHOST \ --prefix= \ - --enable-libgdbm-compat + --enable-libgdbm-compat \ + $with_completion \ + $with_nls make make install DESTDIR=$DESTDIR find $DESTDIR -type f -name "*.la" -delete
--- a/dev/binutils/binutils.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/dev/binutils/binutils.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="GPLv3" PKGSUMMARY="programs to manipulate binary and object files" PKGDOWNLOAD="https://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz" -PKGDEPENDS="zlib" +PKGDEPENDS="flex zlib" PKGOPTIONS="GDB NLS" : ${CHOST:=$(uname -m)-linux-musl}
--- a/dev/cmake/cmake.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/dev/cmake/cmake.sh Mon Sep 09 21:10:00 2019 +0200 @@ -27,6 +27,7 @@ jsoncpp libarchive libuv + ncurses rhash xz zlib
--- a/dev/elfutils/elfutils.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/dev/elfutils/elfutils.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="GPLv2+ GPLv3+ LGPLv3+" PKGSUMMARY="utilities to inspect ELF files" PKGDOWNLOAD="https://sourceware.org/$PKGNAME/ftp/$PKGVERSION/$PKGNAME-$PKGVERSION.tar.bz2" -PKGDEPENDS="zlib musl-fts musl-obstack" +PKGDEPENDS="argp-standalone bzip2 gcc musl-fts musl-obstack xz zlib" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl}
--- a/dev/flex/flex.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/dev/flex/flex.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,6 +21,8 @@ PKGLICENSE="CUSTOM" PKGSUMMARY="the fast lexical analyzer" PKGDOWNLOAD="https://github.com/westes/flex/releases/download/v$PKGVERSION/$PKGNAME-$PKGVERSION.tar.gz" +PKGDEPENDS="" +PKGOPTIONS="NLS" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl} @@ -30,6 +32,14 @@ : ${CXXFLAGS:=-O2} : ${LDFLAGS:=} : ${LIBS:=} +: ${NLS:=yes} + +if [ "$NLS" = "yes" ]; then + PKGDEPENDS="gettext $PKGDEPENDS" + with_nls="--enable-nls" +else + with_nls="--disable-nls" +fi build() { @@ -47,7 +57,8 @@ --build=$CBUILD \ --host=$CHOST \ --prefix= \ - --enable-shared + --enable-shared \ + $with_nls make make install DESTDIR=$DESTDIR find $DESTDIR -type f -name "*.la" -delete
--- a/dev/gcc/gcc.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/dev/gcc/gcc.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="GPLv3+" PKGSUMMARY="GNU compiler collections" PKGDOWNLOAD="ftp://gcc.gnu.org/pub/gcc/releases/$PKGNAME-$PKGVERSION/$PKGNAME-$PKGVERSION.tar.xz" -PKGDEPENDS="zlib gmp mpfr mpc" +PKGDEPENDS="gmp isl mpc mpfr zlib" PKGOPTIONS="NLS" : ${CHOST:=$(uname -m)-linux-musl}
--- a/dev/gobject-introspection/gobject-introspection.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/dev/gobject-introspection/gobject-introspection.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="GPL" PKGSUMMARY="introspection system for GObject-based libraries" PKGDOWNLOAD="https://download.gnome.org/sources/$PKGNAME/1.60/$PKGNAME-$PKGVERSION.tar.xz" -PKGDEPENDS="meson:build" +PKGDEPENDS="glib meson:build" : ${CC:=clang} : ${CFLAGS:=-O2}
--- a/dev/lldb/lldb.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/dev/lldb/lldb.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,12 +21,37 @@ PKGLICENSE="MIT CUSTOM" PKGSUMMARY="LLVM debugger" PKGDOWNLOAD="https://github.com/llvm/llvm-project/releases/download/llvmorg-$PKGVERSION/$PKGNAME-$PKGVERSION.src.tar.xz" -PKGDEPENDS="cmake:build swig:build libffi" +PKGDEPENDS="cmake:build swig:build libffi libxml2" +PKGOPTIONS="COMPLETION NCURSES PYTHON" : ${CC:=clang} : ${CFLAGS:=-O2} : ${CXX:=clang++} : ${CXXFLAGS:=-O2} +: ${COMPLETION:=yes} +: ${NCURSES:=yes} +: ${PYTHON:=yes} + +if [ "$COMPLETION" = "yes" ]; then + PKGDEPENDS="libedit $PKGDEPENDS" + with_completion="-DLLDB_DISABLE_LIBEDIT=Off" +else + with_completion="-DLLDB_DISABLE_LIBEDIT=On" +fi + +if [ "$NCURSES" = "yes" ]; then + PKGDEPENDS="ncurses $PKGDEPENDS" + with_ncurses="-DLLDB_DISABLE_CURSES=Off" +else + with_ncurses="-DLLDB_DISABLE_CURSES=On" +fi + +if [ "$PYTHON" = "yes" ]; then + PKGDEPENDS="python $PKGDEPENDS" + with_python="-DLLDB_DISABLE_PYTHON=Off" +else + with_python="-DLLDB_DISABLE_PYTHON=On" +fi build() { @@ -43,7 +68,10 @@ -DCMAKE_C_FLAGS="$CFLAGS" \ -DCMAKE_INSTALL_PREFIX= \ -DLLVM_ENABLE_EH=On \ - -DLLVM_ENABLE_RTTI=On + -DLLVM_ENABLE_RTTI=On \ + $with_completion \ + $with_ncurses \ + $with_python make make DESTDIR=$DESTDIR install cd ..
--- a/dev/patch/patch.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/dev/patch/patch.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,6 +21,7 @@ PKGLICENSE="GPLv3+" PKGSUMMARY="GNU tool to patch files" PKGDOWNLOAD="https://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz" +PKGDEPENDS="attr" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl}
--- a/gnu/guile/guile.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/gnu/guile/guile.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="GPLv30 LGPLv30" PKGSUMMARY="GNU implementation of the Scheme programming language" PKGDOWNLOAD="https://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz" -PKGDEPENDS="libffi libunistring" +PKGDEPENDS="gc gmp ncurses libffi libtool libunistring readline" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl}
--- a/gnu/parted/parted.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/gnu/parted/parted.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,8 +21,8 @@ PKGLICENSE="GPLv30" PKGSUMMARY="GNU program for manipulating partition tables" PKGDOWNLOAD="https://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz" -PKGDEPENDS="lvm2 util-linux" -PKGOPTIONS="NLS" +PKGDEPENDS="lvm2 ncurses util-linux" +PKGOPTIONS="COMPLETION NLS" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl} @@ -30,8 +30,16 @@ : ${CFLAGS:=-O2} : ${LDFLAGS:=} : ${LIBS:=} +: ${COMPLETION:=yes} : ${NLS:=yes} +if [ "$COMPLETION" = "yes" ]; then + PKGDEPENDS="readline $PKGDEPENDS" + with_completion="--with-readline" +else + with_completion="--without-readline" +fi + if [ "$NLS" = "yes" ]; then PKGDEPENDS="gettext $PKGDEPENDS" with_nls="--enable-nls" @@ -55,6 +63,7 @@ --host=$CHOST \ --prefix= \ --sbindir=/bin \ + $with_completion \ $with_nls make make install DESTDIR=$DESTDIR
--- a/graphics/cairo/cairo.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/graphics/cairo/cairo.sh Mon Sep 09 21:10:00 2019 +0200 @@ -116,7 +116,7 @@ fi if [ "$X" = "yes" ]; then - PKGDEPENDS="libxrender libxext libx11 libxcb" + PKGDEPENDS="libxrender libxext libx11 libxcb $PKGDEPENDS" with_x="--enable-xlib $with_x" with_x="--enable-xlib-xrender $with_x" with_x="--enable-xcb=yes $with_x"
--- a/graphics/gdk-pixbuf/gdk-pixbuf.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/graphics/gdk-pixbuf/gdk-pixbuf.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="LGPLv21" PKGSUMMARY="image loading library" PKGDOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.38/$PKGNAME-$PKGVERSION.tar.xz" -PKGDEPENDS="meson:build shared-mime-info" +PKGDEPENDS="glib meson:build shared-mime-info" PKGOPTIONS="JASPER JPEG PNG TIFF X" : ${CC:=clang} @@ -29,7 +29,7 @@ : ${CXX:=clang++} : ${CXXFLAGS:=-O2} : ${LDFLAGS:=} -: ${JASPER:=no} # TODO: set to yes once available +: ${JASPER:=yes} : ${JPEG:=yes} : ${PNG:=yes} : ${TIFF:=yes}
--- a/graphics/glbinding/glbinding.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/graphics/glbinding/glbinding.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="MIT" PKGSUMMARY="C++ bindings for the OpenGL API" PKGDOWNLOAD="https://github.com/cginternals/glbinding/archive/v$PKGVERSION.tar.gz" -PKGDEPENDS="cmake:build" +PKGDEPENDS="cmake:build qtbase:optional" PKGOPTIONS="DOXYGEN EXAMPLES TOOLS" : ${CC:=clang}
--- a/graphics/glew/glew.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/graphics/glew/glew.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="BSD3CLAUSE MIT CUSTOM" PKGSUMMARY="OpenGL extension wrangler library" PKGDOWNLOAD="https://sourceforge.net/projects/glew/files/$PKGNAME/$PKGVERSION/$PKGNAME-$PKGVERSION.tgz" -PKGDEPENDS="mesa" +PKGDEPENDS="mesa libx11" : ${CC:=clang} : ${CFLAGS:=-O2 -fPIC}
--- a/graphics/glu/glu.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/graphics/glu/glu.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,6 +21,7 @@ PKGLICENSE="CUSTOM" PKGSUMMARY="OpenGL utility library" PKGDOWNLOAD="ftp://ftp.freedesktop.org/pub/mesa/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz" +PKGDEPENDS="mesa" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl}
--- a/graphics/gtk/gtk.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/graphics/gtk/gtk.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="LGPLv20" PKGSUMMARY="multiplatform toolki" PKGDOWNLOAD="https://download.gnome.org/sources/gtk+/3.24/gtk+-$PKGVERSION.tar.xz" -PKGDEPENDS="cairo libepoxy libxkbcommon" +PKGDEPENDS="atk gdk-pixbuf glib cairo libepoxy libxkbcommon" PKGOPTIONS="CUPS NLS WAYLAND X" : ${CC:=clang}
--- a/graphics/gtk2/gtk2.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/graphics/gtk2/gtk2.sh Mon Sep 09 21:10:00 2019 +0200 @@ -22,9 +22,10 @@ PKGSUMMARY="multiplatform toolkit" PKGDOWNLOAD="https://download.gnome.org/sources/gtk+/2.24/gtk+-$PKGVERSION.tar.xz" PKGDEPENDS="atk + cairo fontconfig + freetype gdk-pixbuf - pango glib libx11 libxcomposite @@ -34,7 +35,9 @@ libxfixes libxi libxinerama - libxrandr" + libxrandr + libxrender + pango" PKGOPTIONS="CUPS NLS" : ${CC:=clang}
--- a/graphics/imlib2/imlib2.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/graphics/imlib2/imlib2.sh Mon Sep 09 21:10:00 2019 +0200 @@ -22,7 +22,7 @@ PKGSUMMARY="image loading library" PKGDOWNLOAD="https://sourceforge.net/projects/enlightenment/files/imlib2-src/$PKGVERSION/$PKGNAME-$PKGVERSION.tar.bz2" PKGDEPENDS="freetype" -PKGOPTIONS="BZIP2 GIF ID3 PNG TIFF X ZLIB" +PKGOPTIONS="BZIP2 GIF ID3 JPEG PNG TIFF X ZLIB" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl} @@ -33,6 +33,7 @@ : ${BZIP2:=yes} : ${GIF:=yes} # TODO: allow "libungif" as optional value : ${ID3:=yes} +: ${JPEG:=yes} : ${PNG:=yes} : ${TIFF:=yes} : ${X:=yes} @@ -52,6 +53,13 @@ with_gif="--without-gif" fi +if [ "$JPEG" = "yes" ]; then + PKGDEPENDS="libjpeg-turbo $PKGDEPENDS" + with_jpeg="--with-jpeg" +else + with_jpeg="--without-jpeg" +fi + if [ "$ID3" = "yes" ]; then PKGDEPENDS="libid3tag $PKGDEPENDS" with_id3="--with-id3" @@ -67,7 +75,7 @@ fi if [ "$TIFF" = "yes" ]; then - PKGDEPENDS="tiff $PKGDEPENDS" + PKGDEPENDS="libtiff $PKGDEPENDS" with_tiff="--with-tiff" else with_tiff="--without-tiff" @@ -80,6 +88,13 @@ with_x="--without-x11" fi +if [ "$ZLIB" = "yes" ]; then + PKGDEPENDS="zlib $PKGDEPENDS" + with_zlib="--with-zlib" +else + with_zlib="--without-zlib" +fi + build() { rm -rf $PKGNAME-$PKGVERSION @@ -96,6 +111,7 @@ --prefix= \ $with_bzip2 \ $with_gif \ + $with_jpeg \ $with_id3 \ $with_png \ $with_tiff \
--- a/graphics/libdrm/libdrm.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/graphics/libdrm/libdrm.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,6 +21,7 @@ PKGLICENSE="MIT" PKGSUMMARY="interface to kernel DRM" PKGDOWNLOAD="https://dri.freedesktop.org/$PKGNAME/$PKGNAME-$PKGVERSION.tar.bz2" +PKGDEPENDS="libpciaccess" PKGOPTIONS="UDEV KMS" : ${CHOST:=$(uname -m)-linux-musl}
--- a/graphics/libpng/libpng.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/graphics/libpng/libpng.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,6 +21,7 @@ PKGLICENSE="CUSTOM" PKGSUMMARY="library for PNG image files" PKGDOWNLOAD="https://downloads.sourceforge.net/sourceforge/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz" +PKGDEPENDS="zlib" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl}
--- a/graphics/libtiff/libtiff.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/graphics/libtiff/libtiff.sh Mon Sep 09 21:10:00 2019 +0200 @@ -18,10 +18,10 @@ PKGNAME=libtiff PKGVERSION=4.0.10 PKGREVISION=1 -PKGLICENSE="one of README.licenses.md or CUSTOM" -PKGSUMMARY="short summary" +PKGLICENSE="CUSTOM" +PKGSUMMARY="TIFF libraries and utilities" PKGDOWNLOAD="https://download.osgeo.org/$PKGNAME/tiff-$PKGVERSION.tar.gz" -PKGOPTIONS="JPEG LZMA ZLIB ZSTD" +PKGOPTIONS="JPEG LZMA WEBP ZLIB ZSTD" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl} @@ -33,6 +33,7 @@ : ${LIBS:=} : ${JPEG:=yes} : ${LZMA:=yes} +: ${WEBP:=yes} : ${ZLIB:=yes} : ${ZSTD:=yes} @@ -50,6 +51,13 @@ with_lzma="--disable-lzma" fi +if [ "$WEBP" = "yes" ]; then + PKGDEPENDS="libwebp $PKGDEPENDS" + with_webp="--enable-webp" +else + with_webp="--disable-webp" +fi + if [ "$ZLIB" = "yes" ]; then PKGDEPENDS="zlib $PKGDEPENDS" with_zlib="--enable-zlib" @@ -84,6 +92,7 @@ --enable-shared \ $with_jpeg \ $with_lzma \ + $with_webp \ $with_zlib \ $with_zstd make
--- a/graphics/openjpeg/openjpeg.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/graphics/openjpeg/openjpeg.sh Mon Sep 09 21:10:00 2019 +0200 @@ -15,13 +15,15 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # +# TODO: check if we can make libpng/libtiff/zlib optional + PKGNAME=openjpeg PKGVERSION=2.3.1 PKGREVISION=1 PKGLICENSE="BSD2CLAUSE" PKGSUMMARY="opensource JPEG 2000 codec written in C" PKGDOWNLOAD="https://github.com/uclouvain/$PKGNAME/archive/v$PKGVERSION.tar.gz" -PKGDEPENDS="cmake:build" +PKGDEPENDS="cmake:build libpng libtiff zlib" : ${CC:=clang} : ${CFLAGS:=-O2}
--- a/irc/irssi/irssi.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/irc/irssi/irssi.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="GPLv2+" PKGSUMMARY="command line IRC client" PKGDOWNLOAD="https://github.com/irssi/irssi/releases/download/$PKGVERSION/$PKGNAME-$PKGVERSION.tar.xz" -PKGDEPENDS="glib" +PKGDEPENDS="glib libressl ncurses" PKGOPTIONS="PERL TRUECOLOR" PKGPROTECT="etc/irssi.conf"
--- a/lang/mozjs52/mozjs52.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/lang/mozjs52/mozjs52.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="MPLv20" PKGSUMMARY="Mozilla Javascript engine also know as SpiderMonkey" PKGDOWNLOAD="http://releases.mozilla.org/pub/firefox/releases/${PKGVERSION}esr/source/firefox-${PKGVERSION}esr.source.tar.xz" -PKGDEPENDS="bash:build python2:build libffi icu zlib" +PKGDEPENDS="bash:build python2:build libffi nspr icu zlib" : ${CC:=clang} : ${CXX:=clang++}
--- a/lib/boost/boost.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/lib/boost/boost.sh Mon Sep 09 21:10:00 2019 +0200 @@ -22,7 +22,7 @@ PKGLICENSE="peer-reviewed C++ libraries" PKGSUMMARY="short summary" PKGDOWNLOAD="https://dl.bintray.com/boostorg/release/$PKGVERSION/source/${PKGNAME}_$_VERSION.tar.gz" -PKGDEPENDS="" +PKGDEPENDS="bzip2 xz zlib zstd " PKGOPTIONS="ICU PYTHON" : ${CXX:=clang++}
--- a/lib/dbus-glib/dbus-glib.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/lib/dbus-glib/dbus-glib.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,6 +21,7 @@ PKGLICENSE="GPLv2" PKGSUMMARY="D-Bus bindings for glib" PKGDOWNLOAD="https://dbus.freedesktop.org/releases/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz" +PKGDEPENDS="dbus expat glib" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl}
--- a/lib/glib/glib.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/lib/glib/glib.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="LGPLv21" PKGSUMMARY="general purpose low level C library" PKGDOWNLOAD="https://download.gnome.org/sources/$PKGNAME/2.60/$PKGNAME-$PKGVERSION.tar.xz" -PKGDEPENDS="meson pcre zlib" +PKGDEPENDS="libffi meson pcre zlib" PKGOPTIONS="MOUNT NLS SELINUX" : ${CC:=clang}
--- a/lib/gvfs/gvfs.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/lib/gvfs/gvfs.sh Mon Sep 09 21:10:00 2019 +0200 @@ -23,7 +23,7 @@ PKGLICENSE="LGPLv20" PKGSUMMARY="GNOME virtual file system" PKGDOWNLOAD="https://download.gnome.org/sources/$PKGNAME/${PKGVERSION%.*}/$PKGNAME-$PKGVERSION.tar.xz" -PKGDEPENDS="meson:build" +PKGDEPENDS="glib meson:build" PKGOPTIONS="ADMIN AFP BLURAY @@ -31,6 +31,7 @@ FUSE GCR HTTP + KEYRING LIBARCHIVE SSH UDEV" @@ -47,6 +48,7 @@ : ${FUSE:=yes} : ${GCR:=yes} : ${HTTP:=yes} +: ${KEYRING:=yes} : ${LIBARCHIVE:=yes} : ${SSH:=yes} : ${UDEV:=yes} @@ -79,7 +81,7 @@ fi if [ "$FUSE" = "yes" ]; then - PKGDEPENDS="fuse $PKGDEPENDS" + PKGDEPENDS="fuse2 $PKGDEPENDS" with_fuse="-D fuse=true" else with_fuse="-D fuse=false" @@ -93,12 +95,19 @@ fi if [ "$HTTP" = "yes" ]; then - PKGDEPENDS="libsoup $PKGDEPENDS" + PKGDEPENDS="libsoup libxml2 $PKGDEPENDS" with_http="-D http=true" else with_http="-D http=false" fi +if [ "$KEYRING" = "yes" ]; then + PKGDEPENDS="libsecret $PKGDEPENDS" + with_keyring="-D keyring=true" +else + with_keyring="-D keyring=false" +fi + if [ "$LIBARCHIVE" = "yes" ]; then PKGDEPENDS="libarchive $PKGDEPENDS" with_archive="-D archive=true" @@ -156,7 +165,8 @@ $with_fuse \ $with_gcr \ $with_http \ - $with_libarchvie \ + $with_keyring \ + $with_libarchive \ $with_ssh \ $with_udev ninja -C build
--- a/lib/libblockdev/libblockdev.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/lib/libblockdev/libblockdev.sh Mon Sep 09 21:10:00 2019 +0200 @@ -23,6 +23,7 @@ PKGLICENSE="LGPLv21" PKGSUMMARY="a library for manipulating block devices" PKGDOWNLOAD="https://github.com/storaged-project/libblockdev/releases/download/$PKGVERSION-1/$PKGNAME-$PKGVERSION.tar.gz" +PKGDEPENDS="glib eudev kmod util-linux" PKGOPTIONS="LVM PYTHON" : ${CHOST:=$(uname -m)-linux-musl}
--- a/lib/libbytesize/libbytesize.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/lib/libbytesize/libbytesize.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="LGPLv21" PKGSUMMARY="a for working with arbitrary big sizes in bytes" PKGDOWNLOAD="https://github.com/storaged-project/libbytesize/releases/download/$PKGVERSION/$PKGNAME-$PKGVERSION.tar.gz" -PKGDEPENDS="pcre2" +PKGDEPENDS="gmp mpfr pcre2" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl}
--- a/lib/libical/libical.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/lib/libical/libical.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="MPLv20 LGPLv21" PKGSUMMARY="mplementation of the iCalendar protocols and protocol data units" PKGDOWNLOAD="https://github.com/libical/libical/releases/download/v$PKGVERSION/$PKGNAME-$PKGVERSION.tar.gz" -PKGDEPENDS="cmake:build perl:build" +PKGDEPENDS="cmake:build db icu perl:build" PKGOPTIONS="GLIB VALA" : ${CC:=clang}
--- a/lib/libinput/libinput.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/lib/libinput/libinput.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="MIT" PKGSUMMARY="library to handle input devices in wayland" PKGDOWNLOAD="https://www.freedesktop.org/software/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz" -PKGDEPENDS="libevdev mtdev" +PKGDEPENDS="eudev libevdev mtdev" PKGOPTIONS="WACOM" : ${CC:=clang}
--- a/lib/libtermkey/libtermkey.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/lib/libtermkey/libtermkey.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,6 +21,7 @@ PKGLICENSE="MIT" PKGSUMMARY="library for accessing keyboard in terminal programs" PKGDOWNLOAD="http://www.leonerd.org.uk/code/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz" +PKGDEPENDS="ncurses" : ${CC:=clang} : ${CFLAGS:=-O2}
--- a/lib/mpc/mpc.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/lib/mpc/mpc.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,6 +21,7 @@ PKGLICENSE="LGPLv3+" PKGSUMMARY="arithmetic of complex number library in C" PKGDOWNLOAD="https://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz" +PKGDEPENDS="gmp mpfr" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl}
--- a/multimedia/ffmpeg/ffmpeg.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/multimedia/ffmpeg/ffmpeg.sh Mon Sep 09 21:10:00 2019 +0200 @@ -64,6 +64,7 @@ OPENGL OPUS PULSEAUDIO + SDL SPEEX SSH SSL @@ -90,6 +91,7 @@ : ${OPENGL:=no} : ${OPUS:=no} : ${PULSEAUDIO:=no} +: ${SDL:=no} : ${SPEEX:=no} : ${SSH:=no} : ${SSL:=no} @@ -194,6 +196,13 @@ with_pulseaudio="--disable-libpulse" fi +if [ "$SDL" = "yes" ]; then + PKGDEPENDS="sdl2 $PKGDEPENDS" + with_sdl="--enable-sdl2" +else + with_sdl="--disable-sdl2" +fi + if [ "$SPEEX" = "yes" ]; then PKGDEPENDS="speex $PKGDEPENDS" with_speex="--enable-libspeex" @@ -325,6 +334,7 @@ $with_opengl \ $with_opus \ $with_pulseaudio \ + $with_sdl \ $with_speex \ $with_ssh \ $with_ssl \
--- a/multimedia/gst-libav/gst-libav.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/multimedia/gst-libav/gst-libav.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="GPLv2" PKGSUMMARY="gstreamer ffmpeg plugin" PKGDOWNLOAD="https://gstreamer.freedesktop.org/src/gst-libav/$PKGNAME-$PKGVERSION.tar.xz" -PKGDEPENDS="meson:build gstreamer ffmpeg" +PKGDEPENDS="ffmpeg gst-plugins-base gstreamer meson:build" : ${CC:=clang} : ${CFLAGS:=-O2}
--- a/multimedia/gst-plugins-bad/gst-plugins-bad.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/multimedia/gst-plugins-bad/gst-plugins-bad.sh Mon Sep 09 21:10:00 2019 +0200 @@ -15,7 +15,7 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # -# TODO: add CHROMAPRINT, MMS, MODPLUG, LADSPA +# TODO: add CHROMAPRINT, MODPLUG, LADSPA PKGNAME=gst-plugins-bad PKGVERSION=1.16.0 @@ -23,8 +23,27 @@ PKGLICENSE="GPLv2" PKGSUMMARY="gstreamer bad plugins" PKGDOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-bad/$PKGNAME-$PKGVERSION.tar.xz" -PKGDEPENDS="meson:build gstreamer" -PKGOPTIONS="BLUETOOTH BZIP2 CURL DVD FAAC FAAD H264 JPEG KMS OPENAL SNDFILE WAYLAND X" +PKGDEPENDS="gst-plugins-base gstreamer meson:build" +PKGOPTIONS=" +BLUETOOTH +BZIP2 +CURL +DVD +FAAC +FAAD +FLUIDSYNTH +H264 +H265 +JPEG +KMS +MMS +OPENAL +OPUS +SNDFILE +SSL +WAYLAND +WEBCAM +X" : ${CC:=clang} : ${CFLAGS:=-O2} @@ -37,12 +56,18 @@ : ${DVD:=yes} : ${FAAC:=yes} : ${FAAD:=yes} +: ${FLUIDSYNTH:=yes} : ${H264:=no} # BROKEN: does not compile with our version of openh264 +: ${H265:=yes} : ${JPEG:=yes} : ${KMS:=yes} +: ${MMS:=yes} : ${OPENAL:=yes} +: ${OPUS:=yes} : ${SNDFILE:=yes} +: ${SSL:=yes} : ${WAYLAND:=yes} +: ${WEBCAM:=yes} : ${X:=yes} if [ "$BLUETOOTH" = "yes" ]; then @@ -87,6 +112,13 @@ with_faac="-D faad=disabled" fi +if [ "$FLUIDSYNTH" = "yes" ]; then + PKGDEPENDS="fluidsynth $PKGDEPENDS" + with_fluidsynth="-D fluidsynth=enabled" +else + with_fluidsynth="-D fluidsynth=disabled" +fi + if [ "$H264" = "yes" ]; then PKGDEPENDS="openh264 $PKGDEPENDS" with_h264="-D openh264=enabled" @@ -94,6 +126,13 @@ with_h264="-D openh264=disabled" fi +if [ "$H265" = "yes" ]; then + PKGDEPENDS="x265 $PKGDEPENDS" + with_h265="-D x265=enabled" +else + with_h265="-D x265=disabled" +fi + if [ "$JPEG" = "yes" ]; then PKGDEPENDS="openjpeg $PKGDEPENDS" with_jpeg="-D openjpeg=enabled" @@ -108,6 +147,13 @@ with_kms="-D kms=disabled" fi +if [ "$MMS" = "yes" ]; then + PKGDEPENDS="libmms $PKGDEPENDS" + with_mms="-D libmms=enabled" +else + with_mms="-D libmms=disabled" +fi + if [ "$OPENAL" = "yes" ]; then PKGDEPENDS="openal-soft $PKGDEPENDS" with_openal="-D openal=enabled" @@ -115,6 +161,13 @@ with_openal="-D openal=disabled" fi +if [ "$OPUS" = "yes" ]; then + PKGDEPENDS="opus $PKGDEPENDS" + with_opus="-D opus=enabled" +else + with_opus="-D opus-disabled" +fi + if [ "$SNDFILE" = "yes" ]; then PKGDEPENDS="libsndfile $PKGDEPENDS" with_sndfile="-D sndfile=enabled" @@ -122,6 +175,15 @@ with_sndfile="-D sndfile=disabled" fi +if [ "$SSL" = "yes" ]; then + # HLS support several alternatives (libressl, nettle, gcrypto) but since + # dtls explicitly require libressl, let's use it for HLS too. + PKGDEPENDS="libressl $PKGDEPENDS" + with_ssl="-D dtls=enabled -D hls=enabled -D hls-crypto=openssl" +else + with_ssl="-D dtls=disabled -Dhls=disabled" +fi + if [ "$WAYLAND" = "yes" ]; then PKGDEPENDS="wayland wayland-protocols $PKGDEPENDS" with_wayland="-D wayland=enabled" @@ -129,6 +191,14 @@ with_wayland="-D wayland=disabled" fi +if [ "$WEBCAM" = "yes" ]; then + PKGDEPENDS="eudev libusb $PKGDEPENDS" + with_webcam="-D uvch264=enabled" +else + with_webcam="-D uvch264=disabled" +fi + + if [ "$X" = "yes" ]; then PKGDEPENDS="libx11 $PKGDEPENDS" with_x="-D x11=enabled" @@ -158,12 +228,18 @@ $with_dvd \ $with_faac \ $with_faad \ + $with_fluidsynth \ $with_h264 \ + $with_h265 \ $with_jpeg \ $with_kms \ + $with_mms \ $with_openal \ + $with_opus \ $with_sndfile \ + $with_ssl \ $with_wayland \ + $with_webcam \ $with_x CC="$CC" ninja -C build DESTDIR=$DESTDIR ninja -C build install
--- a/multimedia/gst-plugins-base/gst-plugins-base.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/multimedia/gst-plugins-base/gst-plugins-base.sh Mon Sep 09 21:10:00 2019 +0200 @@ -24,7 +24,7 @@ PKGSUMMARY="gstreamer base plugins" PKGDOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-base/$PKGNAME-$PKGVERSION.tar.xz" PKGDEPENDS="meson:build gstreamer" -PKGOPTIONS="ALSA CDPARANOIA PANGO NLS OGG OPUS THEORA VORBIS X" +PKGOPTIONS="ALSA CDPARANOIA PANGO NLS OGG OPENGL OPUS THEORA VORBIS X" : ${CC:=clang} : ${CFLAGS:=-O2} @@ -35,6 +35,7 @@ : ${CDPARANOIA:=yes} : ${PANGO:=yes} : ${OGG:=yes} +: ${OPENGL:=yes} : ${OPUS:=yes} : ${THEORA:=yes} : ${VORBIS:=yes} @@ -68,6 +69,13 @@ with_ogg="-D ogg=disabled" fi +if [ "$OPENGL" = "yes" ]; then + PKGDEPENDS="libjpeg-turbo libpng mesa $PKGDEPENDS" + with_opengl="-D gl=enabled" +else + with_opengl="-D gl=disabled" +fi + if [ "$OPUS" = "yes" ]; then PKGDEPENDS="opus $PKGDEPENDS" with_opus="-D opus=enabled" @@ -116,6 +124,7 @@ $with_cdparanoia \ $with_pango \ $with_ogg \ + $with_opengl \ $with_opus \ $with_theora \ $with_vorbis \
--- a/multimedia/gst-plugins-good/gst-plugins-good.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/multimedia/gst-plugins-good/gst-plugins-good.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,8 +21,26 @@ PKGLICENSE="GPLv2" PKGSUMMARY="gstreamer good plugins" PKGDOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-good/$PKGNAME-$PKGVERSION.tar.xz" -PKGDEPENDS="meson:build gstreamer" -PKGOPTIONS="BZIP2 CAIRO FLAC GTK JACK JPEG LAME LIBSOUP NLS OSS PNG PULSEAUDIO QT X" +PKGDEPENDS="gst-plugins-base gstreamer meson:build" +PKGOPTIONS="BZIP2 + CAIRO + FLAC + GTK + JACK + JPEG + LIBSOUP + MP2 + MP3 + NLS + OSS + PNG + PULSEAUDIO + QT + TAGLIB + SHOUT + SPEEX + WAVPACK + X" : ${CC:=clang} : ${CFLAGS:=-O2} @@ -35,13 +53,18 @@ : ${GTK:=yes} : ${JACK:=yes} : ${JPEG:=yes} -: ${LAME:=yes} : ${LIBSOUP:=yes} +: ${MP2:=yes} +: ${MP3:=lame mpg123} : ${NLS:=yes} : ${OSS:=yes} : ${PNG:=yes} : ${PULSEAUDIO:=yes} : ${QT:=no} +: ${TAGLIB:=yes} +: ${SHOUT:=yes} +: ${SPEEX:=yes} +: ${WAVPACK:=yes} : ${X:=yes} if [ "$BZIP2" = "yes" ]; then @@ -86,7 +109,28 @@ with_jpeg="-D jpeg=disabled" fi -if [ "$LAME" = "yes" ]; then +if [ "$LIBSOUP" = "yes" ]; then + PKGDEPENDS="libsoup $PKGDEPENDS" + with_libsoup="-D soup=enabled" +else + with_libsoup="-D soup=disabled" +fi + +if [ "$MP2" = "yes" ]; then + PKGDEPENDS="twolame $PKGDEPENDS" + with_mp2="-D twolame=enabled" +else + with_mp2="-D twolame=disabled" +fi + +if [ -z "${MP3##*mpg123*}" ]; then + PKGDEPENDS="mpg123 $PKGDEPENDS" + with_mpg123="-D mpg123=enabled" +else + with_mpg123="-D mpg123=disabled" +fi + +if [ -z "${MP3##*lame*}" ]; then PKGDEPENDS="lame $PKGDEPENDS" with_lame="-D lame=enabled" else @@ -128,11 +172,32 @@ with_qt="-D qt5=disabled" fi -if [ "$LIBSOUP" = "yes" ]; then - PKGDEPENDS="libsoup $PKGDEPENDS" - with_libsoup="-D soup=enabled" +if [ "$TAGLIB" = "yes" ]; then + PKGDEPENDS="taglib $PKGDEPENDS" + with_taglib="-D taglib=enabled" +else + with_taglib="-D taglib=disabled" +fi + +if [ "$SHOUT" = "yes" ]; then + PKGDEPENDS="libshout $PKGDEPENDS" + with_shout="-D shout2=enabled" else - with_libsoup="-D soup=disabled" + with_shout="-D shout2=disabled" +fi + +if [ "$SPEEX" = "yes" ]; then + PKGDEPENDS="speex $PKGDEPENDS" + with_speex="-D speex=enabled" +else + with_speex="-D speex=disabled" +fi + +if [ "$WAVPACK" = "yes" ]; then + PKGDEPENDS="wavpack $PKGDEPENDS" + with_wavpack="-D wavpack=enabled" +else + with_wavpack="-D wavpack=disabled" fi if [ "$X" = "yes" ]; then @@ -171,15 +236,21 @@ $with_cairo \ $with_flac \ $with_gtk \ + $with_jack \ $with_jpeg \ - $with_jack \ $with_lame \ $with_libsoup \ + $with_mp2 \ + $with_mpg123 \ $with_nls \ $with_oss \ $with_png \ $with_pulseaudio \ $with_qt \ + $with_shout \ + $with_speex \ + $with_taglib \ + $with_wavpack \ $with_x CC="$CC" ninja -C build DESTDIR=$DESTDIR ninja -C build install
--- a/multimedia/gst-plugins-ugly/gst-plugins-ugly.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/multimedia/gst-plugins-ugly/gst-plugins-ugly.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="GPLv2" PKGSUMMARY="gstreamer ugly plugins" PKGDOWNLOAD="https://gstreamer.freedesktop.org/src/gst-plugins-ugly/$PKGNAME-$PKGVERSION.tar.xz" -PKGDEPENDS="meson:build gstreamer" +PKGDEPENDS="gst-plugins-base gstreamer meson:build" PKGOPTIONS="CDIO DVD H264" : ${CC:=clang}
--- a/multimedia/gstreamer/gstreamer.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/multimedia/gstreamer/gstreamer.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="LGPLv20" PKGSUMMARY="multimedia streaming framework" PKGDOWNLOAD="https://gstreamer.freedesktop.org/src/gstreamer/$PKGNAME-$PKGVERSION.tar.xz" -PKGDEPENDS="meson:build glib" +PKGDEPENDS="glib libcap meson:build" PKGOPTIONS="INTROSPECTION NLS" : ${CC:=clang}
--- a/multimedia/libcdio/libcdio.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/multimedia/libcdio/libcdio.sh Mon Sep 09 21:10:00 2019 +0200 @@ -15,19 +15,33 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # +# TODO: add many options. + PKGNAME=libcdio PKGVERSION=2.1.0 PKGREVISION=1 PKGLICENSE="GNU library for accessing CD-ROMs" PKGSUMMARY="GPLv3" PKGDOWNLOAD="https://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.bz2" +PKGDEPENDS="ncurses" +PKGOPTIONS="CDDB" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl} : ${CC:=clang} : ${CFLAGS:=-O2} +: ${CXX:=clang++} +: ${CXXFLAGS:=-O2} : ${LDFLAGS:=} : ${LIBS:=} +: ${CDDB:=yes} + +if [ "$CDDB" = "yes" ]; then + PKGDEPENDS="libcddb $PKGDEPENDS" + with_cddb="--enable-cddb" +else + with_cddb="--disable-cddb" +fi build() { @@ -37,12 +51,15 @@ CC="$CC" \ CFLAGS="$CFLAGS" \ + CXX="$CXX" \ + CXXFLAGS="$CXXFLAGS" \ LDFLAGS="$LDFLAGS" \ LIBS="$LIBS" \ ./configure \ --build=$CBUILD \ --host=$CHOST \ - --prefix= + --prefix= \ + $with_cddb make make install DESTDIR=$DESTDIR find $DESTDIR -type f -name "*.la" -delete
--- a/network/curl/curl.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/network/curl/curl.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,7 +21,8 @@ PKGLICENSE="MIT" PKGSUMMARY="command line tool for transferring data with URLs" PKGDOWNLOAD="https://curl.haxx.se/download/$PKGNAME-$PKGVERSION.tar.xz" -PKGOPTIONS="IDN2 IPV6 NGHTTP2 SSH SSL" +PKGDEPENDS="" +PKGOPTIONS="IDN2 IPV6 NGHTTP2 PSL SSH SSL ZLIB" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl} @@ -32,8 +33,10 @@ : ${IDN2:=yes} : ${IPV6:=yes} : ${NGHTTP2:=yes} +: ${PSL:=yes} : ${SSH:=yes} : ${SSL:=yes} +: ${ZLIB:=yes} if [ "$IDN2" = "yes" ]; then PKGDEPENDS="libidn2 $PKGDEPENDS" @@ -55,6 +58,13 @@ with_nghttp2="--without-nghttp2" fi +if [ "$PSL" = "yes" ]; then + PKGDEPENDS="libpsl $PKGDEPENDS" + with_psl="--with-libpsl" +else + with_psl="--without-libpsl" +fi + if [ "$SSH" = "yes" ]; then PKGDEPENDS="libssh2 $PKGDEPENDS" with_ssh="--with-libssh2" @@ -69,6 +79,13 @@ with_ssl="--without-ssl" fi +if [ "$ZLIB" = "yes" ]; then + PKGDEPENDS="zlib $PKGDEPENDS" + with_zlib="--with-zlib" +else + with_zlib="--without-zlib" +fi + build() { rm -rf $PKGNAME-$PKGVERSION @@ -93,8 +110,10 @@ $with_idn2 \ $with_ipv6 \ $with_nghttp2 \ + $with_psl \ $with_ssh \ - $with_ssl + $with_ssl \ + $with_zlib make make install DESTDIR=$DESTDIR find $DESTDIR -type f -name "*.la" -delete
--- a/network/dbus/dbus.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/network/dbus/dbus.sh Mon Sep 09 21:10:00 2019 +0200 @@ -23,6 +23,7 @@ PKGDOWNLOAD="https://dbus.freedesktop.org/releases/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz" PKGUIDS="messagebus:100" PKGGIDS="messagebus:100" +PKGDEPENDS="expat" PKGOPTIONS="SELINUX X" PKGPROTECT="etc/rc.d/dbus"
--- a/network/dhcpcd/dhcpcd.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/network/dhcpcd/dhcpcd.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="BSD" PKGSUMMARY="DHCP client daemon" PKGDOWNLOAD="https://roy.marples.name/downloads/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz" -PKGOPTIONS="IPV6" +PKGOPTIONS="IPV6 UDEV" PKGPROTECT="etc/dhcpcd.conf etc/rc.d/dhcpcd" : ${CHOST:=$(uname -m)-linux-musl} @@ -31,6 +31,20 @@ : ${LDFLAGS:=} : ${LIBS:=} : ${IPV6:=yes} +: ${UDEV:=yes} + +if [ "$IPV6" = "yes" ]; then + with_ipv6="--enable-ipv6" +else + with_ipv6="--disable-ipv6" +fi + +# Custom configure script, no --with-udev tunable. +if [ "$UDEV" = "yes" ]; then + PKGDEPENDS="udev $PKGDEPENDS" +else + with_udev="--without-udev" +fi build() { @@ -48,7 +62,9 @@ --prefix= \ --sbindir=/bin \ --mandir=/share/man \ - --datadir=/share + --datadir=/share \ + $with_ipv6 \ + $with_udev make make install DESTDIR=$DESTDIR install -Dm0644 ../dhcpcd $DESTDIR/etc/rc.d/dhcpcd
--- a/network/inetutils/inetutils.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/network/inetutils/inetutils.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,7 +21,8 @@ PKGLICENSE="GPLv3" PKGSUMMARY="GNU network programs" PKGDOWNLOAD="https://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz" -PKGOPTIONS="PAM" +PKGDEPENDS="ncurses" +PKGOPTIONS="COMPLETION PAM" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl} @@ -29,8 +30,16 @@ : ${CFLAGS:=-O2} : ${LDFLAGS:=} : ${LIBS:=} +: ${COMPLETION:=yes} : ${PAM:=yes} +if [ "$COMPLETION" = "yes" ]; then + PKGDEPENDS="readline $PKGDEPENDS" + with_completion="--enable-readline" +else + with_completion="--disable-readline" +fi + if [ "$PAM" = "yes" ]; then PKGDEPENDS="linux-pam $PKGDEPENDS" with_pam="--with-pam" @@ -58,6 +67,7 @@ --disable-rcp \ --disable-rlogin \ --disable-rsh \ + $with_completion \ $with_pam make make install DESTDIR=$DESTDIR
--- a/network/libpsl/libpsl.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/network/libpsl/libpsl.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="MIT" PKGSUMMARY="C library for the Public Suffix List" PKGDOWNLOAD="https://github.com/rockdaboot/libpsl/releases/download/$PKGNAME-$PKGVERSION/$PKGNAME-$PKGVERSION.tar.gz" -PKGDEPENDS="libidn2" +PKGDEPENDS="libidn2 libunistring" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl} @@ -36,6 +36,7 @@ tar xvf $PKGNAME-$PKGVERSION.tar.gz cd $PKGNAME-$PKGVERSION + # --disable-nls: no .po files available. CC="$CC" \ CFLAGS="$CFLAGS" \ LDFLAGS="$LDFLAGS" \ @@ -44,7 +45,8 @@ --build=$CBUILD \ --host=$CHOST \ --prefix= \ - --enable-shared + --enable-shared \ + --disable-nls make make install DESTDIR=$DESTDIR find $DESTDIR -type f -name "*.la" -delete
--- a/network/libssh/libssh.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/network/libssh/libssh.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="LGPLv21" PKGSUMMARY="C library that implements SSHv2 protocol" PKGDOWNLOAD="https://www.libssh.org/files/0.9/$PKGNAME-$PKGVERSION.tar.xz" -PKGDEPENDS="cmake:build zlib" +PKGDEPENDS="cmake:build libressl zlib" : ${CC:=clang} : ${CFLAGS:=-O2}
--- a/network/ntp/ntp.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/network/ntp/ntp.sh Mon Sep 09 21:10:00 2019 +0200 @@ -15,13 +15,15 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # +# TODO: check if libedit can be made optional. + PKGNAME=ntp PKGVERSION=4.2.8p13 PKGREVISION=1 PKGLICENSE="CUSTOM" PKGSUMMARY="network time protocol" PKGDOWNLOAD="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/$PKGNAME-$PKGVERSION.tar.gz" -PKGDEPENDS="libressl" +PKGDEPENDS="libedit libevent libressl" PKGOPTIONS="CAP IPV6 NLS" : ${CHOST:=$(uname -m)-linux-musl}
--- a/network/openssh/openssh.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/network/openssh/openssh.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,6 +21,7 @@ PKGLICENSE="BSD" PKGSUMMARY="OpenBSD ssh implementation" PKGDOWNLOAD="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$PKGNAME-$PKGVERSION.tar.gz" +PKGDEPENDS="libressl" PKGOPTIONS="PAM SELINUX" PKGUIDS="sshd:100" PKGGIDS="sshd:100"
--- a/perl/perl/perl.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/perl/perl/perl.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="GPLv1 CUSTOM" PKGSUMMARY="perl programming language" PKGDOWNLOAD="https://www.cpan.org/src/5.0/$PKGNAME-$PKGVERSION.tar.xz" -PKGDEPENDS="zlib bzip2" +PKGDEPENDS="bzip2 db gdbm zlib" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl}
--- a/python/python/python.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/python/python/python.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="PSF" PKGSUMMARY="high-level scripting language" PKGDOWNLOAD="https://www.python.org/ftp/python/$PKGVERSION/Python-$PKGVERSION.tar.xz" -PKGDEPENDS="libffi expat zlib libressl" +PKGDEPENDS="bzip2 gdbm libffi expat zlib libressl xz" PKGOPTIONS="IPV6" : ${CHOST:=$(uname -m)-linux-musl}
--- a/security/libsecret/libsecret.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/security/libsecret/libsecret.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="LGPLv21" PKGSUMMARY="a library for storing and accessing passwords" PKGDOWNLOAD="https://download.gnome.org/sources/libsecret/${PKGVERSION%.*}/$PKGNAME-$PKGVERSION.tar.xz" -PKGDEPENDS="glib libxslt:build" +PKGDEPENDS="glib libgpg-error libxslt:build" PKGOPTIONS="CRYPTO NLS VALA" : ${CHOST:=$(uname -m)-linux-musl}
--- a/security/polkit/polkit.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/security/polkit/polkit.sh Mon Sep 09 21:10:00 2019 +0200 @@ -18,10 +18,10 @@ PKGNAME=polkit PKGVERSION=0.115 PKGREVISION=1 -PKGLICENSE="toolkit for handling authorizations" -PKGSUMMARY="short summary" +PKGLICENSE="GPLv20" +PKGSUMMARY="toolkit for handling authorizations" PKGDOWNLOAD="https://www.freedesktop.org/software/$PKGNAME/releases/$PKGNAME-$PKGVERSION.tar.gz" -PKGDEPENDS="expat" +PKGDEPENDS="expat mozjs52" PKGOPTIONS="PAM" PKGUIDS="polkitd:101" PKGGIDS="polkitd:101" @@ -30,6 +30,8 @@ : ${CBUILD:=$(uname -m)-linux-musl} : ${CC:=clang} : ${CFLAGS:=-O2} +: ${CXX:=clang++} +: ${CXXFLAGS:=-O2} : ${LDFLAGS:=} : ${LIBS:=} : ${PAM:=yes} @@ -53,6 +55,8 @@ patch -p0 < ../make-innetgr-optional.patch CC="$CC" \ CFLAGS="$CFLAGS" \ + CXX="$CXX" \ + CXXFLAGS="$CXXFLAGS" \ LDFLAGS="$LDFLAGS" \ LIBS="$LIBS" \ ./configure \
--- a/shells/bash/bash.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/shells/bash/bash.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,6 +21,7 @@ PKGLICENSE="GPLv3+" PKGSUMMARY="GNU bourne again shell" PKGDOWNLOAD="https://ftp.gnu.org/gnu/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz" +PKGDEPENDS="ncurses" PKGOPTIONS="NLS" : ${CHOST:=$(uname -m)-linux-musl}
--- a/system/accountsservice/accountsservice.sh Mon Sep 09 21:05:00 2019 +0200 +++ b/system/accountsservice/accountsservice.sh Mon Sep 09 21:10:00 2019 +0200 @@ -21,7 +21,7 @@ PKGLICENSE="GPLv3" PKGSUMMARY="D-Bus API for querying users" PKGDOWNLOAD="https://www.freedesktop.org/software/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz" -PKGDEPENDS="meson:build gobject-introspection polkit" +PKGDEPENDS="glib gobject-introspection meson:build polkit" : ${CC:=clang} : ${CFLAGS:=-O2}