From 7ff14ae54c238f33c5a41ba6c07724f8e4d3c47e Mon Sep 17 00:00:00 2001 From: Rasmus Thomsen Date: Mon, 2 Mar 2020 16:10:25 +0100 Subject: testing/*: add --buildtype=plain to meson packages which don't specify a buildtype --- testing/dav1d/APKBUILD | 3 ++- testing/dxvk/APKBUILD | 16 ++++++++-------- testing/gnome-software/APKBUILD | 4 ++-- testing/kgx/APKBUILD | 3 ++- testing/moka-icon-theme/APKBUILD | 7 +++++-- testing/openhmd/APKBUILD | 7 ++++--- testing/snes9x/APKBUILD | 3 ++- testing/viewnior/APKBUILD | 6 ++++-- testing/waypipe/APKBUILD | 3 ++- testing/zathura-pdf-mupdf/APKBUILD | 8 ++++++-- 10 files changed, 37 insertions(+), 23 deletions(-) (limited to 'testing') diff --git a/testing/dav1d/APKBUILD b/testing/dav1d/APKBUILD index 4d15157cf0..0d1ade1894 100644 --- a/testing/dav1d/APKBUILD +++ b/testing/dav1d/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=dav1d pkgver=0.5.2 -pkgrel=0 +pkgrel=1 pkgdesc="small and fast AV1 Decoder" url="https://code.videolan.org/videolan/dav1d" arch="all" @@ -19,6 +19,7 @@ build() { meson \ --prefix=/usr \ + --buildtype=plain \ -Denable_tests=true \ -Denable_tools=true \ -Dfuzzing_engine=none \ diff --git a/testing/dxvk/APKBUILD b/testing/dxvk/APKBUILD index f20df98d84..7c8a43f18b 100644 --- a/testing/dxvk/APKBUILD +++ b/testing/dxvk/APKBUILD @@ -2,9 +2,9 @@ # Maintainer: pkgname=dxvk pkgver=1.5.5 -pkgrel=0 +pkgrel=1 pkgdesc="Vulkan-based compatibility layer for Direct3D 10/11" -options="!strip !check" +options="!check" url="https://github.com/doitsujin/dxvk" arch="x86_64 x86" license="Zlib" @@ -33,12 +33,12 @@ esac build() { meson . $_outdir \ - --cross-file $_crossfile \ - --prefix $_prefix \ - --bindir "" --libdir "" \ - --buildtype release \ - --strip \ - -D enable_tests=false + --cross-file=$_crossfile \ + --prefix=$_prefix \ + --bindir="" \ + --libdir="" \ + --buildtype=plain \ + -Denable_tests=false ninja -C $_outdir } diff --git a/testing/gnome-software/APKBUILD b/testing/gnome-software/APKBUILD index a1c1127627..b5e41a2b60 100644 --- a/testing/gnome-software/APKBUILD +++ b/testing/gnome-software/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Rasmus Thomsen pkgname=gnome-software pkgver=3.34.2 -pkgrel=0 +pkgrel=1 pkgdesc="Software lets you install and update applications and system extensions" url="https://wiki.gnome.org/Apps/Software" arch="all !s390x" @@ -30,7 +30,7 @@ build() { --sysconfdir=/etc \ --mandir=/usr/share/man \ --localstatedir=/var \ - --buildtype=debugoptimized \ + --buildtype=plain \ -Dvalgrind=false \ -Dmalcontent=false \ -Dpackagekit=false \ diff --git a/testing/kgx/APKBUILD b/testing/kgx/APKBUILD index f3b49a10c7..b00c8c3121 100644 --- a/testing/kgx/APKBUILD +++ b/testing/kgx/APKBUILD @@ -2,7 +2,7 @@ # Contributor: David Heidelberg pkgname=kgx pkgver=0.2.1 -pkgrel=0 +pkgrel=1 pkgdesc="A minimal terminal for GNOME" url="https://gitlab.gnome.org/ZanderBrown/kgx" arch="all !s390x !ppc64le" # !s390x !ppc64le due gnome-shell @@ -19,6 +19,7 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ + --buildtype=plain \ -Dgtop=true \ -Dgtk_doc=false \ -Dgir=false \ diff --git a/testing/moka-icon-theme/APKBUILD b/testing/moka-icon-theme/APKBUILD index 9df531da6c..21af3325ff 100644 --- a/testing/moka-icon-theme/APKBUILD +++ b/testing/moka-icon-theme/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Carlo Landmeter pkgname=moka-icon-theme pkgver=5.4.0 -pkgrel=0 +pkgrel=1 pkgdesc="Moka Icon Theme" url="https://snwh.org/moka" arch="noarch" @@ -12,7 +12,10 @@ options="!strip" source="moka-icon-theme-$pkgver.tar.gz::https://github.com/snwh/moka-icon-theme/archive/v$pkgver.tar.gz" build() { - meson --prefix=/usr output + meson \ + --prefix=/usr \ + --buildtype=plain \ + output ninja -C output } diff --git a/testing/openhmd/APKBUILD b/testing/openhmd/APKBUILD index e98716456c..0e40e101f0 100644 --- a/testing/openhmd/APKBUILD +++ b/testing/openhmd/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Drew DeVault pkgname=openhmd pkgver=0.3.0 -pkgrel=0 +pkgrel=1 pkgdesc="Free and Open Source API and drivers for immersive (VR) technology" url="http://www.openhmd.net/" arch="all" @@ -14,8 +14,9 @@ options="!check" # https://github.com/OpenHMD/OpenHMD/issues/248 build() { meson \ - --prefix /usr \ - --libdir /usr/lib \ + --prefix=/usr \ + --libdir=/usr/lib \ + --buildtype=plain \ -Dexamples='' \ . build ninja -C build diff --git a/testing/snes9x/APKBUILD b/testing/snes9x/APKBUILD index 7337cdfd93..757a74c2aa 100644 --- a/testing/snes9x/APKBUILD +++ b/testing/snes9x/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Taner Tas pkgname=snes9x pkgver=1.60 -pkgrel=0 +pkgrel=1 pkgdesc="Super NES Emulator" options="!check" # No testsuite url="http://www.snes9x.com" @@ -30,6 +30,7 @@ builddir="$srcdir/$pkgname-$pkgver/gtk" build() { meson \ --prefix=/usr \ + --buildtype=plain \ -Dopengl=true \ -Dgtk3=true \ -Dpulseaudio=false \ diff --git a/testing/viewnior/APKBUILD b/testing/viewnior/APKBUILD index af3ba75625..d67603ed04 100644 --- a/testing/viewnior/APKBUILD +++ b/testing/viewnior/APKBUILD @@ -3,7 +3,7 @@ pkgname=viewnior _pkgname=Viewnior pkgver=1.7 -pkgrel=1 +pkgrel=2 pkgdesc="A fast and simple image viewer" url="http://siyanpanayotov.com/project/viewnior" arch="all" @@ -22,7 +22,9 @@ prepare() { build() { cd "$builddir" - meson builddir --prefix=/usr + meson builddir \ + --prefix=/usr \ + --buildtype=plain ninja -C builddir } diff --git a/testing/waypipe/APKBUILD b/testing/waypipe/APKBUILD index a095b4b63c..b3acd938f9 100644 --- a/testing/waypipe/APKBUILD +++ b/testing/waypipe/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Simon Zeni pkgname="waypipe" pkgver="0.6.1" -pkgrel=0 +pkgrel=1 pkgdesc="A proxy for Wayland protocol applications." url="https://gitlab.freedesktop.org/mstoeckl/waypipe" arch="all" @@ -17,6 +17,7 @@ prepare() { meson build \ --prefix=/usr \ --mandir=/usr/share/man \ + --buildtype=plain \ -Dwerror=false \ -Db_ndebug=true } diff --git a/testing/zathura-pdf-mupdf/APKBUILD b/testing/zathura-pdf-mupdf/APKBUILD index 7cc0fdf8fe..f81920d9f6 100644 --- a/testing/zathura-pdf-mupdf/APKBUILD +++ b/testing/zathura-pdf-mupdf/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Milan P. Stanić pkgname=zathura-pdf-mupdf pkgver=0.3.5 -pkgrel=0 +pkgrel=1 pkgdesc="mupdf plugin to zathura" url="https://git.pwmt.org/pwmt/zathura-pdf-mupdf" arch="all" @@ -16,7 +16,11 @@ options="!check" build() { export=LDFLAGS="-ljpeg -lopenjp2 -ljbig2dec" - meson -Dlink-external=true build --prefix=/usr + meson \ + --prefix=/usr \ + --buildtype=plain \ + -Dlink-external=true \ + build ninja -C build } -- cgit v1.2.3