Skip to content

Commit f4561a3

Browse files
Oleksiy-YakovenkoOleksiy-Yakovenko
committed
Merge branch 'master' into 1.10
2 parents 5655fd2 + 813d083 commit f4561a3

File tree

12 files changed

+30
-17
lines changed

12 files changed

+30
-17
lines changed

‎plugins/dca/Makefile.am

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pkglib_LTLIBRARIES = dca.la
55
dca_la_SOURCES = dcaplug.c\
66
libdca/audio_out.h\
77
libdca/bitstream.c\
8-
libdca/bitstream.h
8+
libdca/bitstream.h\
99
libdca/dca.h\
1010
libdca/dca_internal.h\
1111
libdca/downmix.c\
@@ -25,6 +25,7 @@ dca_la_SOURCES = dcaplug.c\
2525
dca_la_LDFLAGS = -module -avoid-version
2626
dca_la_LIBADD = $(LDADD) -lm
2727

28-
dca_la_CFLAGS = $(CFLAGS) -fPIC -std=c99 -I@top_srcdir@/include -Ilibdca
28+
dcapath=@top_srcdir@/plugins/dca
29+
dca_la_CFLAGS = $(CFLAGS) -fPIC -std=c99 -I@top_srcdir@/include -I$(dcapath)/libdca
2930

3031
endif

‎plugins/psf/Makefile.am

+4-1
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,9 @@ psf_la_SOURCES = plugin.c\
9191
psf_la_LDFLAGS = -module -avoid-version $(ZLIB_LIBS)
9292

9393
psf_la_LIBADD = $(LDADD)
94-
psf_la_CFLAGS = $(CFLAGS) $(ZLIB_CFLAGS) -Wall -DHAS_PSXCPU=1 -Iaosdk -I.. -Iaosdk/eng_ssf -Iaosdk/eng_qsf -Iaosdk/eng_dsf -lm -fPIC -I@top_srcdir@/include
94+
95+
psfpath=@top_srcdir@/plugins/psf
96+
97+
psf_la_CFLAGS = $(CFLAGS) $(ZLIB_CFLAGS) -Wall -DHAS_PSXCPU=1 -I$(psfpath)/aosdk -I$(psfpath)/.. -I$(psfpath)/aosdk/eng_ssf -I$(psfpath)/aosdk/eng_qsf -I$(psfpath)/aosdk/eng_dsf -lm -fPIC -I@top_srcdir@/include
9598
endif
9699

‎plugins/shn/Makefile.am

+3-1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,7 @@ ddb_shn_la_SOURCES =\
1818
ddb_shn_la_LDFLAGS = -module -avoid-version
1919

2020
ddb_shn_la_LIBADD = $(LDADD) -lm
21-
ddb_shn_la_CFLAGS = $(CFLAGS) -std=c99 -I@top_srcdir@/include -Ilibshn
21+
22+
shnpath=@top_srcdir@/plugins/shn
23+
ddb_shn_la_CFLAGS = $(CFLAGS) -std=c99 -I@top_srcdir@/include -I$(shnpath)/libshn
2224
endif

‎plugins/supereq/Makefile.am

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ supereq_la_SOURCES =\
77
libsupereq/Fftsg_fl.c\
88
libsupereq/paramlist.hpp
99

10-
supereq_la_CFLAGS = $(CFLAGS) -std=c99 -DUSE_OOURA -I@top_srcdir@/include -Ilibsupereq
11-
supereq_la_CXXFLAGS = $(CXXFLAGS) -fno-exceptions -fno-rtti -fno-unwind-tables -DUSE_OOURA -I@top_srcdir@/include -Ilibsupereq
10+
supereqpath=@top_srcdir@/plugins/supereq
11+
supereq_la_CFLAGS = $(CFLAGS) -std=c99 -DUSE_OOURA -I@top_srcdir@/include -I$(supereqpath)/libsupereq
12+
supereq_la_CXXFLAGS = $(CXXFLAGS) -fno-exceptions -fno-rtti -fno-unwind-tables -DUSE_OOURA -I@top_srcdir@/include -I$(supereqpath)/libsupereq
1213

1314
supereq_la_LDFLAGS = -module -avoid-version $(NOCPPLIB)
1415

‎plugins/tta/Makefile.am

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ tta_la_SOURCES =\
1212

1313
tta_la_LDFLAGS = -module -avoid-version
1414

