DISTRHO
/
PawPaw
mirror of https://github.com/DISTRHO/PawPaw
1
0
Fork 0
Code Issues 0 Releases 2 Wiki Activity
Browse Source

Update deps for plugins 

Signed-off-by: falkTX <falktx@falktx.com>
test-github-breakage
falkTX 1 year ago
parent
777177562e
commit
9c5e8ef7db
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
14 changed files with 127 additions and 130 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      .github/workflows/bootstrap.yml
  2. +23
    -1
      bootstrap-plugins.sh
  3. +4
    -4
      patches/fontconfig/02_skip-tests.patch
  4. +0
    -13
      patches/fontconfig/03_fix-wasm-build.patch
  5. +16
    -0
      patches/liblo/02_fix-build.patch
  6. +0
    -22
      patches/liblo/02_fix-use-after-free.patch
  7. +13
    -10
      patches/lilv/01_hidden-lilv-api.patch
  8. +0
    -22
      patches/lilv/wasm/11_fix-build.patch
  9. +13
    -10
      patches/serd/01_hidden-serd-api.patch
  10. +0
    -22
      patches/serd/wasm/11_fix-build.patch
  11. +13
    -10
      patches/sord/01_hidden-sord-api.patch
  12. +24
    -0
      patches/zix/01_hidden-zix-api.patch
  13. +1
    -0
      setup/env.sh
  14. +19
    -15
      setup/versions.sh

+ 1
- 1
.github/workflows/bootstrap.yml View File

@@ -4,7 +4,7 @@ on:
push:

env:
CACHE_VERSION: 0
CACHE_VERSION: 11
DEBIAN_FRONTEND: noninteractive
PAWPAW_SKIP_TESTS: 1



+ 23
- 1
bootstrap-plugins.sh View File

@@ -410,6 +410,8 @@ LIBLO_EXTRAFLAGS="--enable-threads --disable-examples --disable-tools"

if [ -n "${PAWPAW_SKIP_TESTS}" ] && [ "${PAWPAW_SKIP_TESTS}" -eq 1 ]; then
LIBLO_EXTRAFLAGS+=" --disable-tests"
else
LIBLO_EXTRAFLAGS+=" --disable-network-tests"
fi

# auto-detection fails
@@ -431,6 +433,26 @@ if ([ -z "${PAWPAW_SKIP_TESTS}" ] || [ "${PAWPAW_SKIP_TESTS}" -eq 0 ]) && [ "${M
run_make liblo "${LIBLO_VERSION}" check
fi

# ---------------------------------------------------------------------------------------------------------------------
# zix

if [ -z "${PAWPAW_SKIP_LV2}" ] || [ "${PAWPAW_SKIP_LV2}" -eq 0 ]; then

ZIX_EXTRAFLAGS=""

if [ "${WASM}" -eq 1 ]; then
ZIX_EXTRAFLAGS+=" -Dtests=disabled -Dtests_cpp=disabled -Dthreads=disabled"
elif [ "${CROSS_COMPILING}" -eq 1 ] && [ "${LINUX}" -eq 0 ] && [ -z "${EXE_WRAPPER}" ]; then
ZIX_EXTRAFLAGS+=" -Dtests=disabled -Dtests_cpp=disabled"
fi

export EXTRA_CFLAGS="-fno-finite-math-only"

download zix "${ZIX_VERSION}" "${ZIX_URL}" "tar.xz"
build_meson zix "${ZIX_VERSION}" "-Dbenchmarks=disabled -Ddefault_library=static -Ddocs=disabled ${ZIX_EXTRAFLAGS}"

fi # PAWPAW_SKIP_LV2

# ---------------------------------------------------------------------------------------------------------------------
# serd

@@ -501,7 +523,7 @@ fi # PAWPAW_SKIP_LV2
if [ -z "${PAWPAW_SKIP_LV2}" ] || [ "${PAWPAW_SKIP_LV2}" -eq 0 ]; then

if [ "${LV2LINT_SUPPORTED}" -eq 1 ]; then
download lv2lint "${LV2LINT_VERSION}" "${LV2LINT_URL}"
git_clone lv2lint "${LV2LINT_VERSION}" "${LV2LINT_URL}"
build_meson lv2lint "${LV2LINT_VERSION}"
# "-Donline-tests=true -Delf-tests=true"
fi


+ 4
- 4
patches/fontconfig/02_skip-tests.patch View File

@@ -3,14 +3,14 @@ index bea1b79..2f57bb7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -223,7 +223,7 @@ CTAGS = ctags
CSCOPE = cscope
done | $(am__uniquify_input)`
DIST_SUBDIRS = fontconfig fc-case fc-lang src fc-cache fc-cat \
fc-conflist fc-list fc-match fc-pattern fc-query fc-scan \
- fc-validate conf.d its po po-conf test doc
+ fc-validate conf.d its po po-conf doc
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(srcdir)/fontconfig-zip.in $(srcdir)/fontconfig.pc.in \
$(srcdir)/fontconfig.spec.in ABOUT-NLS AUTHORS COPYING \
ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README.md \
@@ -456,7 +456,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = fontconfig fc-case fc-lang src fc-cache fc-cat fc-conflist \
@@ -18,5 +18,5 @@ index bea1b79..2f57bb7 100644
- conf.d its po po-conf test $(am__append_1)
+ conf.d its po po-conf $(am__append_1)
ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = config.rpath fontconfig.pc.in fonts.conf.in fonts.dtd \
fontconfig.spec.in fontconfig.spec fontconfig-zip.in \
MESON_FILES = \
conf.d/link_confs.py \

+ 0
- 13
patches/fontconfig/03_fix-wasm-build.patch View File

@@ -1,13 +0,0 @@
diff --git a/src/fcstat.c b/src/fcstat.c
index 5aa1643..d1240c5 100644
--- a/src/fcstat.c
+++ b/src/fcstat.c
@@ -384,7 +384,7 @@ FcFStatFs (int fd, FcStatFS *statb)
# endif
# if defined(HAVE_STRUCT_STATFS_F_FSTYPENAME)
p = buf.f_fstypename;
-# elif defined(__linux__)
+# elif defined(__linux__) || defined(__EMSCRIPTEN__)
switch (buf.f_type)
{
case 0x6969: /* nfs */

+ 16
- 0
patches/liblo/02_fix-build.patch View File

@@ -0,0 +1,16 @@
diff --git a/src/server.c b/src/server.c
index 130f6d5..2106b1f 100644
--- a/src/server.c
+++ b/src/server.c
@@ -1394,7 +1394,10 @@ int lo_server_wait(lo_server s, int timeout)
int lo_servers_wait(lo_server *s, int *status, int num_servers, int timeout)
{
- int i, j, k, sched_timeout;
+ int i, j, sched_timeout;
+#ifdef HAVE_POLL
+ int k;
+#endif
if (!status)
status = alloca(sizeof(int) * num_servers);

+ 0
- 22
patches/liblo/02_fix-use-after-free.patch View File

@@ -1,22 +0,0 @@
From 8187a8456c14eeb3af08c86ffa1228823c9ef1c5 Mon Sep 17 00:00:00 2001
From: Guido Aulisi <guido.aulisi@gmail.com>
Date: Sun, 25 Jun 2023 15:58:30 +0200
Subject: [PATCH] Fix use-after-free warning in server.c

That assignment is not necessary before returning
---
src/server.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/src/server.c b/src/server.c
index ba02d8e..35c9ba5 100644
--- a/src/server.c
+++ b/src/server.c
@@ -2289,7 +2289,6 @@ int lo_server_del_lo_method(lo_server s, lo_method m)
free((void *) it->path);
free((void *) it->typespec);
free(it);
- it = prev;
return 0;
}
prev = it;

+ 13
- 10
patches/lilv/01_hidden-lilv-api.patch View File

@@ -1,19 +1,22 @@
diff --git a/include/lilv/lilv.h b/include/lilv/lilv.h
index 5fd7a9f..368df82 100644
index 9f52925..e6b7a80 100644
--- a/include/lilv/lilv.h
+++ b/include/lilv/lilv.h
@@ -27,15 +27,7 @@
@@ -14,18 +14,7 @@
#include <stdint.h>
#include <stdio.h>
-#if defined(_WIN32) && !defined(LILV_STATIC) && defined(LILV_INTERNAL)
-# define LILV_API __declspec(dllexport)
-#elif defined(_WIN32) && !defined(LILV_STATIC)
-# define LILV_API __declspec(dllimport)
-#elif defined(__GNUC__)
-# define LILV_API __attribute__((visibility("default")))
-#else
-# define LILV_API
-// LILV_API must be used to decorate things in the public API
-#ifndef LILV_API
-# if defined(_WIN32) && !defined(LILV_STATIC) && defined(LILV_INTERNAL)
-# define LILV_API __declspec(dllexport)
-# elif defined(_WIN32) && !defined(LILV_STATIC)
-# define LILV_API __declspec(dllimport)
-# elif defined(__GNUC__)
-# define LILV_API __attribute__((visibility("default")))
-# else
-# define LILV_API
-# endif
-#endif
+#define LILV_API


+ 0
- 22
patches/lilv/wasm/11_fix-build.patch View File

@@ -1,22 +0,0 @@
diff --git a/src/lilv_config.h b/src/lilv_config.h
index d348a03..0dbc4d7 100644
--- a/src/lilv_config.h
+++ b/src/lilv_config.h
@@ -20,6 +20,8 @@
#if !defined(LILV_NO_DEFAULT_CONFIG)
+#define _GNU_SOURCE
+
// We need unistd.h to check _POSIX_VERSION
# ifndef LILV_NO_POSIX
# ifdef __has_include
@@ -33,7 +35,7 @@
// POSIX.1-2001: fileno()
# ifndef HAVE_FILENO
-# if defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L
+# if defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L && !defined(__EMSCRIPTEN__)
# define HAVE_FILENO
# endif
# endif

+ 13
- 10
patches/serd/01_hidden-serd-api.patch View File

@@ -1,19 +1,22 @@
diff --git a/include/serd/serd.h b/include/serd/serd.h
index e550541..c2ee87d 100644
index 2e7a13e..fb99b48 100644
--- a/include/serd/serd.h
+++ b/include/serd/serd.h
@@ -25,15 +25,7 @@
@@ -12,18 +12,7 @@
#include <stdint.h>
#include <stdio.h>
-#if defined(_WIN32) && !defined(SERD_STATIC) && defined(SERD_INTERNAL)
-# define SERD_API __declspec(dllexport)
-#elif defined(_WIN32) && !defined(SERD_STATIC)
-# define SERD_API __declspec(dllimport)
-#elif defined(__GNUC__)
-# define SERD_API __attribute__((visibility("default")))
-#else
-# define SERD_API
-// SERD_API must be used to decorate things in the public API
-#ifndef SERD_API
-# if defined(_WIN32) && !defined(SERD_STATIC) && defined(SERD_INTERNAL)
-# define SERD_API __declspec(dllexport)
-# elif defined(_WIN32) && !defined(SERD_STATIC)
-# define SERD_API __declspec(dllimport)
-# elif defined(__GNUC__)
-# define SERD_API __attribute__((visibility("default")))
-# else
-# define SERD_API
-# endif
-#endif
+#define SERD_API


+ 0
- 22
patches/serd/wasm/11_fix-build.patch View File

@@ -1,22 +0,0 @@
diff --git a/src/serd_config.h b/src/serd_config.h
index f9d6269..7e6715c 100644
--- a/src/serd_config.h
+++ b/src/serd_config.h
@@ -33,7 +33,7 @@

// POSIX.1-2001: fileno()
# ifndef HAVE_FILENO
-# if defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L
+# if defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L && !defined(__EMSCRIPTEN__)
# define HAVE_FILENO
# endif
# endif
@@ -49,7 +49,7 @@

// POSIX.1-2001: posix_memalign()
# ifndef HAVE_POSIX_MEMALIGN
-# if defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L
+# if defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L && !defined(__EMSCRIPTEN__)
# define HAVE_POSIX_MEMALIGN
# endif
# endif

+ 13
- 10
patches/sord/01_hidden-sord-api.patch View File

@@ -1,19 +1,22 @@
diff --git a/include/sord/sord.h b/include/sord/sord.h
index a327031..486a981 100644
index 93f9c07..3e37b0d 100644
--- a/include/sord/sord.h
+++ b/include/sord/sord.h
@@ -27,15 +27,7 @@
@@ -14,18 +14,7 @@
#include <stddef.h>
#include <stdint.h>
-#if defined(_WIN32) && !defined(SORD_STATIC) && defined(SORD_INTERNAL)
-# define SORD_API __declspec(dllexport)
-#elif defined(_WIN32) && !defined(SORD_STATIC)
-# define SORD_API __declspec(dllimport)
-#elif defined(__GNUC__)
-# define SORD_API __attribute__((visibility("default")))
-#else
-# define SORD_API
-// SORD_API must be used to decorate things in the public API
-#ifndef SORD_API
-# if defined(_WIN32) && !defined(SORD_STATIC) && defined(SORD_INTERNAL)
-# define SORD_API __declspec(dllexport)
-# elif defined(_WIN32) && !defined(SORD_STATIC)
-# define SORD_API __declspec(dllimport)
-# elif defined(__GNUC__)
-# define SORD_API __attribute__((visibility("default")))
-# else
-# define SORD_API
-# endif
-#endif
+#define SORD_API


+ 24
- 0
patches/zix/01_hidden-zix-api.patch View File

@@ -0,0 +1,24 @@
diff --git a/include/zix/attributes.h b/include/zix/attributes.h
index 518e5fb..c3a5633 100644
--- a/include/zix/attributes.h
+++ b/include/zix/attributes.h
@@ -19,18 +19,7 @@
# define ZIX_END_DECLS ///< End public API definitions
#endif
-// ZIX_API must be used to decorate things in the public API
-#ifndef ZIX_API
-# if defined(_WIN32) && !defined(ZIX_STATIC) && defined(ZIX_INTERNAL)
-# define ZIX_API __declspec(dllexport)
-# elif defined(_WIN32) && !defined(ZIX_STATIC)
-# define ZIX_API __declspec(dllimport)
-# elif defined(__GNUC__)
-# define ZIX_API __attribute__((visibility("default")))
-# else
-# define ZIX_API
-# endif
-#endif
+#define ZIX_API
// GCC function attributes
#ifdef __GNUC__

+ 1
- 0
setup/env.sh View File

@@ -87,6 +87,7 @@ if [ "${WASM}" -eq 1 ]; then
"${PAWPAW_DIR}/emsdk/emsdk" install ${EMSCRIPTEN_VERSION} && "${PAWPAW_DIR}/emsdk/emsdk" activate ${EMSCRIPTEN_VERSION}
fi

export EMSDK_QUIET=1
source "${PAWPAW_DIR}/emsdk/emsdk_env.sh"
fi



+ 19
- 15
setup/versions.sh View File

@@ -46,21 +46,22 @@ ZLIB_URL=https://github.com/madler/zlib/releases/download/v${ZLIB_VERSION}
# ---------------------------------------------------------------------------------------------------------------------
# bootstrap plugins

LIBPNG_VERSION=1.6.39
LIBPNG_VERSION=1.6.43
LIBPNG_URL=http://download.sourceforge.net/libpng

LIBXML2_VERSION=2.10.3
LIBXML2_URL=https://download.gnome.org/sources/libxml2/2.10
LIBXML2_VERSION=2.12.4
LIBXML2_URL=https://download.gnome.org/sources/libxml2/2.12

PIXMAN_VERSION=0.42.2
PIXMAN_URL=https://cairographics.org/releases

FREETYPE_VERSION=2.12.1
FREETYPE_VERSION=2.13.2
FREETYPE_URL=http://download.sourceforge.net/freetype

FONTCONFIG_VERSION=2.13.1
FONTCONFIG_VERSION=2.15.0
FONTCONFIG_URL=https://www.freedesktop.org/software/fontconfig/release

# TODO update and adapt to meson
CAIRO_VERSION=1.16.0
CAIRO_URL=https://cairographics.org/releases

@@ -86,31 +87,34 @@ fi
LIBFFI_URL=https://github.com/libffi/libffi/releases/download/v${LIBFFI_VERSION}
GLIB_URL=https://download.gnome.org/sources/glib/${GLIB_MVERSION}

LIBLO_VERSION=0.31
LIBLO_VERSION=0.32
LIBLO_URL=http://download.sourceforge.net/liblo

LV2_VERSION=0bcde338db1c63bbc503b4d1f6d7b55ed43154af # 1.18.10
LV2_URL=https://gitlab.com/lv2/lv2.git

SERD_VERSION=0.30.16
ZIX_VERSION=0.4.2
ZIX_URL=${DROBILLA_URL}

SERD_VERSION=0.32.0
SERD_URL=${DROBILLA_URL}

SORD_VERSION=0.16.14
SORD_VERSION=0.16.16
SORD_URL=${DROBILLA_URL}

SRATOM_VERSION=0.6.14
SRATOM_VERSION=0.6.16
SRATOM_URL=${DROBILLA_URL}

LILV_VERSION=0.24.20
LILV_VERSION=0.24.22
LILV_URL=${DROBILLA_URL}

LV2LINT_VERSION=0.16.2
LV2LINT_URL=https://gitlab.com/OpenMusicKontrollers/lv2lint/-/archive/${LV2LINT_VERSION}
LV2LINT_VERSION=ea7126042356d245610ecf7a56354dd196fafff7 # 0.16.2
LV2LINT_URL=https://git.open-music-kontrollers.ch/~hp/lv2lint

KXSTUDIO_LV2_EXTENSIONS_VERSION=58010323797754dc6cd50084d456e5ac2e7c034c
KXSTUDIO_LV2_EXTENSIONS_VERSION=6e76943b360b65b18cf95a9bd1a3bfd155d0630b
KXSTUDIO_LV2_EXTENSIONS_URL=https://github.com/KXStudio/LV2-Extensions.git

MOD_SDK_VERSION=60abe7176b4e4f46f20a41cdf3d65d909c8d8a34
MOD_SDK_VERSION=f4341a6c2b2f50e2eb405b06ce19f9f0b4b1a62b
MOD_SDK_URL=https://github.com/moddevices/mod-lv2-extensions.git

FLUIDSYNTH_VERSION=f65c6ba25fb2c7e37c89fc6a4afc5aa645e208c2 # 1.1.11
@@ -119,7 +123,7 @@ FLUIDSYNTH_URL=https://github.com/FluidSynth/fluidsynth.git
MXML_VERSION=3.3.1
MXML_URL=https://github.com/michaelrsweet/mxml/releases/download/v${MXML_VERSION}

CARLA_VERSION=73ddea269b927770a338d352a0d0db20aad87624 # 2.6.x
CARLA_VERSION=66afe24a08790732cc17d81d4b846a1e0cfa0118 # 2.6.x
CARLA_URL=https://github.com/falkTX/Carla.git

# ---------------------------------------------------------------------------------------------------------------------


Write Preview
Loading…
Cancel
Save