Skip to content

Commit 3e28a71

Browse files
author
Jonathan Wilkes
committed
Merge branch 'compile-fixes' into 'master'
Compilation fixes See merge request jwilkes/purr-data!864
2 parents 50241ac + da153a9 commit 3e28a71

30 files changed

Lines changed: 49 additions & 50 deletions

File tree

.github/workflows/makefile.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
jobs:
1111
macos-build:
1212

13-
runs-on: macos-latest
13+
runs-on: macos-12
1414

1515
steps:
1616
- uses: actions/checkout@v3

debuild/debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Source: purr-data
22
Section: sound
33
Priority: extra
44
Maintainer: Albert Graef <aggraef@gmail.com>
5-
Build-Depends: debhelper (>= 7.0.50~), autoconf, automake, libtool, pkg-config, bison, flex, libgtk2.0-dev, libgtk-3-dev, dh-python, flite1-dev, ladspa-sdk, libasound2-dev, libjack-dev, libbluetooth-dev, libcairo2-dev, libgl1-mesa-dev | libgl-dev, libglew1.6-dev | libglew-dev, libgsl-dev | libgsl0-dev, libmagick++-dev, libavifile-0.7-dev, libdc1394-dev | libdc1394-22-dev, libfftw3-dev, libfluidsynth-dev, libftgl-dev, libgsm1-dev, libjpeg-dev, libmp3lame-dev, libmpeg3-dev, libquicktime-dev, libraw1394-dev, libsmpeg-dev, libspeex-dev, libstk-dev | libstk0-dev, libtiff5-dev, libv4l-dev, libdv4-dev, libiec61883-dev, libxv-dev, libxxf86vm-dev, libvorbis-dev, zlib1g-dev (>= 1:1.1.3), rsync, libgconf2-dev, libnss3-dev, libxtst-dev, libxss-dev
5+
Build-Depends: debhelper (>= 7.0.50~), autoconf, automake, libtool, pkg-config, bison, flex, libgtk2.0-dev, libgtk-3-dev, dh-python, flite1-dev, ladspa-sdk, libasound2-dev, libjack-dev, libbluetooth-dev, libcairo2-dev, libgl1-mesa-dev | libgl-dev, libglew1.6-dev | libglew-dev, libgsl-dev | libgsl0-dev, libmagick++-dev, libavifile-0.7-dev, libdc1394-dev | libdc1394-22-dev, libfftw3-dev, libfluidsynth-dev, libftgl-dev, libgsm1-dev, libjpeg-dev, libmp3lame-dev, libmpeg3-dev, libquicktime-dev, libraw1394-dev, libsmpeg-dev, libspeex-dev, libstk-dev | libstk0-dev, libtiff5-dev, libv4l-dev, libdv4-dev, libiec61883-dev, libxv-dev, libxxf86vm-dev, libvorbis-dev, zlib1g-dev (>= 1:1.1.3), rsync, libgconf2-dev, libnss3-dev, libxtst-dev, libxss-dev, libtirpc-dev
66
Standards-Version: 3.9.5
77
Homepage: https://git.purrdata.net/jwilkes/purr-data
88

externals/Makefile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -488,12 +488,6 @@ cyclone_clean:
488488
#------------------------------------------------------------------------------#
489489
# DISIS
490490
disis:
491-
ifneq ($(OS_NAME),windows)
492-
ifneq ($(OS_NAME),darwin)
493-
cd $(externals_src)/disis/cwiid && aclocal && autoconf && \
494-
./configure --without-python && make
495-
endif
496-
endif
497491
make -C $(externals_src)/disis PD_PATH=$(pd_src) pdbinpath=$(pd_src)/src CFLAGS="$(CFLAGS_ADD)"
498492

499493
disis_install:
@@ -744,6 +738,11 @@ endif
744738
# default gemmacoswindow which doesn't work for me, YMMV.
745739
gem_window = --with-sdl2 --with-sdl2-LIBS="-L$(usrlocal)/lib -lSDL2" --with-defaultwindow=gemsdl2window
746740

