diff options
-rw-r--r-- | user/dbus-glib/APKBUILD | 10 | ||||
-rw-r--r-- | user/flac/APKBUILD | 5 | ||||
-rw-r--r-- | user/lame/APKBUILD | 14 | ||||
-rw-r--r-- | user/libcddb/APKBUILD | 7 | ||||
-rw-r--r-- | user/libidl/APKBUILD | 3 | ||||
-rw-r--r-- | user/libsndfile/APKBUILD | 5 | ||||
-rw-r--r-- | user/libusb/APKBUILD | 3 | ||||
-rw-r--r-- | user/orbit2/APKBUILD | 7 | ||||
-rw-r--r-- | user/sbc/APKBUILD | 2 | ||||
-rw-r--r-- | user/speex/APKBUILD | 2 | ||||
-rw-r--r-- | user/speexdsp/APKBUILD | 11 | ||||
-rw-r--r-- | user/v4l-utils/APKBUILD | 1 | ||||
-rw-r--r-- | user/yasm/APKBUILD | 6 |
13 files changed, 24 insertions, 52 deletions
diff --git a/user/dbus-glib/APKBUILD b/user/dbus-glib/APKBUILD index c2c581928..6187e395f 100644 --- a/user/dbus-glib/APKBUILD +++ b/user/dbus-glib/APKBUILD @@ -5,16 +5,14 @@ pkgrel=0 pkgdesc="GLib bindings for D-Bus" url="https://www.freedesktop.org/wiki/Software/DBusBindings" arch="all" -options="!checkroot" license="AFL-2.1 OR GPL-2.0+" subpackages="$pkgname-dev $pkgname-doc" -depends= -makedepends="dbus-dev expat-dev glib-dev" +depends="" checkdepends="dbus" -source="http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz" +makedepends="dbus-dev expat-dev glib-dev" +source="https://dbus.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,12 +25,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/flac/APKBUILD b/user/flac/APKBUILD index 5f8bd2adb..1bbe98ccd 100644 --- a/user/flac/APKBUILD +++ b/user/flac/APKBUILD @@ -5,11 +5,10 @@ pkgrel=0 pkgdesc="Free Lossless Audio Codec" url="https://xiph.org/flac/" arch="all" -options="!checkroot" license="BSD-3-Clause AND GPL-2.0+" -subpackages="$pkgname-dev $pkgname-doc" -depends= +depends="" makedepends="libogg-dev" +subpackages="$pkgname-dev $pkgname-doc" source="https://downloads.xiph.org/releases/flac/flac-${pkgver}.tar.xz" # secfixes: diff --git a/user/lame/APKBUILD b/user/lame/APKBUILD index 71f48fae4..31913a204 100644 --- a/user/lame/APKBUILD +++ b/user/lame/APKBUILD @@ -6,11 +6,11 @@ pkgdesc="MP3 encoder and graphical frame analyzer" url="http://lame.sourceforge.net/" arch="all" license="LGPL-2.0+" -subpackages="$pkgname-dev $pkgname-doc" -makedepends="ncurses-dev autoconf automake libtool" +depends="" +makedepends="ncurses-dev" ([ $CBUILD_ARCH != "pmmx" ] && [ $CBUILD_ARCH != "x86_64" ]) || makedepends="$makedepends nasm" +subpackages="$pkgname-dev $pkgname-doc" source="https://downloads.sourceforge.net/project/lame/lame/$pkgver/$pkgname-$pkgver.tar.gz" -builddir="$srcdir"/$pkgname-$pkgver # secfixes:ss # 3.100-r0: @@ -27,8 +27,6 @@ builddir="$srcdir"/$pkgname-$pkgver # - CVE-2017-11720 prepare() { - cd "$builddir" - default_prepare # fix for parallel builds @@ -36,12 +34,9 @@ prepare() { # fix for pic build with new nasm sed -i -e '/define sp/s/+/ + /g' libmp3lame/i386/nasm.h - - aclocal && automake --force --add-missing } build() { - cd "$builddir" LIBS="-ltinfo" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -55,13 +50,10 @@ build() { } check() { - cd "$builddir" make test } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install } diff --git a/user/libcddb/APKBUILD b/user/libcddb/APKBUILD index f28442f59..469bef794 100644 --- a/user/libcddb/APKBUILD +++ b/user/libcddb/APKBUILD @@ -3,7 +3,7 @@ pkgname=libcddb pkgver=1.3.2 pkgrel=5 -pkgdesc="Library that implements the different protocols (CDDBP, HTTP, SMTP) to access data on a CDDB server (e.g. http://freedb.org)." +pkgdesc="Library to access data on a CDDB server" url="https://sourceforge.net/projects/libcddb/" arch="all" options="!check" # Tests are known broken since 2009: @@ -17,13 +17,11 @@ source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 " prepare() { - cd "$builddir" - update_config_sub default_prepare + update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -35,7 +33,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libidl/APKBUILD b/user/libidl/APKBUILD index b3143333c..4d7322eca 100644 --- a/user/libidl/APKBUILD +++ b/user/libidl/APKBUILD @@ -15,13 +15,11 @@ source="https://download.gnome.org/sources/libIDL/${pkgver%.*}/libIDL-$pkgver.ta builddir="$srcdir"/libIDL-$pkgver prepare() { - cd "$builddir" update_config_sub default_prepare } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -33,7 +31,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libsndfile/APKBUILD b/user/libsndfile/APKBUILD index 26ca137e9..77e7ad39f 100644 --- a/user/libsndfile/APKBUILD +++ b/user/libsndfile/APKBUILD @@ -8,7 +8,7 @@ url="http://www.mega-nerd.com/libsndfile" arch="all" license="LGPL-2.1-only OR LGPL-3.0-only" subpackages="$pkgname-dev $pkgname-doc" -depends= +depends="" depends_dev="flac-dev libogg-dev libvorbis-dev" makedepends="$depends_dev alsa-lib-dev linux-headers" source="http://www.mega-nerd.com/$pkgname/files/$pkgname-$pkgver.tar.gz @@ -32,7 +32,6 @@ source="http://www.mega-nerd.com/$pkgname/files/$pkgname-$pkgver.tar.gz # - CVE-2017-8365 build() { - cd "$builddir" ac_cv_sys_largefile_CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" \ ./configure \ --build=$CBUILD \ @@ -44,12 +43,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libusb/APKBUILD b/user/libusb/APKBUILD index 649c84c6a..80e8d0dd6 100644 --- a/user/libusb/APKBUILD +++ b/user/libusb/APKBUILD @@ -6,8 +6,9 @@ pkgdesc="Library for USB device communication" url="https://libusb.info/" arch="all" license="LGPL-2.1+" -subpackages="$pkgname-dev" +depends="" makedepends="eudev-dev linux-headers" +subpackages="$pkgname-dev" source="https://github.com/libusb/libusb/releases/download/v$pkgver/$pkgname-$pkgver.tar.bz2" build() { diff --git a/user/orbit2/APKBUILD b/user/orbit2/APKBUILD index 5b954c654..2d4f507fe 100644 --- a/user/orbit2/APKBUILD +++ b/user/orbit2/APKBUILD @@ -7,22 +7,19 @@ pkgdesc="CORBA implementation for GNOME" url="https://projects-old.gnome.org/ORBit2/" arch="all" license="LGPL-2.0-only" -depends= +depends="" makedepends="glib-dev libidl-dev" -install="" subpackages="$pkgname-dev $pkgname-doc" source="https://download.gnome.org/sources/ORBit2/${pkgver%.*}/ORBit2-${pkgver}.tar.bz2 glib-2.36.patch" builddir="$srcdir"/ORBit2-$pkgver prepare() { - cd "$builddir" update_config_sub default_prepare } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -32,12 +29,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/sbc/APKBUILD b/user/sbc/APKBUILD index 9a71331ac..457df47ce 100644 --- a/user/sbc/APKBUILD +++ b/user/sbc/APKBUILD @@ -15,7 +15,6 @@ subpackages="$pkgname-dev $pkgname-utils" source="https://www.kernel.org/pub/linux/bluetooth/sbc-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,7 +27,6 @@ build() { } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/speex/APKBUILD b/user/speex/APKBUILD index c39ae6691..be0584dfa 100644 --- a/user/speex/APKBUILD +++ b/user/speex/APKBUILD @@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" source="https://downloads.us.xiph.org/releases/speex/speex-$pkgver.tar.gz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -27,7 +26,6 @@ build() { } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install } diff --git a/user/speexdsp/APKBUILD b/user/speexdsp/APKBUILD index b6a45a1f9..9394edc7a 100644 --- a/user/speexdsp/APKBUILD +++ b/user/speexdsp/APKBUILD @@ -14,8 +14,12 @@ replaces="libspeex" source="https://downloads.xiph.org/releases/speex/$pkgname-$pkgver.tar.gz" build() { - local _neon - [ "$CARCH" = "aarch64" ] && _neon="--disable-neon" + _arch_flags="" + + case $CARCH in + "aarch64") _arch_flags="--disable-neon" + esac + ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -24,12 +28,11 @@ build() { --mandir=/usr/share/man \ --infodir=/usr/share/info \ --disable-static \ - $_neon + $_arch_flags make } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install } diff --git a/user/v4l-utils/APKBUILD b/user/v4l-utils/APKBUILD index fa9acbd21..0cc0932ed 100644 --- a/user/v4l-utils/APKBUILD +++ b/user/v4l-utils/APKBUILD @@ -7,6 +7,7 @@ pkgdesc="Userspace tools and conversion library for Video 4 Linux" url="https://www.linuxtv.org/wiki/index.php/V4l-utils" arch="all" license="LGPL-2.0+" +depends="" makedepends="qt5-qtbase-dev libjpeg-turbo-dev argp-standalone linux-headers eudev-dev alsa-lib-dev" subpackages="$pkgname-dev $pkgname-doc qv4l2 $pkgname-libs ir_keytable" diff --git a/user/yasm/APKBUILD b/user/yasm/APKBUILD index 9452da3c0..3faa73264 100644 --- a/user/yasm/APKBUILD +++ b/user/yasm/APKBUILD @@ -6,17 +6,17 @@ pkgdesc="A rewrite of NASM to allow for multiple syntax supported (NASM, TASM, G url="http://yasm.tortall.net/" arch="all" license="(BSD-2-Clause OR BSD-3-Clause) AND (Artistic-1.0 OR GPL-2.0-only OR LGPL-2.0-only)" +depends="" +makedepends="" subpackages="$pkgname-dev $pkgname-doc" source="http://www.tortall.net/projects/$pkgname/releases/$pkgname-$pkgver.tar.gz" prepare() { default_prepare - cd "$builddir" update_config_sub } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,12 +25,10 @@ build() { } check() { - cd "$builddir" make -j1 check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } |