diff options
| -rw-r--r-- | user/catdoc/APKBUILD | 2 | ||||
| -rw-r--r-- | user/cdparanoia/APKBUILD | 4 | ||||
| -rw-r--r-- | user/exiv2/APKBUILD | 14 | ||||
| -rw-r--r-- | user/libogg/APKBUILD | 8 | ||||
| -rw-r--r-- | user/libvorbis/APKBUILD | 3 | ||||
| -rw-r--r-- | user/opus/APKBUILD | 8 | ||||
| -rw-r--r-- | user/taglib/APKBUILD | 6 |
7 files changed, 14 insertions, 31 deletions
diff --git a/user/catdoc/APKBUILD b/user/catdoc/APKBUILD index 4296c8167..e5fdbb52d 100644 --- a/user/catdoc/APKBUILD +++ b/user/catdoc/APKBUILD @@ -19,7 +19,6 @@ source="http://ftp.wagner.pp.ru/pub/catdoc/catdoc-$pkgver.tar.gz # - CVE-2017-11110 build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -32,7 +31,6 @@ build() { } package() { - cd "$builddir" make -j1 install } diff --git a/user/cdparanoia/APKBUILD b/user/cdparanoia/APKBUILD index 28a37e944..f8f567ba5 100644 --- a/user/cdparanoia/APKBUILD +++ b/user/cdparanoia/APKBUILD @@ -8,6 +8,7 @@ url="https://xiph.org/paranoia" arch="all" options="!check" # Build system has test suite commented out. license="LGPL-2.0+" +depends="" makedepends="libtool autoconf automake linux-headers" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" source="http://downloads.xiph.org/releases/cdparanoia/$pkgname-III-$pkgver.src.tgz @@ -18,7 +19,6 @@ builddir="$srcdir/cdparanoia-III-$pkgver" prepare() { default_prepare - cd "$builddir" mv configure.guess config.guess mv configure.sub config.sub update_config_sub @@ -28,7 +28,6 @@ prepare() { } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -40,7 +39,6 @@ build() { } package() { - cd "$builddir" make prefix="$pkgdir"/usr MANDIR="$pkgdir"/usr/share/man install } diff --git a/user/exiv2/APKBUILD b/user/exiv2/APKBUILD index 82aa2a958..f1ca3f81f 100644 --- a/user/exiv2/APKBUILD +++ b/user/exiv2/APKBUILD @@ -8,8 +8,8 @@ arch="all" license="GPL-2.0+" depends="" depends_dev="expat-dev zlib-dev" -makedepends="$depends_dev bash cmake" checkdepends="python3 libxml2 cmd:which" +makedepends="$depends_dev bash cmake" subpackages="$pkgname-dev $pkgname-doc" source="http://www.exiv2.org/builds/exiv2-$pkgver-Source.tar.gz https://dev.sick.bike/dist/exiv2-0.27.2-POC-file_issue_1019 @@ -89,7 +89,6 @@ builddir="$srcdir/$pkgname-$pkgver-Source" prepare() { default_prepare - mkdir build # Remove #1019 POC after >= 0.27.2 mv "$srcdir/$pkgname-$pkgver-POC-file_issue_1019" \ @@ -97,21 +96,18 @@ prepare() { } build() { - cd "$builddir/build" cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=/usr/lib \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo .. - make + -DCMAKE_BUILD_TYPE=RelWithDebInfo -Bbuild + make -C build } check() { - cd "$builddir/build" - make tests + make -C build tests } package() { - cd "$builddir/build" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" -C build install } sha512sums="39eb7d920dce18b275ac66f4766c7c73f7c72ee10e3e1e43d84c611b24f48ce20a70eac6d53948914e93242a25b8b52cc4bc760ee611ddcd77481306c1f9e721 exiv2-0.27.2-Source.tar.gz diff --git a/user/libogg/APKBUILD b/user/libogg/APKBUILD index c452d7890..f8f8e1f7a 100644 --- a/user/libogg/APKBUILD +++ b/user/libogg/APKBUILD @@ -7,12 +7,12 @@ pkgdesc="Ogg bitstream and framing library" url="https://xiph.org/ogg/" arch="all" license="BSD-3-Clause" +depends="" +makedepends="" subpackages="$pkgname-doc $pkgname-dev" source="http://downloads.xiph.org/releases/ogg/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" - ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -21,15 +21,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install - - install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING } sha512sums="aabe5de063a1963729ce0c055d538612d242b360d13f032d1508f0e82ad23f61d89d0b00386b358a87aba43317bb7a67b8e52361a41a079a1fc2bc6df61917d9 libogg-1.3.4.tar.gz" diff --git a/user/libvorbis/APKBUILD b/user/libvorbis/APKBUILD index 73520bf56..1dd35bf77 100644 --- a/user/libvorbis/APKBUILD +++ b/user/libvorbis/APKBUILD @@ -7,8 +7,9 @@ url="https://xiph.org/vorbis/" arch="all" options="!check" # Test suite doesn't compile. license="BSD-3-Clause" -subpackages="$pkgname-dev $pkgname-doc" +depends="" makedepends="libogg-dev" +subpackages="$pkgname-dev $pkgname-doc" source="https://downloads.xiph.org/releases/vorbis/$pkgname-$pkgver.tar.xz CVE-2017-14160-and-2018-10393.patch CVE-2018-10392.patch diff --git a/user/opus/APKBUILD b/user/opus/APKBUILD index 7d6854a1b..5251ec8b0 100644 --- a/user/opus/APKBUILD +++ b/user/opus/APKBUILD @@ -7,13 +7,12 @@ pkgdesc="Codec designed for speech and audio transmission" url="http://www.opus-codec.org/" arch="all" license="BSD-3-Clause" +depends="" +makedepends="" subpackages="$pkgname-dev $pkgname-doc" source="https://archive.mozilla.org/pub/$pkgname/$pkgname-$pkgver.tar.gz" -builddir="$srcdir/$pkgname-$pkgver" build() { - cd "$builddir" - CFLAGS="$(printf '%s' "$CFLAGS" | sed 's/-Os/-O2/')" \ ./configure \ --build=$CBUILD \ @@ -28,13 +27,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install install -Dm644 COPYING \ "$pkgdir/usr/share/licenses/$pkgname/LICENSE" diff --git a/user/taglib/APKBUILD b/user/taglib/APKBUILD index 0b7731116..6569a68e1 100644 --- a/user/taglib/APKBUILD +++ b/user/taglib/APKBUILD @@ -20,17 +20,15 @@ source="http://taglib.org/releases/taglib-$pkgver.tar.gz # - CVE-2018-11439 build() { - cd "$builddir" cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DWITH_ASF=ON \ -DWITH_MP4=ON \ - -DBUILD_SHARED_LIBS=ON + -DBUILD_SHARED_LIBS=ON . make VERBOSE=1 } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } |