From 9301c4b3afae04c8ea297b7d622df4851f683b9f Mon Sep 17 00:00:00 2001 From: James Cowgill Date: Mon, 24 Sep 2018 09:25:41 +0100 Subject: Add symbol versions to the libmodplug compat library This should ensure there are no symbol collisions if both the original libmodplug and our libopenmpt-modplug libraries are loaded at the same time. Forwarded: no Gbp-Pq: Name 01_libmodplug_symver.patch --- Makefile.am | 2 +- libmodplug/libmodplug.ver | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 libmodplug/libmodplug.ver diff --git a/Makefile.am b/Makefile.am index 8f16c63..62da033 100644 --- a/Makefile.am +++ b/Makefile.am @@ -380,7 +380,7 @@ libopenmpt_la_SOURCES += libopenmpt/libopenmpt_version.h if ENABLE_LIBOPENMPT_MODPLUG lib_LTLIBRARIES += libopenmpt_modplug.la -libopenmpt_modplug_la_LDFLAGS = -version-info 1:0:0 -no-undefined +libopenmpt_modplug_la_LDFLAGS = -version-info 1:0:0 -no-undefined -Wl,--version-script=libmodplug/libmodplug.ver libopenmpt_modplug_la_CPPFLAGS = -I$(srcdir)/ libopenmpt_modplug_la_CXXFLAGS = libopenmpt_modplug_la_CFLAGS = diff --git a/libmodplug/libmodplug.ver b/libmodplug/libmodplug.ver new file mode 100644 index 0000000..eb0a17e --- /dev/null +++ b/libmodplug/libmodplug.ver @@ -0,0 +1,8 @@ +LIBOPENMPT_MODPLUG1 { +global: + ModPlug_*; + _ZN10CSoundFile*; + _ZNK10CSoundFile*; +local: + *; +}; -- cgit v1.2.3 From cfe8d78849bbedc5e0dd55de15f38454ea45d6c1 Mon Sep 17 00:00:00 2001 From: James Cowgill Date: Mon, 22 Oct 2018 09:46:13 +0100 Subject: Add symbol versions to the libmodplug compat library This should ensure there are no symbol collisions if both the original libmodplug and our libopenmpt-modplug libraries are loaded at the same time. Forwarded: no Gbp-Pq: Name 01_libmodplug_symver.patch --- Makefile.am | 2 +- libmodplug/libmodplug.ver | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 libmodplug/libmodplug.ver diff --git a/Makefile.am b/Makefile.am index 8f16c63..62da033 100644 --- a/Makefile.am +++ b/Makefile.am @@ -380,7 +380,7 @@ libopenmpt_la_SOURCES += libopenmpt/libopenmpt_version.h if ENABLE_LIBOPENMPT_MODPLUG lib_LTLIBRARIES += libopenmpt_modplug.la -libopenmpt_modplug_la_LDFLAGS = -version-info 1:0:0 -no-undefined +libopenmpt_modplug_la_LDFLAGS = -version-info 1:0:0 -no-undefined -Wl,--version-script=libmodplug/libmodplug.ver libopenmpt_modplug_la_CPPFLAGS = -I$(srcdir)/ libopenmpt_modplug_la_CXXFLAGS = libopenmpt_modplug_la_CFLAGS = diff --git a/libmodplug/libmodplug.ver b/libmodplug/libmodplug.ver new file mode 100644 index 0000000..eb0a17e --- /dev/null +++ b/libmodplug/libmodplug.ver @@ -0,0 +1,8 @@ +LIBOPENMPT_MODPLUG1 { +global: + ModPlug_*; + _ZN10CSoundFile*; + _ZNK10CSoundFile*; +local: + *; +}; -- cgit v1.2.3 From dba9252fa30ad1d355c86a78377e14cabbd764ad Mon Sep 17 00:00:00 2001 From: James Cowgill Date: Mon, 24 Dec 2018 21:43:58 +0000 Subject: Add symbol versions to the libmodplug compat library Forwarded: no This should ensure there are no symbol collisions if both the original libmodplug and our libopenmpt-modplug libraries are loaded at the same time. Gbp-Pq: Name 01_libmodplug_symver.patch --- Makefile.am | 2 +- libmodplug/libmodplug.ver | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 libmodplug/libmodplug.ver diff --git a/Makefile.am b/Makefile.am index 90a056d..63cb05b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -392,7 +392,7 @@ libopenmpt_la_SOURCES += libopenmpt/libopenmpt_version.h if ENABLE_LIBOPENMPT_MODPLUG lib_LTLIBRARIES += libopenmpt_modplug.la -libopenmpt_modplug_la_LDFLAGS = -version-info 1:0:0 -no-undefined +libopenmpt_modplug_la_LDFLAGS = -version-info 1:0:0 -no-undefined -Wl,--version-script=libmodplug/libmodplug.ver libopenmpt_modplug_la_CPPFLAGS = $(MINGWSTDTHREADS_CPPFLAGS) -I$(srcdir)/ libopenmpt_modplug_la_CXXFLAGS = libopenmpt_modplug_la_CFLAGS = diff --git a/libmodplug/libmodplug.ver b/libmodplug/libmodplug.ver new file mode 100644 index 0000000..eb0a17e --- /dev/null +++ b/libmodplug/libmodplug.ver @@ -0,0 +1,8 @@ +LIBOPENMPT_MODPLUG1 { +global: + ModPlug_*; + _ZN10CSoundFile*; + _ZNK10CSoundFile*; +local: + *; +}; -- cgit v1.2.3 From bc7fc82eea5de1fe55eb33fdba901205e4c415df Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Mon, 24 Dec 2018 21:43:58 +0000 Subject: Fix CSoundFile libmodplug compatibility API symbol visibility Origin: upstream, https://bugs.openmpt.org/file_download.php?file_id=325&type=bug Bug: https://bugs.openmpt.org/view.php?id=1180 Gbp-Pq: Name 02_libmodplug-no-exported-cpp-api-quickfix-v1.patch --- libopenmpt/libopenmpt_modplug_cpp.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libopenmpt/libopenmpt_modplug_cpp.cpp b/libopenmpt/libopenmpt_modplug_cpp.cpp index 131d0b3..20c83c5 100644 --- a/libopenmpt/libopenmpt_modplug_cpp.cpp +++ b/libopenmpt/libopenmpt_modplug_cpp.cpp @@ -51,8 +51,6 @@ Metadata and other state is not provided or updated. /* libmodplug C++ header is broken for MSVC DLL builds */ #define MODPLUG_STATIC #endif /* _MSC_VER */ -#include "libmodplug/stdafx.h" -#include "libmodplug/sndfile.h" #ifdef _MSC_VER #define LIBOPENMPT_MODPLUG_API @@ -60,6 +58,11 @@ Metadata and other state is not provided or updated. #define LIBOPENMPT_MODPLUG_API LIBOPENMPT_API_HELPER_EXPORT #endif /* _MSC_VER */ +class LIBOPENMPT_MODPLUG_API CSoundFile; + +#include "libmodplug/stdafx.h" +#include "libmodplug/sndfile.h" + namespace { template void Clear( T & x ) -- cgit v1.2.3 From f495b36423a7b90421b45a6bb2f5b3c6f19d83ae Mon Sep 17 00:00:00 2001 From: James Cowgill Date: Mon, 7 Jan 2019 19:11:44 +0000 Subject: Add symbol versions to the libmodplug compat library Forwarded: no This should ensure there are no symbol collisions if both the original libmodplug and our libopenmpt-modplug libraries are loaded at the same time. Forwarded: no Gbp-Pq: Name 01_libmodplug_symver.patch --- Makefile.am | 2 +- libmodplug/libmodplug.ver | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 libmodplug/libmodplug.ver diff --git a/Makefile.am b/Makefile.am index 90a056d..63cb05b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -392,7 +392,7 @@ libopenmpt_la_SOURCES += libopenmpt/libopenmpt_version.h if ENABLE_LIBOPENMPT_MODPLUG lib_LTLIBRARIES += libopenmpt_modplug.la -libopenmpt_modplug_la_LDFLAGS = -version-info 1:0:0 -no-undefined +libopenmpt_modplug_la_LDFLAGS = -version-info 1:0:0 -no-undefined -Wl,--version-script=libmodplug/libmodplug.ver libopenmpt_modplug_la_CPPFLAGS = $(MINGWSTDTHREADS_CPPFLAGS) -I$(srcdir)/ libopenmpt_modplug_la_CXXFLAGS = libopenmpt_modplug_la_CFLAGS = diff --git a/libmodplug/libmodplug.ver b/libmodplug/libmodplug.ver new file mode 100644 index 0000000..eb0a17e --- /dev/null +++ b/libmodplug/libmodplug.ver @@ -0,0 +1,8 @@ +LIBOPENMPT_MODPLUG1 { +global: + ModPlug_*; + _ZN10CSoundFile*; + _ZNK10CSoundFile*; +local: + *; +}; -- cgit v1.2.3 From 2a7cc13ce762672cdb4ae6c78c71c291140ac8fe Mon Sep 17 00:00:00 2001 From: James Cowgill Date: Wed, 23 Jan 2019 09:26:13 +0000 Subject: Add symbol versions to the libmodplug compat library Forwarded: no This should ensure there are no symbol collisions if both the original libmodplug and our libopenmpt-modplug libraries are loaded at the same time. Forwarded: no Gbp-Pq: Name 01_libmodplug_symver.patch --- Makefile.am | 2 +- libmodplug/libmodplug.ver | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 libmodplug/libmodplug.ver diff --git a/Makefile.am b/Makefile.am index 90a056d..63cb05b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -392,7 +392,7 @@ libopenmpt_la_SOURCES += libopenmpt/libopenmpt_version.h if ENABLE_LIBOPENMPT_MODPLUG lib_LTLIBRARIES += libopenmpt_modplug.la -libopenmpt_modplug_la_LDFLAGS = -version-info 1:0:0 -no-undefined +libopenmpt_modplug_la_LDFLAGS = -version-info 1:0:0 -no-undefined -Wl,--version-script=libmodplug/libmodplug.ver libopenmpt_modplug_la_CPPFLAGS = $(MINGWSTDTHREADS_CPPFLAGS) -I$(srcdir)/ libopenmpt_modplug_la_CXXFLAGS = libopenmpt_modplug_la_CFLAGS = diff --git a/libmodplug/libmodplug.ver b/libmodplug/libmodplug.ver new file mode 100644 index 0000000..eb0a17e --- /dev/null +++ b/libmodplug/libmodplug.ver @@ -0,0 +1,8 @@ +LIBOPENMPT_MODPLUG1 { +global: + ModPlug_*; + _ZN10CSoundFile*; + _ZNK10CSoundFile*; +local: + *; +}; -- cgit v1.2.3