741+
# As of automake 1.16.5 from homebrew, libtool compilation of Objective C++
742+
# sources seem to be broken. As a work-around, the LIBTOOLFLAGS=--tag=CXX
743+
# setting appears to fix that.
744+
export LIBTOOLFLAGS = --tag=CXX
745+
747746
$(gem_src)/Gem.pd_darwin: $(gem_src)/configure
748747
cd $(gem_src) && ./configure \
749748
CXXFLAGS="-DHAVE_S_STUFF_H $(CFLAGS_ADD)" \

externals/disis/makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ class.sources = disis_phasor~.c
66
disis_munger~.class.sources = disis_munger.c ADSR.c
77
define forLinux
88
class.sources += disis_netsend.c disis_netreceive.c
9-
disis_wiimote.class.sources = disis_wiimote.c
10-
disis_wiimote.class.ldlibs = $(CWIID_LIB_STATIC) -lbluetooth -lpthread
119
endef
1210
define forDarwin
1311
class.sources += disis_netsend.c disis_netreceive.c

externals/ggee/signal/streamin~.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
extern int close(int);
5050
#endif
5151
extern void sys_rmpollfn(int fd);
52-
extern sys_addpollfn(int fd, void* fn, void *ptr);
52+
extern int sys_addpollfn(int fd, void* fn, void *ptr);
5353

5454
static void sys_sockerror(char *s)
5555
{

externals/iem/iemguts/src/autoabstraction.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ void autoabstraction_setup(void)
164164
iemguts_boilerplate("automatic abstraction creator", 0);
165165
#ifdef AUTOABSTRACTION_ENABLED
166166
autoabstraction_initialize();
167-
sys_register_loader(autoabstraction_loader);
167+
sys_register_loader((loader_t)autoabstraction_loader);
168168
#warning FIXME loader-0.47 mode!
169169
#else
170170
error("autoabstraction needs to be compiled against Pd 0.40 or higher,\n");

externals/iem/iemguts/src/canvasdelete.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ static void canvasdelete_doit(t_canvasdelete *x)
4848
else {
4949
t_atom ap[1];
5050
SETFLOAT(ap, 1);
51-
typedmess(x->x_gobj, gensym("menuclose"), 1, ap);
51+
typedmess((t_pd*)x->x_gobj, gensym("menuclose"), 1, ap);
5252
}
5353

5454

@@ -83,7 +83,7 @@ static void *canvasdelete_new(t_floatarg f)
8383
depth--;
8484
}
8585

86-
x->x_glist = x->x_gobj = NULL;
86+
x->x_glist = NULL; x->x_gobj = NULL;
8787
if (!depth) {
8888
x->x_glist = canvas;
8989
x->x_gobj=obj;

externals/iem/iemguts/src/findbrokenobjects.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ static void fbo_iterate(t_findbrokenobjects*x, t_canvas*cnv, int verbose) {
100100
cls=pd_class(&g->g_pd);
101101
if (cls == canvas_class) {
102102
// this is just another abstraction, recurse into it
103-
fbo_iterate(x, ob, verbose);
103+
fbo_iterate(x, (t_canvas*)ob, verbose);
104104
} else if (cls == text_class) {
105105
t_binbuf*bb=ob->te_binbuf;
106106
t_atom*argv=binbuf_getvec(bb);

externals/iemlib/iemlib2/src/protect_against_open.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ void protect_against_open_setup(void)
110110
protect_against_open_widgetbehavior.w_selectfn = NULL;
111111
protect_against_open_widgetbehavior.w_activatefn = NULL;
112112
protect_against_open_widgetbehavior.w_deletefn = NULL;
113-
protect_against_open_widgetbehavior.w_visfn = protect_against_open_vis;
113+
protect_against_open_widgetbehavior.w_visfn = (t_method)protect_against_open_vis;
114114
protect_against_open_widgetbehavior.w_clickfn = NULL;
115115
#if defined(PD_MAJOR_VERSION) && (PD_MINOR_VERSION >= 37)
116116

0 commit comments

Comments
 (0)