15-
tta_la_CFLAGS = $(CFLAGS) -std=c99 -fPIC -I@top_srcdir@/include -Ilibtta
15+
ttapath=@top_srcdir@/plugins/tta
16+
tta_la_CFLAGS = $(CFLAGS) -std=c99 -fPIC -I@top_srcdir@/include -I$(ttapath)/libtta
1617
endif
1718

‎plugins/vtx/Makefile.am

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@ vtx_la_SOURCES =\
1111

1212
vtx_la_LDFLAGS = -module -avoid-version
1313

14-
vtx_la_CFLAGS = $(CFLAGS) -std=c99 -I@top_srcdir@/include -Ilibayemu
14+
vtxpath=@top_srcdir@/plugins/vtx
15+
vtx_la_CFLAGS = $(CFLAGS) -std=c99 -I@top_srcdir@/include -I$(vtxpath)/libayemu
1516
endif

‎po/POTFILES.in

+4
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ plugins/gtkui/search.c
4141
plugins/gtkui/selpropertieswidget.c
4242
plugins/gtkui/trkproperties.c
4343
plugins/gtkui/widgets.c
44+
plugins/gtkui/scriptable/gtkScriptable.c
45+
plugins/gtkui/scriptable/gtkScriptableListEditViewController.c
46+
plugins/gtkui/scriptable/gtkScriptableListEditWindowController.c
47+
plugins/gtkui/undointegration.c
4448
plugins/hotkeys/actionhandlers.c
4549
plugins/notify/notify.c
4650
plugins/pltbrowser/pltbrowser.c

‎tools/docker/18.04/bootstrap.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
# run this script once to create the base container image,
44
# which would contain all necessary dependencies and build tools
55

6-
docker build --progress plain -f tools/docker/18.04/Dockerfile-builder -t deadbeef-builder-player-clang-18.04 .
6+
docker build --platform linux/amd64 --progress plain -f tools/docker/18.04/Dockerfile-builder -t deadbeef-builder-player-clang-18.04 .

‎tools/docker/18.04/build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh
22

3-
docker build --progress plain -t deadbeef-clang-18.04 -f tools/docker/18.04/Dockerfile . || exit 1
3+
docker build --platform linux/amd64 --progress plain -t deadbeef-clang-18.04 -f tools/docker/18.04/Dockerfile . || exit 1
44
mkdir -p docker-artifacts
5-
docker run --rm -v ${PWD}/docker-artifacts:/usr/src/deadbeef/portable deadbeef-clang-18.04 || exit 1
5+
docker run --platform linux/amd64 --rm -v ${PWD}/docker-artifacts:/usr/src/deadbeef/portable deadbeef-clang-18.04 || exit 1

‎tools/docker/18.04/distcheck.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
set -e
44

5-
docker build --progress plain -t deadbeef-clang-distcheck-18.04 -f tools/docker/18.04/Dockerfile-distcheck .
5+
docker build --platform linux/amd64 --progress plain -t deadbeef-clang-distcheck-18.04 -f tools/docker/18.04/Dockerfile-distcheck .
66
mkdir -p docker-artifacts
7-
docker run -i --rm -v ${PWD}/docker-artifacts:/usr/src/deadbeef/portable deadbeef-clang-distcheck-18.04
7+
docker run --platform linux/amd64 -i --rm -v ${PWD}/docker-artifacts:/usr/src/deadbeef/portable deadbeef-clang-distcheck-18.04

‎tools/docker/18.04/test.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh
22

3-
docker build --progress plain -t deadbeef-test-18.04 -f tools/docker/18.04/Dockerfile-test . || exit 1
4-
docker run --rm deadbeef-test-18.04 || exit 1
3+
docker build --platform linux/amd64 --progress plain -t deadbeef-test-18.04 -f tools/docker/18.04/Dockerfile-test . || exit 1
4+
docker run --platform linux/amd64 --rm deadbeef-test-18.04 || exit 1
55

‎tools/docker/18.04/unittest.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
set -e
44

5-
docker build --progress plain -t deadbeef-clang-unittest-18.04 -f tools/docker/18.04/Dockerfile-unittest .
5+
docker build --platform linux/amd64 --progress plain -t deadbeef-clang-unittest-18.04 -f tools/docker/18.04/Dockerfile-unittest .
66
mkdir -p docker-artifacts
7-
docker run -i --rm -v ${PWD}/docker-artifacts:/usr/src/deadbeef/portable deadbeef-clang-unittest-18.04
7+
docker run --platform linux/amd64 -i --rm -v ${PWD}/docker-artifacts:/usr/src/deadbeef/portable deadbeef-clang-unittest-18.04

0 commit comments

Comments
 (0)