Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Musltest #2

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions srcpkgs/Carla/patches/libmagic.patch
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
--- source/Makefile.mk
+++ source/Makefile.mk
@@ -233,10 +233,7 @@
# Check for optional libs (special non-pkgconfig tests)
@@ -355,13 +355,7 @@ endif

ifneq ($(WIN32),true)
-
-# libmagic doesn't have a pkg-config file, so we need to call the compiler to test it
-HAVE_LIBMAGIC = $(shell echo '\#include <magic.h>' | $(CC) $(CFLAGS) -x c -w -c - -o .libmagic-tmp 2>/dev/null && echo true)
-
+HAVE_LIBMAGIC = true

-ifeq ($(shell $(PKG_CONFIG) --exists libmagic && echo true),true)
HAVE_LIBMAGIC = true
-else
-# old libmagic versions don't have a pkg-config file, so we need to call the compiler to test it
-CFLAGS_WITHOUT_ARCH = $(subst -arch arm64,,$(CFLAGS))
-HAVE_LIBMAGIC = $(shell echo '\#include <magic.h>' | $(CC) $(CFLAGS_WITHOUT_ARCH) -x c -w -c - -o /dev/null 2>/dev/null && echo true)
-endif

endif

# ---------------------------------------------------------------------------------------------------------------------
10 changes: 0 additions & 10 deletions srcpkgs/Carla/patches/qt5-5.15.0.patch

This file was deleted.

14 changes: 6 additions & 8 deletions srcpkgs/Carla/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'Carla'
pkgname=Carla
version=2.1
revision=3
version=2.3.0
revision=1
archs="x86_64* i686* aarch64* arm*"
build_style=gnu-makefile
pycompile_dirs="usr/share/carla"
Expand All @@ -10,19 +10,17 @@ makedepends="python3-PyQt5 libmagic file-devel libsndfile-devel
liblo-devel alsa-lib-devel pulseaudio-devel libX11-devel gtk+3-devel
gtk+-devel qt5-devel fluidsynth-devel fftw-devel zlib-devel
python3-rdflib"
depends="python3 python3-PyQt5 python3-PyQt5-svg which"
depends="python3 python3-PyQt5 python3-PyQt5-svg pyliblo which"
short_desc="Audio plugin host"
maintainer="nutcase84 <nutcase84@protonmail.com>"
license="GPL-2.0-or-later"
homepage="https://kxstudio.linuxaudio.org/Applications:Carla"
distfiles="https://github.com/falkTX/Carla/archive/v${version}.tar.gz"
checksum=a82ce08f3a82db9d878c8cb7e7e2f3b80834bf21801c6ec4ed95c0cfee25b963
checksum=27def29cc408d5c74926e8d0ef3a77fd76fee1e4f2797f840e999e6376a5be03
python_version=3

case $XBPS_TARGET_MACHINE in
x86_64* | i686*);;
*) make_build_args+=" NOOPT=true"
make_install_args+=" NOOPT=true";;
case "$XBPS_TARGET_MACHINE" in
*-musl) makedepends+=" libexecinfo-devel";;
esac

if [ "$CROSS_BUILD" ]; then
Expand Down
16 changes: 16 additions & 0 deletions srcpkgs/pyliblo/template
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Template file for 'pyliblo'
pkgname=pyliblo
version=0.10.0
revision=1
wrksrc="pyliblo-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
makedepends="python3-devel liblo-devel"
short_desc="Python bindings for the liblo OSC library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="http://das.nasophon.de/pyliblo/"
distfiles="${PYPI_SITE}/p/pyliblo/pyliblo-${version}.tar.gz"
checksum=fc67f1950b827272b00f9f0dc4ed7113c0ccef0c1c09e9976dead40ebbf1798f
# Github CI fails with "testNoPermission (test.test_liblo.ServerCreationTestCase)"
make_check=ci-skip