From bf278183339238b94db8d830e00dd57b5bad8803 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 29 May 2022 01:28:33 +0100 Subject: [PATCH] Fixup for mpg123 mis-exported symbols Signed-off-by: falkTX --- sources/.gitignore | 3 + .../libs/fluidsynth-static/debian/changelog | 2 +- sources/libs/fluidsynth-static/debian/control | 2 +- .../libs/libsndfile-static/debian/changelog | 6 + sources/libs/libsndfile-static/debian/control | 2 +- sources/libs/lilv-static/debian/clean | 13 + sources/libs/lv2/debian/clean | 13 + sources/libs/mpg123-static/debian/changelog | 2 +- .../debian/patches/02_hidden-api.patch | 672 ------------------ .../libs/mpg123-static/debian/patches/series | 1 - sources/libs/mpg123-static/debian/rules | 9 +- sources/libs/serd-static/debian/clean | 13 + sources/libs/sord-static/debian/clean | 13 + sources/libs/sratom-static/debian/clean | 13 + sources/plugins/lsp-plugins/debian/changelog | 2 +- sources/plugins/lsp-plugins/debian/clean | 1 + sources/plugins/lsp-plugins/debian/control | 1 + sources/plugins/lsp-plugins/debian/rules | 14 +- 18 files changed, 86 insertions(+), 696 deletions(-) create mode 100644 sources/libs/lilv-static/debian/clean create mode 100644 sources/libs/lv2/debian/clean delete mode 100644 sources/libs/mpg123-static/debian/patches/02_hidden-api.patch create mode 100644 sources/libs/serd-static/debian/clean create mode 100644 sources/libs/sord-static/debian/clean create mode 100644 sources/libs/sratom-static/debian/clean create mode 100644 sources/plugins/lsp-plugins/debian/clean diff --git a/sources/.gitignore b/sources/.gitignore index 82a19de..13956f6 100644 --- a/sources/.gitignore +++ b/sources/.gitignore @@ -19,6 +19,7 @@ include-binaries !/libs/*/debian/patches/series !/libs/*/debian/source/format !/libs/*/debian/changelog +!/libs/*/debian/clean !/libs/*/debian/control !/libs/*/debian/install !/libs/*/debian/*.install @@ -39,6 +40,7 @@ include-binaries !/apps/*/debian/patches/series !/apps/*/debian/source/format !/apps/*/debian/changelog +!/apps/*/debian/clean !/apps/*/debian/control !/apps/*/debian/install !/apps/*/debian/*.install @@ -53,6 +55,7 @@ include-binaries !/plugins/*/debian/patches/series !/plugins/*/debian/source/format !/plugins/*/debian/changelog +!/plugins/*/debian/clean !/plugins/*/debian/control !/plugins/*/debian/install !/plugins/*/debian/*.install diff --git a/sources/libs/fluidsynth-static/debian/changelog b/sources/libs/fluidsynth-static/debian/changelog index 5180cff..d78f568 100644 --- a/sources/libs/fluidsynth-static/debian/changelog +++ b/sources/libs/fluidsynth-static/debian/changelog @@ -1,4 +1,4 @@ -fluidsynth-static (6:1.1.11-1kxstudio5) focal; urgency=medium +fluidsynth-static (6:1.1.11-1kxstudio7) focal; urgency=medium * Initial package diff --git a/sources/libs/fluidsynth-static/debian/control b/sources/libs/fluidsynth-static/debian/control index 87c5e6a..20a7c5c 100644 --- a/sources/libs/fluidsynth-static/debian/control +++ b/sources/libs/fluidsynth-static/debian/control @@ -6,7 +6,7 @@ Build-Depends: debhelper-compat (= 13), kxstudio-build-scripts (>= 5), cmake, pkg-config, - libsndfile-static (>= 6:1.1.0-2kxstudio3), + libsndfile-static (>= 6:1.1.0-2kxstudio6), libglib2.0-dev Standards-Version: 4.5.0 Homepage: https://www.fluidsynth.org/ diff --git a/sources/libs/libsndfile-static/debian/changelog b/sources/libs/libsndfile-static/debian/changelog index 2291b13..2ce1917 100644 --- a/sources/libs/libsndfile-static/debian/changelog +++ b/sources/libs/libsndfile-static/debian/changelog @@ -1,3 +1,9 @@ +libsndfile-static (6:1.1.0-2kxstudio6) focal; urgency=medium + + * Fix mis-exported mpg123 symbols + + -- falkTX Sat, 28 May 2022 22:45:48 +0100 + libsndfile-static (6:1.1.0-2kxstudio4) focal; urgency=medium * Fix missing mp3 support diff --git a/sources/libs/libsndfile-static/debian/control b/sources/libs/libsndfile-static/debian/control index dd111af..bd9a7ab 100644 --- a/sources/libs/libsndfile-static/debian/control +++ b/sources/libs/libsndfile-static/debian/control @@ -10,7 +10,7 @@ Build-Depends: debhelper-compat (= 13), pkg-config, libflac-static (>= 6:1.3.3-1kxstudio2), libmp3lame-static (>= 6:3.100-1kxstudio2), - libmpg123-static (>= 6:1.29.3-2kxstudio3), + libmpg123-static (>= 6:1.29.3-2kxstudio5), libopus-static (>= 6:1.3.1-1kxstudio8), libvorbis-static (>= 6:1.3.7-1kxstudio2), libasound2-dev, diff --git a/sources/libs/lilv-static/debian/clean b/sources/libs/lilv-static/debian/clean new file mode 100644 index 0000000..72de718 --- /dev/null +++ b/sources/libs/lilv-static/debian/clean @@ -0,0 +1,13 @@ +.lock-waf_linux_build +.lock-waf_linux2_build +build/.lock-waf_linux_build +build/.lock-waf_linux2_build +build/.wafpickle-* +build/c4che/_cache.py +build/c4che/build.config.py +build/config.log +__pycache__/*.pyc +waflib/*.pyc +waflib/*/*.pyc +waflib/__pycache__/*.pyc +waflib/*/__pycache__/*.pyc diff --git a/sources/libs/lv2/debian/clean b/sources/libs/lv2/debian/clean new file mode 100644 index 0000000..72de718 --- /dev/null +++ b/sources/libs/lv2/debian/clean @@ -0,0 +1,13 @@ +.lock-waf_linux_build +.lock-waf_linux2_build +build/.lock-waf_linux_build +build/.lock-waf_linux2_build +build/.wafpickle-* +build/c4che/_cache.py +build/c4che/build.config.py +build/config.log +__pycache__/*.pyc +waflib/*.pyc +waflib/*/*.pyc +waflib/__pycache__/*.pyc +waflib/*/__pycache__/*.pyc diff --git a/sources/libs/mpg123-static/debian/changelog b/sources/libs/mpg123-static/debian/changelog index 01eeda2..2f94cec 100644 --- a/sources/libs/mpg123-static/debian/changelog +++ b/sources/libs/mpg123-static/debian/changelog @@ -1,4 +1,4 @@ -mpg123-static (6:1.29.3-2kxstudio4) focal; urgency=medium +mpg123-static (6:1.29.3-2kxstudio5) focal; urgency=medium * Hide assembly symbols too diff --git a/sources/libs/mpg123-static/debian/patches/02_hidden-api.patch b/sources/libs/mpg123-static/debian/patches/02_hidden-api.patch deleted file mode 100644 index f88cd0e..0000000 --- a/sources/libs/mpg123-static/debian/patches/02_hidden-api.patch +++ /dev/null @@ -1,672 +0,0 @@ ---- mpg123-static-1.29.3.orig/src/libmpg123/check_neon.S -+++ mpg123-static-1.29.3/src/libmpg123/check_neon.S -@@ -18,7 +18,6 @@ - #endif - - .text -- GLOBAL_SYMBOL ASM_NAME(check_neon) - #ifdef __ELF__ - .type ASM_NAME(check_neon), %function - #endif ---- mpg123-static-1.29.3.orig/src/libmpg123/dct36_3dnow.S -+++ mpg123-static-1.29.3/src/libmpg123/dct36_3dnow.S -@@ -30,7 +30,6 @@ - - #include "mangle.h" - -- .globl ASM_NAME(dct36_3dnow) - /* .type ASM_NAME(dct36_3dnow),@function */ - ASM_NAME(dct36_3dnow): - pushl %ebp ---- mpg123-static-1.29.3.orig/src/libmpg123/dct36_3dnowext.S -+++ mpg123-static-1.29.3/src/libmpg123/dct36_3dnowext.S -@@ -43,7 +43,6 @@ - - .text - ALIGN32 --.globl ASM_NAME(dct36_3dnowext) - /* .type ASM_NAME(dct36_3dnowext), @function */ - ASM_NAME(dct36_3dnowext): - pushl %ebp ---- mpg123-static-1.29.3.orig/src/libmpg123/dct36_avx.S -+++ mpg123-static-1.29.3/src/libmpg123/dct36_avx.S -@@ -69,7 +69,6 @@ dct36_avx_sign: - .long 0x80000000,0x80000000,0x80000000,0x80000000 - .text - ALIGN16 -- .globl ASM_NAME(dct36_avx) - ASM_NAME(dct36_avx): - #ifdef IS_MSABI - push %rbp ---- mpg123-static-1.29.3.orig/src/libmpg123/dct36_neon.S -+++ mpg123-static-1.29.3/src/libmpg123/dct36_neon.S -@@ -47,7 +47,6 @@ dct36_neon_COS9: - .word 0x3f3504f3 - - ALIGN4 -- GLOBAL_SYMBOL ASM_NAME(dct36_neon) - #ifdef __ELF__ - .type ASM_NAME(dct36_neon), %function - #endif ---- mpg123-static-1.29.3.orig/src/libmpg123/dct36_neon64.S -+++ mpg123-static-1.29.3/src/libmpg123/dct36_neon64.S -@@ -44,7 +44,6 @@ dct36_aarch64_COS9: - - .text - ALIGN4 -- .globl ASM_NAME(dct36_neon64) - #ifdef __ELF__ - .type ASM_NAME(dct36_neon64), %function - #endif ---- mpg123-static-1.29.3.orig/src/libmpg123/dct36_sse.S -+++ mpg123-static-1.29.3/src/libmpg123/dct36_sse.S -@@ -61,7 +61,6 @@ dct36_sse_sign: - .long 0x80000000,0x80000000,0x80000000,0x80000000 - .text - ALIGN16 -- .globl ASM_NAME(dct36_sse) - ASM_NAME(dct36_sse): - push %ebp - mov %esp, %ebp ---- mpg123-static-1.29.3.orig/src/libmpg123/dct36_x86_64.S -+++ mpg123-static-1.29.3/src/libmpg123/dct36_x86_64.S -@@ -72,7 +72,6 @@ dct36_x86_64_sign: - .long 0x80000000,0x80000000,0x80000000,0x80000000 - .text - ALIGN16 -- .globl ASM_NAME(dct36_x86_64) - ASM_NAME(dct36_x86_64): - #ifdef IS_MSABI - push %rbp ---- mpg123-static-1.29.3.orig/src/libmpg123/dct64_3dnow.S -+++ mpg123-static-1.29.3/src/libmpg123/dct64_3dnow.S -@@ -14,7 +14,6 @@ - - #include "mangle.h" - -- .globl ASM_NAME(dct64_3dnow) - /* .type ASM_NAME(dct64_3dnow),@function */ - ASM_NAME(dct64_3dnow): - subl $256,%esp ---- mpg123-static-1.29.3.orig/src/libmpg123/dct64_3dnowext.S -+++ mpg123-static-1.29.3/src/libmpg123/dct64_3dnowext.S -@@ -37,7 +37,6 @@ x_plus_minus_3dnow: - - .text - ALIGN32 --.globl ASM_NAME(dct64_3dnowext) - /* .type ASM_NAME(dct64_3dnowext), @function */ - ASM_NAME(dct64_3dnowext): - pushl %ebp ---- mpg123-static-1.29.3.orig/src/libmpg123/dct64_avx.S -+++ mpg123-static-1.29.3/src/libmpg123/dct64_avx.S -@@ -58,7 +58,6 @@ costab_avx: - .long 0 - .text - ALIGN16 --.globl ASM_NAME(dct64_avx) - ASM_NAME(dct64_avx): - #ifdef IS_MSABI - push %rbp ---- mpg123-static-1.29.3.orig/src/libmpg123/dct64_avx_float.S -+++ mpg123-static-1.29.3/src/libmpg123/dct64_avx_float.S -@@ -58,7 +58,6 @@ costab_avx: - .long 0 - .text - ALIGN16 --.globl ASM_NAME(dct64_real_avx) - ASM_NAME(dct64_real_avx): - #ifdef IS_MSABI - push %rbp ---- mpg123-static-1.29.3.orig/src/libmpg123/dct64_mmx.S -+++ mpg123-static-1.29.3/src/libmpg123/dct64_mmx.S -@@ -11,11 +11,9 @@ - .text - - ALIGN32 --.globl ASM_NAME(dct64_mmx) - ASM_NAME(dct64_mmx): - - xorl %ecx,%ecx --.globl ASM_NAME(dct64_MMX) - ASM_NAME(dct64_MMX): - pushl %ebx - pushl %esi ---- mpg123-static-1.29.3.orig/src/libmpg123/dct64_neon.S -+++ mpg123-static-1.29.3/src/libmpg123/dct64_neon.S -@@ -51,7 +51,6 @@ costab_arm: - .word 1060439283 - .word 1060439283 - ALIGN4 -- GLOBAL_SYMBOL ASM_NAME(dct64_neon) - #ifdef __ELF__ - .type ASM_NAME(dct64_neon), %function - #endif ---- mpg123-static-1.29.3.orig/src/libmpg123/dct64_neon64.S -+++ mpg123-static-1.29.3/src/libmpg123/dct64_neon64.S -@@ -49,7 +49,6 @@ costab_neon_aarch64: - .word 1060439283 - .text - ALIGN4 -- .globl ASM_NAME(dct64_neon64) - #ifdef __ELF__ - .type ASM_NAME(dct64_neon64), %function - #endif ---- mpg123-static-1.29.3.orig/src/libmpg123/dct64_neon64_float.S -+++ mpg123-static-1.29.3/src/libmpg123/dct64_neon64_float.S -@@ -49,7 +49,6 @@ costab_neon_aarch64: - .word 1060439283 - .text - ALIGN4 -- .globl ASM_NAME(dct64_real_neon64) - #ifdef __ELF__ - .type ASM_NAME(dct64_real_neon64), %function - #endif ---- mpg123-static-1.29.3.orig/src/libmpg123/dct64_neon_float.S -+++ mpg123-static-1.29.3/src/libmpg123/dct64_neon_float.S -@@ -51,7 +51,6 @@ costab_arm: - .word 1060439283 - .word 1060439283 - ALIGN4 -- GLOBAL_SYMBOL ASM_NAME(dct64_real_neon) - #ifdef __ELF__ - .type ASM_NAME(dct64_real_neon), %function - #endif ---- mpg123-static-1.29.3.orig/src/libmpg123/dct64_sse.S -+++ mpg123-static-1.29.3/src/libmpg123/dct64_sse.S -@@ -36,7 +36,6 @@ mask: - - .text - ALIGN16 --.globl ASM_NAME(dct64_sse) - ASM_NAME(dct64_sse): - pushl %ebp - movl %esp, %ebp ---- mpg123-static-1.29.3.orig/src/libmpg123/dct64_sse_float.S -+++ mpg123-static-1.29.3/src/libmpg123/dct64_sse_float.S -@@ -36,7 +36,6 @@ mask: - - .text - ALIGN16 --.globl ASM_NAME(dct64_real_sse) - ASM_NAME(dct64_real_sse): - pushl %ebp - movl %esp, %ebp ---- mpg123-static-1.29.3.orig/src/libmpg123/dct64_x86_64.S -+++ mpg123-static-1.29.3/src/libmpg123/dct64_x86_64.S -@@ -69,7 +69,6 @@ ASM_NAME(costab_x86_64): - .long 0 - .text - ALIGN16 --.globl ASM_NAME(dct64_x86_64) - ASM_NAME(dct64_x86_64): - #ifdef IS_MSABI /* should save xmm6-15 */ - movq %rcx, ARG0 ---- mpg123-static-1.29.3.orig/src/libmpg123/dct64_x86_64_float.S -+++ mpg123-static-1.29.3/src/libmpg123/dct64_x86_64_float.S -@@ -69,7 +69,6 @@ ASM_NAME(costab_x86_64): - .long 0 - .text - ALIGN16 --.globl ASM_NAME(dct64_real_x86_64) - ASM_NAME(dct64_real_x86_64): - #ifdef IS_MSABI /* should save xmm6-15 */ - movq %rcx, ARG0 ---- mpg123-static-1.29.3.orig/src/libmpg123/equalizer_3dnow.S -+++ mpg123-static-1.29.3/src/libmpg123/equalizer_3dnow.S -@@ -10,7 +10,6 @@ - - .text - ALIGN4 --.globl ASM_NAME(do_equalizer_3dnow) - /* .type ASM_NAME(do_equalizer_3dnow),@function */ - /* void do_equalizer(real *bandPtr,int channel, real equalizer[2][32]); */ - ASM_NAME(do_equalizer_3dnow): ---- mpg123-static-1.29.3.orig/src/libmpg123/getcpuflags.S -+++ mpg123-static-1.29.3/src/libmpg123/getcpuflags.S -@@ -20,7 +20,6 @@ - .text - ALIGN4 - --.globl ASM_NAME(getcpuflags) - /* .type ASM_NAME(getcpuflags),@function */ - ASM_NAME(getcpuflags): - pushl %ebp ---- mpg123-static-1.29.3.orig/src/libmpg123/getcpuflags_x86_64.S -+++ mpg123-static-1.29.3/src/libmpg123/getcpuflags_x86_64.S -@@ -10,7 +10,6 @@ - - .text - ALIGN4 -- .globl ASM_NAME(getcpuflags) - ASM_NAME(getcpuflags): - push %rbp - mov %rsp, %rbp ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_3dnow.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_3dnow.S -@@ -52,7 +52,6 @@ ftoi_magic: - #endif - .text - ALIGN16 --.globl ASM_NAME(synth_1to1_3dnow_asm) - /* int synth_1to1_3dnow_asm(real *bandPtr, int channel, unsigned char *out, unsigned char *buffs, int *bo, real *decwin); */ - ASM_NAME(synth_1to1_3dnow_asm): - subl $24,%esp ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_arm.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_arm.S -@@ -23,7 +23,6 @@ - - .text - ALIGN4 -- .globl ASM_NAME(synth_1to1_arm_asm) - #ifdef __ELF__ - .type ASM_NAME(synth_1to1_arm_asm), %function - #endif ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_arm_accurate.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_arm_accurate.S -@@ -23,7 +23,6 @@ - - .text - ALIGN4 -- .globl ASM_NAME(synth_1to1_arm_accurate_asm) - #ifdef __ELF__ - .type ASM_NAME(synth_1to1_arm_accurate_asm), %function - #endif ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_i586.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_i586.S -@@ -45,7 +45,6 @@ - ALIGN8 - .text - /* int synth_1to1_i586_asm(real *bandPtr, int channel, unsigned char *out, unsigned char *buffs, int *bo, real *decwin); */ --.globl ASM_NAME(synth_1to1_i586_asm) - ASM_NAME(synth_1to1_i586_asm): - subl $12,%esp - pushl %ebp ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_i586_dither.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_i586_dither.S -@@ -26,7 +26,6 @@ - ALIGN8 - .text - /* int synth_1to1_i586_asm_dither(real *bandPtr, int channel, unsigned char *out, unsigned char *buffs, int bo_and_ditherindex[2], real *decwin, real* dithernoise); */ --.globl ASM_NAME(synth_1to1_i586_asm_dither) - ASM_NAME(synth_1to1_i586_asm_dither): - subl $16,%esp - pushl %ebp ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_mmx.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_mmx.S -@@ -24,7 +24,6 @@ - - .text - --.globl ASM_NAME(synth_1to1_MMX) - /* int synth_1to1_MMX(real *bandPtr, int channel, short *out, short *buffs, int *bo, float *decwins); */ - ASM_NAME(synth_1to1_MMX): - pushl %ebp ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_neon.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_neon.S -@@ -25,7 +25,6 @@ - #endif - - .text -- GLOBAL_SYMBOL ASM_NAME(synth_1to1_neon_asm) - #ifdef __ELF__ - .type ASM_NAME(synth_1to1_neon_asm), %function - #endif ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_neon64.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_neon64.S -@@ -19,7 +19,6 @@ maxmin_s16: - .word -32768 - .text - ALIGN4 -- .globl ASM_NAME(synth_1to1_neon64_asm) - #ifdef __ELF__ - .type ASM_NAME(synth_1to1_neon64_asm), %function - #endif ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_neon64_accurate.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_neon64_accurate.S -@@ -19,7 +19,6 @@ maxmin_s16: - .word -956301312 - .text - ALIGN4 -- .globl ASM_NAME(synth_1to1_neon64_accurate_asm) - #ifdef __ELF__ - .type ASM_NAME(synth_1to1_neon64_accurate_asm), %function - #endif ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_neon64_float.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_neon64_float.S -@@ -18,7 +18,6 @@ scale: - .word 939524096 - .text - ALIGN4 -- .globl ASM_NAME(synth_1to1_real_neon64_asm) - #ifdef __ELF__ - .type ASM_NAME(synth_1to1_real_neon64_asm), %function - #endif ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_neon64_s32.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_neon64_s32.S -@@ -20,7 +20,6 @@ maxmin_s32: - .word 1199570944 - .text - ALIGN4 -- .globl ASM_NAME(synth_1to1_s32_neon64_asm) - #ifdef __ELF__ - .type ASM_NAME(synth_1to1_s32_neon64_asm), %function - #endif ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_neon_accurate.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_neon_accurate.S -@@ -23,7 +23,6 @@ - #endif - - .text -- .globl ASM_NAME(synth_1to1_neon_accurate_asm) - #ifdef __ELF__ - .type ASM_NAME(synth_1to1_neon_accurate_asm), %function - #endif ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_neon_float.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_neon_float.S -@@ -25,7 +25,6 @@ - #endif - - .text -- GLOBAL_SYMBOL ASM_NAME(synth_1to1_real_neon_asm) - #ifdef __ELF__ - .type ASM_NAME(synth_1to1_real_neon_asm), %function - #endif ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_neon_s32.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_neon_s32.S -@@ -25,7 +25,6 @@ - #endif - - .text -- GLOBAL_SYMBOL ASM_NAME(synth_1to1_s32_neon_asm) - #ifdef __ELF__ - .type ASM_NAME(synth_1to1_s32_neon_asm), %function - #endif ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_sse3d.h -+++ mpg123-static-1.29.3/src/libmpg123/synth_sse3d.h -@@ -44,7 +44,6 @@ null_one: - .text - ALIGN16 - /* void SYNTH_NAME(real *bandPtr, int channel, short *samples, short *buffs, int *bo, float *decwins) */ --.globl SYNTH_NAME - SYNTH_NAME: - pushl %ebp - /* stack:0=ebp 4=back 8=bandptr 12=channel 16=samples 20=buffs 24=bo 28=decwins */ ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_sse_accurate.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_sse_accurate.S -@@ -39,7 +39,6 @@ maxmin_s16: - .long -956301312 - .text - ALIGN16 --.globl ASM_NAME(synth_1to1_sse_accurate_asm) - ASM_NAME(synth_1to1_sse_accurate_asm): - pushl %ebp - movl %esp, %ebp ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_sse_float.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_sse_float.S -@@ -33,7 +33,6 @@ scale_sse: - .long 939524096 - .text - ALIGN16 --.globl ASM_NAME(synth_1to1_real_sse_asm) - ASM_NAME(synth_1to1_real_sse_asm): - pushl %ebp - movl %esp, %ebp ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_sse_s32.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_sse_s32.S -@@ -45,7 +45,6 @@ maxmin_s32: - .long -956301312 - .text - ALIGN16 --.globl ASM_NAME(synth_1to1_s32_sse_asm) - ASM_NAME(synth_1to1_s32_sse_asm): - pushl %ebp - movl %esp, %ebp ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_stereo_avx.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_stereo_avx.S -@@ -34,7 +34,6 @@ - */ - - ALIGN16 --.globl ASM_NAME(synth_1to1_s_avx_asm) - ASM_NAME(synth_1to1_s_avx_asm): - #ifdef IS_MSABI /* should save xmm6-15 */ - push %rbp ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_stereo_avx_accurate.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_stereo_avx_accurate.S -@@ -58,7 +58,6 @@ maxmin_avx: - .long -956301312 - .text - ALIGN16 -- .globl ASM_NAME(synth_1to1_s_avx_accurate_asm) - ASM_NAME(synth_1to1_s_avx_accurate_asm): - #ifdef IS_MSABI /* should save xmm6-15 */ - push %rbp ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_stereo_avx_float.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_stereo_avx_float.S -@@ -43,7 +43,6 @@ scale_avx: - .long 939524096 - .text - ALIGN16 -- .globl ASM_NAME(synth_1to1_real_s_avx_asm) - ASM_NAME(synth_1to1_real_s_avx_asm): - #ifdef IS_MSABI /* should save xmm6-15 */ - push %rbp ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_stereo_avx_s32.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_stereo_avx_s32.S -@@ -60,7 +60,6 @@ scale_avx: - .long 1199570944 - .text - ALIGN16 -- .globl ASM_NAME(synth_1to1_s32_s_avx_asm) - ASM_NAME(synth_1to1_s32_s_avx_asm): - #ifdef IS_MSABI /* should save xmm6-15 */ - push %rbp ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_stereo_neon.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_stereo_neon.S -@@ -26,7 +26,6 @@ - #endif - - .text -- GLOBAL_SYMBOL ASM_NAME(synth_1to1_s_neon_asm) - #ifdef __ELF__ - .type ASM_NAME(synth_1to1_s_neon_asm), %function - #endif ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_stereo_neon64.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_stereo_neon64.S -@@ -19,7 +19,6 @@ maxmin_s16: - .word -32768 - .text - ALIGN4 -- .globl ASM_NAME(synth_1to1_s_neon64_asm) - #ifdef __ELF__ - .type ASM_NAME(synth_1to1_s_neon64_asm), %function - #endif ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_stereo_neon64_accurate.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_stereo_neon64_accurate.S -@@ -19,7 +19,6 @@ maxmin_s16: - .word -956301312 - .text - ALIGN4 -- .globl ASM_NAME(synth_1to1_s_neon64_accurate_asm) - #ifdef __ELF__ - .type ASM_NAME(synth_1to1_s_neon64_accurate_asm), %function - #endif ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_stereo_neon64_float.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_stereo_neon64_float.S -@@ -18,7 +18,6 @@ scale: - .word 939524096 - .text - ALIGN4 -- .globl ASM_NAME(synth_1to1_real_s_neon64_asm) - #ifdef __ELF__ - .type ASM_NAME(synth_1to1_real_s_neon64_asm), %function - #endif ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_stereo_neon64_s32.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_stereo_neon64_s32.S -@@ -20,7 +20,6 @@ maxmin_s32: - .word 1199570944 - .text - ALIGN4 -- .globl ASM_NAME(synth_1to1_s32_s_neon64_asm) - #ifdef __ELF__ - .type ASM_NAME(synth_1to1_s32_s_neon64_asm), %function - #endif ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_stereo_neon_accurate.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_stereo_neon_accurate.S -@@ -24,7 +24,6 @@ - #endif - - .text -- .globl ASM_NAME(synth_1to1_s_neon_accurate_asm) - #ifdef __ELF__ - .type ASM_NAME(synth_1to1_s_neon_accurate_asm), %function - #endif ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_stereo_neon_float.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_stereo_neon_float.S -@@ -26,7 +26,6 @@ - #endif - - .text -- GLOBAL_SYMBOL ASM_NAME(synth_1to1_real_s_neon_asm) - #ifdef __ELF__ - .type ASM_NAME(synth_1to1_real_s_neon_asm), %function - #endif ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_stereo_neon_s32.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_stereo_neon_s32.S -@@ -26,7 +26,6 @@ - #endif - - .text -- GLOBAL_SYMBOL ASM_NAME(synth_1to1_s32_s_neon_asm) - #ifdef __ELF__ - .type ASM_NAME(synth_1to1_s32_s_neon_asm), %function - #endif ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_stereo_sse_accurate.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_stereo_sse_accurate.S -@@ -42,7 +42,6 @@ maxmin_s16: - .long -956301312 - .text - ALIGN16 --.globl ASM_NAME(synth_1to1_s_sse_accurate_asm) - ASM_NAME(synth_1to1_s_sse_accurate_asm): - pushl %ebp - movl %esp, %ebp ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_stereo_sse_float.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_stereo_sse_float.S -@@ -37,7 +37,6 @@ scale_sse: - .long 939524096 - .text - ALIGN16 --.globl ASM_NAME(synth_1to1_real_s_sse_asm) - ASM_NAME(synth_1to1_real_s_sse_asm): - pushl %ebp - movl %esp, %ebp ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_stereo_sse_s32.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_stereo_sse_s32.S -@@ -48,7 +48,6 @@ maxmin_s32: - .long -956301312 - .text - ALIGN16 --.globl ASM_NAME(synth_1to1_s32_s_sse_asm) - ASM_NAME(synth_1to1_s32_s_sse_asm): - pushl %ebp - movl %esp, %ebp ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_stereo_x86_64.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_stereo_x86_64.S -@@ -55,7 +55,6 @@ ASM_NAME(maxmin_x86_64): - .long -32769 - .text - ALIGN16 --.globl ASM_NAME(synth_1to1_s_x86_64_asm) - ASM_NAME(synth_1to1_s_x86_64_asm): - #ifdef IS_MSABI /* should save xmm6-15 */ - movl 40(%rsp), %eax /* 5th argument; placed after 32-byte shadow space */ ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_stereo_x86_64_accurate.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_stereo_x86_64_accurate.S -@@ -54,7 +54,6 @@ ASM_NAME(maxmin_s16): - .long -956301312 - .text - ALIGN16 --.globl ASM_NAME(synth_1to1_s_x86_64_accurate_asm) - ASM_NAME(synth_1to1_s_x86_64_accurate_asm): - #ifdef IS_MSABI /* should save xmm6-15 */ - movl 40(%rsp), %eax /* 5th argument; placed after 32-byte shadow space */ ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_stereo_x86_64_float.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_stereo_x86_64_float.S -@@ -48,7 +48,6 @@ ASM_NAME(scale_x86_64): - .long 939524096 - .text - ALIGN16 --.globl ASM_NAME(synth_1to1_real_s_x86_64_asm) - ASM_NAME(synth_1to1_real_s_x86_64_asm): - #ifdef IS_MSABI /* should save xmm6-15 */ - movl 40(%rsp), %eax /* 5th argument; placed after 32-byte shadow space */ ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_stereo_x86_64_s32.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_stereo_x86_64_s32.S -@@ -61,7 +61,6 @@ ASM_NAME(maxmin_s32): - .long -956301312 - .text - ALIGN16 --.globl ASM_NAME(synth_1to1_s32_s_x86_64_asm) - ASM_NAME(synth_1to1_s32_s_x86_64_asm): - #ifdef IS_MSABI /* should save xmm6-15 */ - movl 40(%rsp), %eax /* 5th argument; placed after 32-byte shadow space */ ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_x86_64.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_x86_64.S -@@ -55,7 +55,6 @@ ASM_NAME(maxmin_x86_64): - .long -32769 - .text - ALIGN16 --.globl ASM_NAME(synth_1to1_x86_64_asm) - ASM_NAME(synth_1to1_x86_64_asm): - #ifdef IS_MSABI /* should save xmm6-15 */ - movq %rcx, ARG0 ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_x86_64_accurate.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_x86_64_accurate.S -@@ -54,7 +54,6 @@ ASM_NAME(maxmin_s16): - .long -956301312 - .text - ALIGN16 --.globl ASM_NAME(synth_1to1_x86_64_accurate_asm) - ASM_NAME(synth_1to1_x86_64_accurate_asm): - #ifdef IS_MSABI /* should save xmm6-15 */ - movq %rcx, ARG0 ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_x86_64_float.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_x86_64_float.S -@@ -48,7 +48,6 @@ ASM_NAME(scale_x86_64): - .long 939524096 - .text - ALIGN16 --.globl ASM_NAME(synth_1to1_real_x86_64_asm) - ASM_NAME(synth_1to1_real_x86_64_asm): - #ifdef IS_MSABI /* should save xmm6-15 */ - movq %rcx, ARG0 ---- mpg123-static-1.29.3.orig/src/libmpg123/synth_x86_64_s32.S -+++ mpg123-static-1.29.3/src/libmpg123/synth_x86_64_s32.S -@@ -61,7 +61,6 @@ ASM_NAME(maxmin_s32): - .long -956301312 - .text - ALIGN16 --.globl ASM_NAME(synth_1to1_s32_x86_64_asm) - ASM_NAME(synth_1to1_s32_x86_64_asm): - #ifdef IS_MSABI /* should save xmm6-15 */ - movq %rcx, ARG0 ---- mpg123-static-1.29.3.orig/src/libmpg123/tabinit_mmx.S -+++ mpg123-static-1.29.3/src/libmpg123/tabinit_mmx.S -@@ -12,7 +12,6 @@ - - .data - ALIGN32 --.globl ASM_NAME(costab_mmxsse) - ASM_NAME(costab_mmxsse): - .long 1056974725 - .long 1057056395 -@@ -86,7 +85,6 @@ intwindiv: - .text - ALIGN32 - /* void make_decode_tables_mmx_asm(long scaleval, float* decwin_mmx, float *decwins); */ --.globl ASM_NAME(make_decode_tables_mmx_asm) - ASM_NAME(make_decode_tables_mmx_asm): - pushl %ebp - mov %esp,%ebp diff --git a/sources/libs/mpg123-static/debian/patches/series b/sources/libs/mpg123-static/debian/patches/series index 4a44be1..5b7a358 100644 --- a/sources/libs/mpg123-static/debian/patches/series +++ b/sources/libs/mpg123-static/debian/patches/series @@ -1,2 +1 @@ 01_skip-standalone-tools.patch -02_hidden-api.patch diff --git a/sources/libs/mpg123-static/debian/rules b/sources/libs/mpg123-static/debian/rules index 68802c8..014a281 100755 --- a/sources/libs/mpg123-static/debian/rules +++ b/sources/libs/mpg123-static/debian/rules @@ -3,14 +3,6 @@ KXSTUDIO_NO_FASTMATH = y include /usr/share/dpkg/kxstudio.mk -ifeq ($(DEB_HOST_ARCH),armhf) -EXTRA_CONFIG = --with-cpu=arm_nofpu -else ifeq ($(DEB_HOST_ARCH),arm64) -EXTRA_CONFIG = --with-cpu=generic_nofpu -else -EXTRA_CONFIG = --with-cpu=x86-64 -endif - override_dh_auto_configure: ./configure --disable-maintainer-mode \ --prefix=/opt/kxstudio \ @@ -18,6 +10,7 @@ override_dh_auto_configure: --disable-shared \ --enable-lfs-alias \ --with-audio=dummy \ + -with-cpu=generic_nofpu \ $(EXTRA_CONFIG) override_dh_auto_install: diff --git a/sources/libs/serd-static/debian/clean b/sources/libs/serd-static/debian/clean new file mode 100644 index 0000000..72de718 --- /dev/null +++ b/sources/libs/serd-static/debian/clean @@ -0,0 +1,13 @@ +.lock-waf_linux_build +.lock-waf_linux2_build +build/.lock-waf_linux_build +build/.lock-waf_linux2_build +build/.wafpickle-* +build/c4che/_cache.py +build/c4che/build.config.py +build/config.log +__pycache__/*.pyc +waflib/*.pyc +waflib/*/*.pyc +waflib/__pycache__/*.pyc +waflib/*/__pycache__/*.pyc diff --git a/sources/libs/sord-static/debian/clean b/sources/libs/sord-static/debian/clean new file mode 100644 index 0000000..72de718 --- /dev/null +++ b/sources/libs/sord-static/debian/clean @@ -0,0 +1,13 @@ +.lock-waf_linux_build +.lock-waf_linux2_build +build/.lock-waf_linux_build +build/.lock-waf_linux2_build +build/.wafpickle-* +build/c4che/_cache.py +build/c4che/build.config.py +build/config.log +__pycache__/*.pyc +waflib/*.pyc +waflib/*/*.pyc +waflib/__pycache__/*.pyc +waflib/*/__pycache__/*.pyc diff --git a/sources/libs/sratom-static/debian/clean b/sources/libs/sratom-static/debian/clean new file mode 100644 index 0000000..72de718 --- /dev/null +++ b/sources/libs/sratom-static/debian/clean @@ -0,0 +1,13 @@ +.lock-waf_linux_build +.lock-waf_linux2_build +build/.lock-waf_linux_build +build/.lock-waf_linux2_build +build/.wafpickle-* +build/c4che/_cache.py +build/c4che/build.config.py +build/config.log +__pycache__/*.pyc +waflib/*.pyc +waflib/*/*.pyc +waflib/__pycache__/*.pyc +waflib/*/__pycache__/*.pyc diff --git a/sources/plugins/lsp-plugins/debian/changelog b/sources/plugins/lsp-plugins/debian/changelog index fdf258f..9b08fa4 100644 --- a/sources/plugins/lsp-plugins/debian/changelog +++ b/sources/plugins/lsp-plugins/debian/changelog @@ -1,4 +1,4 @@ -lsp-plugins (6:1.2.1-1kxstudio1) focal; urgency=medium +lsp-plugins (6:1.2.1-1kxstudio2) focal; urgency=medium * Initial package diff --git a/sources/plugins/lsp-plugins/debian/clean b/sources/plugins/lsp-plugins/debian/clean new file mode 100644 index 0000000..e7355d1 --- /dev/null +++ b/sources/plugins/lsp-plugins/debian/clean @@ -0,0 +1 @@ +.config.mk diff --git a/sources/plugins/lsp-plugins/debian/control b/sources/plugins/lsp-plugins/debian/control index 69dac96..9fc5046 100644 --- a/sources/plugins/lsp-plugins/debian/control +++ b/sources/plugins/lsp-plugins/debian/control @@ -5,6 +5,7 @@ Maintainer: falkTX Build-Depends: debhelper-compat (= 13), kxstudio-audio-plugin-tester (>= 9), libcairo-dev, + libfreetype-dev, libgl1-mesa-dev, libglu1-mesa-dev, libjack-jackd2-dev | libjack-dev, diff --git a/sources/plugins/lsp-plugins/debian/rules b/sources/plugins/lsp-plugins/debian/rules index 735728d..ce0ad07 100755 --- a/sources/plugins/lsp-plugins/debian/rules +++ b/sources/plugins/lsp-plugins/debian/rules @@ -16,13 +16,8 @@ endif export EXE_FLAGS = $(LDFLAGS) export SO_FLAGS = $(LDFLAGS) -# handy if we want to hide symbols, still does not work though.. :( -# export CFLAGS += -DLSP_DSP_LIB_BUILTIN -DLSP_DSP_UNITS_BUILTIN -# export CXXFLAGS += -DLSP_DSP_LIB_BUILTIN -DLSP_DSP_UNITS_BUILTIN - -# FIXME https://github.com/sadko4u/lsp-plugins/issues/253 -export LV2LINT_SKIP = y -export LV2LINT_EXTRA_FLAGS = -s 'INT123_*' +# FIXME a lib is causing leaks +export VALGRIND_EXTRA_ARGS = --leak-check=no %: dh $@ @@ -51,6 +46,5 @@ override_dh_auto_install: override_dh_install: dh_install - - # FIXME http://lsp-plug.in/plugins/lv2/art_delay_mono has memory leaks, also symbol exports - #$(call kxstudio_audio_plugin_test) + # FIXME Fails due to memory issues, https://github.com/lsp-plugins/lsp-plugins-crossover/issues/2 + # $(call kxstudio_audio_plugin_test)