Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package fluidsynth for openSUSE:Factory
checked in at 2022-09-08 14:21:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/fluidsynth (Old)
and /work/SRC/openSUSE:Factory/.fluidsynth.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fluidsynth"
Thu Sep 8 14:21:45 2022 rev:68 rq:1001722 version:2.2.9
Changes:
--------
--- /work/SRC/openSUSE:Factory/fluidsynth/fluidsynth.changes 2022-07-12
11:12:04.339669618 +0200
+++ /work/SRC/openSUSE:Factory/.fluidsynth.new.2083/fluidsynth.changes
2022-09-08 14:21:58.938437516 +0200
@@ -1,0 +2,11 @@
+Tue Sep 6 11:48:15 UTC 2022 - Tom Mbrt <tom.m...@googlemail.com>
+
+- Update to 2.2.9:
+ * Fix regression in WinMIDI driver introduced in 2.2.8
+ * Tracks cannot be restarted in MIDI player after reaching EOT
+ * Add a system-wide configuration file for Windows
+ * Harden systemd service file
+ * Dependency libs for precompiled Android binaries have been updated
+- Remove harden_fluidsynth.service.patch as it has been addressed upstream
+
+-------------------------------------------------------------------
Old:
----
fluidsynth-2.2.8.tar.gz
harden_fluidsynth.service.patch
New:
----
fluidsynth-2.2.9.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fluidsynth.spec ++++++
--- /var/tmp/diff_new_pack.Q7jBaQ/_old 2022-09-08 14:21:59.514438845 +0200
+++ /var/tmp/diff_new_pack.Q7jBaQ/_new 2022-09-08 14:21:59.522438864 +0200
@@ -18,7 +18,7 @@
%define sover 3
Name: fluidsynth
-Version: 2.2.8
+Version: 2.2.9
Release: 0
Summary: A Real-Time Software Synthesizer That Uses Soundfont(tm)
License: LGPL-2.1-or-later
@@ -28,7 +28,6 @@
Source1: %{name}.conf
Source2: %{name}.service
Source1000: baselibs.conf
-Patch0: harden_fluidsynth.service.patch
BuildRequires: cmake >= 3.1.0
BuildRequires: gcc-c++
BuildRequires: ladspa-devel
++++++ fluidsynth-2.2.8.tar.gz -> fluidsynth-2.2.9.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fluidsynth-2.2.8/.azure/azure-pipelines-android.yml
new/fluidsynth-2.2.9/.azure/azure-pipelines-android.yml
--- old/fluidsynth-2.2.8/.azure/azure-pipelines-android.yml 2022-07-10
00:05:56.000000000 +0200
+++ new/fluidsynth-2.2.9/.azure/azure-pipelines-android.yml 2022-09-05
17:49:28.000000000 +0200
@@ -31,20 +31,20 @@
always: true
variables:
- ICONV_VERSION: '1.16'
+ ICONV_VERSION: '1.17'
# Use recent master libffi, because 3.3 is broken: checking host system
type... Invalid configuration `arm-none-linux-eabi': machine `arm-none-linux'
not recognized
FFI_VERSION: '3.4.2'
GETTEXT_VERSION: '0.21'
- #need to switch to meson build system to use a more recent version
- GLIB_VERSION: '2.58'
+ GLIB_VERSION: '2.72'
GLIB_EXTRAVERSION: '3'
- OBOE_VERSION: '1.5.0'
- SNDFILE_VERSION: '1.0.31'
+ OBOE_VERSION: '1.6.1'
+ SNDFILE_VERSION: '1.1.0'
INSTPATCH_VERSION: '1.1.6'
VORBIS_VERSION: '1.3.7'
OGG_VERSION: '1.3.5'
OPUS_VERSION: '1.3.1'
FLAC_VERSION: '1.3.4'
+ PCRE_VERSION: '8.45'
# Android NDK sources and standalone toolchain is put here
DEV: '$(System.DefaultWorkingDirectory)/android-build-root'
@@ -53,7 +53,7 @@
# Must be the same as $ANDROID_NDK_HOME see:
#
https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-README.md
# We cannot use $ANDROID_NDK_HOME because this is an environment variable,
but here, we need a compile-time constant.
- NDK: '/usr/local/lib/android/sdk/ndk-bundle'
+ NDK: '/usr/local/lib/android/sdk/ndk/25.1.8937393'
# All the built binaries, libs and their headers will be installed here
PREFIX: '$(DEV)/opt/android'
@@ -80,10 +80,10 @@
# Tell configure what flags Android requires.
# Turn Wimplicit-function-declaration into errors. Else autotools will be
fooled when checking for available functions (that in fact are NOT available)
and compilation will fail later on.
- # Also disable clangs integrated assembler, as the hand written assembly of
libffi is not recognized by it, cf. https://crbug.com/801303
CFLAGS: "-fPIE -fPIC -I$(PREFIX)/include --sysroot=$(NDK_TOOLCHAIN)/sysroot
-I$(NDK_TOOLCHAIN)/sysroot/usr/include -Werror=implicit-function-declaration"
CXXFLAGS: $(CFLAGS)
CPPFLAGS: $(CXXFLAGS)
+ DEBIAN_FRONTEND: 'noninteractive'
ARTIFACT_NAME: 'fluidsynth-android$(ANDROID_API)'
@@ -96,33 +96,33 @@
ANDROID_ARCH: 'armv7a'
ANDROID_ABI_CMAKE: 'armeabi-v7a'
ANDROID_TARGET_ABI: "eabi"
+ ANDROID_ABI_MESON: 'arm'
# the --target to be used by autotools
AUTOTOOLS_TARGET: "$(ARCH)-linux-android$(ANDROID_TARGET_ABI)"
- #AUTOTOOLS_TARGET: "$(ARCH)-none-linux-$(ANDROID_TARGET_ABI)"
AARCH64:
ARCH: 'aarch64'
ANDROID_ARCH: 'aarch64'
ANDROID_ABI_CMAKE: 'arm64-v8a'
ANDROID_TARGET_ABI:
+ ANDROID_ABI_MESON: 'aarch64'
AUTOTOOLS_TARGET: "$(ARCH)-none-linux-android"
- #AUTOTOOLS_TARGET: "$(ARCH)-none-linux"
i686:
ARCH: 'i686'
ANDROID_ARCH: 'i686'
ANDROID_ABI_CMAKE: 'x86'
ANDROID_TARGET_ABI:
+ ANDROID_ABI_MESON: 'x86'
AUTOTOOLS_TARGET: "$(ARCH)-pc-linux-android"
- #AUTOTOOLS_TARGET: "$(ARCH)-pc-linux"
x86_64:
ARCH: 'x86_64'
ANDROID_ARCH: 'x86_64'
ANDROID_ABI_CMAKE: 'x86_64'
ANDROID_TARGET_ABI:
+ ANDROID_ABI_MESON: 'x86_64'
AUTOTOOLS_TARGET: "$(ARCH)-pc-linux-android"
- #AUTOTOOLS_TARGET: "$(ARCH)-pc-linux"
pool:
- vmImage: 'ubuntu-20.04'
+ vmImage: 'ubuntu-22.04'
steps:
- script: |
@@ -131,6 +131,15 @@
displayName: 'mkdir $(DEV)'
- script: |
+ sudo apt-get update -y
+ displayName: 'Update apt'
+
+ - script: |
+ set -ex
+ sudo -E apt-get -y --no-install-suggests --no-install-recommends
install wget tar bzip2 xz-utils ca-certificates
+ displayName: 'apt-get install wget tar'
+
+ - script: |
set -ex
wget
http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${ICONV_VERSION}.tar.gz
@@ -148,8 +157,8 @@
wget -O oboe-${OBOE_VERSION}.tar.gz
https://github.com/google/oboe/archive/${OBOE_VERSION}.tar.gz
tar zxf oboe-${OBOE_VERSION}.tar.gz
- wget
https://github.com/libsndfile/libsndfile/releases/download/${SNDFILE_VERSION}/libsndfile-${SNDFILE_VERSION}.tar.bz2
- tar jxf libsndfile-${SNDFILE_VERSION}.tar.bz2
+ wget
https://github.com/libsndfile/libsndfile/releases/download/${SNDFILE_VERSION}/libsndfile-${SNDFILE_VERSION}.tar.xz
+ tar xf libsndfile-${SNDFILE_VERSION}.tar.xz
wget -O libinstpatch-${INSTPATCH_VERSION}.tar.gz
https://github.com/swami/libinstpatch/archive/refs/tags/v${INSTPATCH_VERSION}.tar.gz
tar zxf libinstpatch-${INSTPATCH_VERSION}.tar.gz
@@ -166,12 +175,19 @@
wget -O opus-${OPUS_VERSION}.tar.gz
https://github.com/xiph/opus/archive/refs/tags/v${OPUS_VERSION}.tar.gz
tar xf opus-${OPUS_VERSION}.tar.gz
+ wget -O pcre-${PCRE_VERSION}.tar.bz2
https://sourceforge.net/projects/pcre/files/pcre/${PCRE_VERSION}/pcre-${PCRE_VERSION}.tar.bz2/download
+ tar jxf pcre-${PCRE_VERSION}.tar.bz2
+ cd pcre-${PCRE_VERSION}
+ # CMake checks for existence of strtoq() using the C compiler - and
yes, it does exist!
+ # Later on, it's actually used by the C++ compiler, where it does not
exist.
+ # Rename the function so CMake won't find it.
+ sed -i 's/strtoq/strtoqqqq/g' CMakeLists.txt
displayName: 'Download Dependencies'
workingDirectory: $(DEV)
- task: Cache@2
inputs:
- key: '$(ARCH) | $(DEV)/*.tar.gz | cacheVersion3'
+ key: '$(ARCH) | $(DEV)/*.tar.*'
path: '$(PREFIX)'
cacheHitVar: 'CACHE_RESTORED'
displayName: 'Cache fluidsynth dependency libraries'
@@ -188,20 +204,16 @@
enabled: 'false'
- script: |
- sudo apt-get update -y
- displayName: 'Update apt'
- condition: and(succeeded(), ne(variables.CACHE_RESTORED, 'true'))
-
- - script: |
set -ex
- sudo -E apt-get -yq --no-install-suggests --no-install-recommends
install gettext cmake zlib1g-dev autogen automake autoconf libtool pkg-config
autotools-dev build-essential meson ninja-build
- displayName: 'apt-get install'
+ sudo -E apt-get -y --no-install-suggests --no-install-recommends
install gettext cmake zlib1g-dev autogen automake autoconf libtool pkg-config
autotools-dev build-essential meson ninja-build python3-distutils
+ displayName: 'apt-get install build-tools'
condition: and(succeeded(), ne(variables.CACHE_RESTORED, 'true'))
- script: |
set -ex
- ln -sfn $ANDROID_SDK_ROOT/ndk/21.4.7075529 $ANDROID_NDK_ROOT
- displayName: 'Use NDK r22'
+ ln -sfn $ANDROID_SDK_ROOT/ndk/25.0.8775105 $ANDROID_NDK_ROOT
+ displayName: 'Use NDK r25'
+ enabled: false
- script: |
set -e
@@ -225,7 +237,7 @@
echo "##vso[task.setvariable variable=LDFLAGS]$LDFLAGS"
# Tell configure what tools to use.
- export AR=${ANDROID_TARGET}-ar
+ export AR=llvm-ar
echo "##vso[task.setvariable variable=AR]$AR"
export AS=${ANDROID_TARGET_API}-clang
echo "##vso[task.setvariable variable=AS]$AS"
@@ -235,9 +247,9 @@
echo "##vso[task.setvariable variable=CXX]$CXX"
export LD=ld.lld
echo "##vso[task.setvariable variable=LD]$LD"
- export STRIP=${ANDROID_TARGET}-strip
+ export STRIP=llvm-strip
echo "##vso[task.setvariable variable=STRIP]$STRIP"
- export RANLIB=${ANDROID_TARGET}-ranlib
+ export RANLIB=llvm-ranlib
echo "##vso[task.setvariable variable=RANLIB]$RANLIB"
displayName: 'Set environment variables'
@@ -262,13 +274,21 @@
make -j$((`nproc`+1))
make install
popd
-
+
displayName: 'Compile libiconv'
workingDirectory: $(DEV)
condition: and(succeeded(), ne(variables.CACHE_RESTORED, 'true'))
- script: |
set -ex
+ pushd libiconv-${ICONV_VERSION}
+ cat config.log
+ displayName: 'libiconv config.log'
+ workingDirectory: $(DEV)
+ condition: and(failed(), ne(variables.CACHE_RESTORED, 'true'))
+
+ - script: |
+ set -ex
pushd libffi-${FFI_VERSION}
NOCONFIGURE=true autoreconf -v -i
@@ -285,102 +305,6 @@
- script: |
set -ex
- export PKGCFG=`which pkg-config`
- pushd glib-${GLIB_VERSION}.${GLIB_EXTRAVERSION}
-
- cat << EOF > cross-file.txt
- [host_machine]
- system = 'android'
- cpu_family = 'arm'
- cpu = 'arm'
- endian = 'little'
-
- [binaries]
- c = '${CC}'
- cpp = '${CXX}'
- ar = '${AR}'
- ld = '${LD}'
- strip = '${STRIP}'
- pkgconfig = '${PKGCFG}'
-
- [built-in options]
- c_std = 'c11'
- c_args = ['-fPIC','-I/home/git/work/ndk/builddir/out/include']
- cpp_args = ['-fPIC','-I/home/git/work/ndk/builddir/out/include']
- c_link_args = ['-fPIE','-L/home/git/work/ndk/builddir/out/lib']
-
- pkg_config_path = '${PKG_CONFIG_PATH}'
- EOF
-
- cat << EOF > native-file.txt
- [host_machine]
- system = 'linux'
- cpu_family = 'x86_64'
- cpu = 'x86_64'
- endian = 'little'
-
- [properties]
-
- [binaries]
- c = ['false']
- cpp = ['false']
- objc = ['false']
- objcpp = ['false']
- ar = ['false']
- pkgconfig = ['false']
- cmake = ['false']
- EOF
-
- cat native-file.txt
- cat cross-file.txt
-
- unset AR
- unset AS
- unset CC
- unset CFLAGS
- unset CPPFLAGS
- unset CPP
- unset CXXFLAGS
- unset CXX
- unset LDFLAGS
- unset LD
- unset STRIP
-
- meson \
- --cross-file cross-file.txt \
- --native-file native-file.txt \
- --prefix=${PREFIX} \
- --libdir=lib \
- -Ddebug=false \
- --default-library=both \
- -Doptimization=s \
- --backend=ninja \
- --wrap-mode=nodownload \
- -Dinternal_pcre=true \
- -Dlibmount=false \
- -Ddtrace=false \
- -Diconv=auto \
- -Dxattr=false \
- -Dgtk_doc=false \
- _builddir \
- .
- ninja
- popd
- displayName: 'Compile glib (meson)'
- workingDirectory: $(DEV)
- enabled: 'false'
-
- - script: |
- pushd glib-${GLIB_VERSION}.${GLIB_EXTRAVERSION}
- cat _builddir/meson-logs/meson-log.txt
- popd
- displayName: 'Meson LOG'
- workingDirectory: $(DEV)
- condition: failed()
- enabled: 'false'
-
- - script: |
- set -ex
pushd gettext-${GETTEXT_VERSION}
./configure \
@@ -407,69 +331,74 @@
workingDirectory: $(DEV)
condition: and(succeeded(), ne(variables.CACHE_RESTORED, 'true'))
+ - template: cmake-android.yml
+ parameters:
+ sourceDir: 'pcre-$(PCRE_VERSION)'
+ cmakeArgs: '-DPCRE_SUPPORT_UNICODE_PROPERTIES=1 -DPCRE_SUPPORT_UTF=1
-DPCRE_BUILD_PCRECPP=0 -DPCRE_BUILD_TESTS=0'
+
- script: |
set -ex
-
+ export PKGCFG=`which pkg-config`
pushd glib-${GLIB_VERSION}.${GLIB_EXTRAVERSION}
- cat << EOF > android.cache
- glib_cv_long_long_format=ll
- glib_cv_stack_grows=no
- glib_cv_sane_realloc=yes
- glib_cv_have_strlcpy=no
- glib_cv_va_val_copy=yes
- glib_cv_rtldglobal_broken=no
- glib_cv_uscore=no
- glib_cv_monotonic_clock=no
- ac_cv_func_nonposix_getpwuid_r=no
- ac_cv_func_posix_getpwuid_r=no
- ac_cv_func_posix_getgrgid_r=no
- glib_cv_use_pid_surrogate=yes
- ac_cv_func_printf_unix98=no
- ac_cv_func_vsnprintf_c99=yes
- ac_cv_func_realloc_0_nonnull=yes
- ac_cv_func_realloc_works=yes
+
+ cat << EOF > cross_file.ini
+ [host_machine]
+ system = 'android'
+ cpu_family = '${ANDROID_ABI_MESON}'
+ cpu = '${ANDROID_ARCH}'
+ endian = 'little'
+
+ [binaries]
+ c = '${NDK_TOOLCHAIN}/bin/${CC}'
+ cpp = '${NDK_TOOLCHAIN}/bin/${CXX}'
+ ar = '${NDK_TOOLCHAIN}/bin/${AR}'
+ as = '${NDK_TOOLCHAIN}/bin/${AS}'
+ ld = '${NDK_TOOLCHAIN}/bin/${LD}'
+ strip = '${NDK_TOOLCHAIN}/bin/${STRIP}'
+ ranlib = '${NDK_TOOLCHAIN}/bin/${RANLIB}'
+ pkgconfig = '${PKGCFG}'
+
+ [properties]
+ prefix = '${PREFIX}'
+ c_args = '${CFLAGS}'
+ cpp_args = '${CXXFLAGS}'
+ pkg_config_libdir = '${PKG_CONFIG_LIBDIR}'
+ c_link_args = '${LDFLAGS}'
+
+ [project options]
+ libmount = 'disabled'
+ xattr = false
+ selinux = 'disabled'
+ nls = 'disabled'
+ glib_debug = 'disabled'
+ glib_assert = false
+ glib_checks = false
+ libelf = 'disabled'
EOF
- # Unfortunately, libffi is not linked against libgobject when
compiling for aarch64, leading to the following error:
- #
- # /bin/bash ../libtool --tag=CC --mode=link
aarch64-linux-android23-clang -Wall -Wstrict-prototypes -Wno-bad-function-cast
-Werror=declaration-after-statement -Werror=missing-prototypes
-Werror=implicit-function-declaration -Werror=pointer-arith -Werror=init-self
-Werror=format=2 -Werror=missing-include-dirs -fPIE -fPIC
-I/home/vsts/work/1/s/android-build-root/opt/android/include
--sysroot=/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64//sysroot
-I/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64//sysroot/include
-Werror=implicit-function-declaration -fno-integrated-as -fno-strict-aliasing
-pie
-Wl,-rpath-link=-I/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64//sysroot/usr/lib
-L/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64//sysroot/usr/lib
-L/home/vsts/work/1/s/android-build-root/opt/android/lib
-L/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/l
inux-x86_64//lib -o gobject-query gobject-query.o ./libgobject-2.0.la
../glib/libglib-2.0.la -lintl -liconv
- # libtool: link: aarch64-linux-android23-clang -Wall
-Wstrict-prototypes -Wno-bad-function-cast -Werror=declaration-after-statement
-Werror=missing-prototypes -Werror=implicit-function-declaration
-Werror=pointer-arith -Werror=init-self -Werror=format=2
-Werror=missing-include-dirs -fPIE -fPIC
-I/home/vsts/work/1/s/android-build-root/opt/android/include
--sysroot=/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64//sysroot
-I/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64//sysroot/include
-Werror=implicit-function-declaration -fno-integrated-as -fno-strict-aliasing
-pie
-Wl,-rpath-link=-I/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64//sysroot/usr/lib
-o .libs/gobject-query gobject-query.o
-L/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64//sysroot/usr/lib
-L/home/vsts/work/1/s/android-build-root/opt/android/lib
-L/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/p
rebuilt/linux-x86_64//lib ./.libs/libgobject-2.0.so
../glib/.libs/libglib-2.0.so
/home/vsts/work/1/s/android-build-root/opt/android/lib/libintl.so
/home/vsts/work/1/s/android-build-root/opt/android/lib/libiconv.so -pthread
-L/home/vsts/work/1/s/android-build-root/opt/android/lib
- #
/usr/local/lib/android/sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64//bin/../lib/gcc/aarch64-linux-android/4.9.x/../../../../aarch64-linux-android/bin/ld:
warning: libffi.so, needed by ./.libs/libgobject-2.0.so, not found (try using
-rpath or -rpath-link)
- # ./.libs/libgobject-2.0.so: undefined reference to
`ffi_type_sint32@LIBFFI_BASE_8.0'
- # ./.libs/libgobject-2.0.so: undefined reference to
`ffi_prep_cif@LIBFFI_BASE_8.0'
- #
- # So, just add it to LDFLAGS to make sure it's always linked.
- # libz.so is also missing...
- #FFILIB=`pkg-config --libs libffi`
- #echo ${FFILIB}
- #export LDFLAGS="${LDFLAGS} ${FFILIB} -lz"
- #unset FFILIB
+ cat cross_file.ini
- chmod a-x android.cache
- NOCONFIGURE=true ./autogen.sh
- ./configure \
- --host=${ANDROID_TARGET} \
- --prefix=${PREFIX} \
- --libdir=${LIBPATH0} \
- --disable-dependency-tracking \
- --cache-file=android.cache \
- --enable-included-printf \
- --with-pcre=no \
- --enable-libmount=no \
- --enable-xattr=no \
- --with-libiconv=gnu \
- --disable-static \
- --enable-shared \
- --with-pic \
- --disable-maintainer-mode \
- --disable-silent-rules
- make -j$((`nproc`+1))
- make install
+ # When CC and CXX are set, then meson detects them as host compiler
(not cross compiler),
+ # so they tries to run arm binaries in x86. That's why sanity check is
failing, and that's
+ # why we have to use env -i.
+ # And we must explicitly set PKG_CONFIG_LIBDIR, because
pkg_config_libdir is only recognized by meson >= 0.54
+ env -i bash -c "export PATH && export
PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR) && meson setup build --cross-file
cross_file.ini --prefix=$(PREFIX)"
+ ninja -C build
+ ninja -C build install
popd
- displayName: 'Compile glib'
+ displayName: 'Compile glib (meson)'
workingDirectory: $(DEV)
condition: and(succeeded(), ne(variables.CACHE_RESTORED, 'true'))
+ - script: |
+ pushd glib-${GLIB_VERSION}.${GLIB_EXTRAVERSION}
+ ls -la build
+ cat build/meson-logs/meson-log.txt
+ popd
+ displayName: 'Meson LOG'
+ workingDirectory: $(DEV)
+ condition: and(succeededOrFailed(), ne(variables.CACHE_RESTORED, 'true'))
+
- template: cmake-android.yml
parameters:
sourceDir: 'libogg-$(OGG_VERSION)'
@@ -600,6 +529,8 @@
ls libvorbis.so
ls libvorbisenc.so
ls libvorbisfile.so
+ ls libpcre.so
+ ls libpcreposix.so
displayName: 'Verify all libs exist'
workingDirectory: '$(PREFIX)/lib'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fluidsynth-2.2.8/.azure/azure-pipelines-mac.yml
new/fluidsynth-2.2.9/.azure/azure-pipelines-mac.yml
--- old/fluidsynth-2.2.8/.azure/azure-pipelines-mac.yml 2022-07-10
00:05:56.000000000 +0200
+++ new/fluidsynth-2.2.9/.azure/azure-pipelines-mac.yml 2022-09-05
17:49:28.000000000 +0200
@@ -26,9 +26,6 @@
UnixLibs:
imageName: 'macos-11'
CMakeFlags: '-Denable-framework=0'
- 10_15:
- imageName: 'macOS-10.15'
- CMakeFlags: ''
11_0:
imageName: 'macos-11'
CMakeFlags: ''
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fluidsynth-2.2.8/.azure/cmake-android.yml
new/fluidsynth-2.2.9/.azure/cmake-android.yml
--- old/fluidsynth-2.2.8/.azure/cmake-android.yml 2022-07-10
00:05:56.000000000 +0200
+++ new/fluidsynth-2.2.9/.azure/cmake-android.yml 2022-09-05
17:49:28.000000000 +0200
@@ -11,7 +11,7 @@
default: $(DEV)
- name: condition
type: string
- default: ne(variables.CACHE_RESTORED, 'true')
+ default: and(succeeded(), ne(variables.CACHE_RESTORED, 'true'))
- name: installCommand
type: string
default: 'make install'
@@ -56,3 +56,12 @@
displayName: 'Compile ${{ parameters.sourceDir }}'
workingDirectory: ${{ parameters.workDir }}
condition: ${{ parameters.condition }}
+
+- script: |
+ ls -la ${{ parameters.sourceDir }}/build/CMakeFiles/
+ cat ${{ parameters.sourceDir }}/build/CMakeFiles/CMakeError.log
+ cat ${{ parameters.sourceDir }}/build/CMakeFiles/CMakeOutput.log
+ true
+ displayName: 'Print ${{ parameters.sourceDir }} Cmake Error Log'
+ condition: or(${{ parameters.condition }}, failed())
+ workingDirectory: ${{ parameters.workDir }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fluidsynth-2.2.8/.cirrus.yml
new/fluidsynth-2.2.9/.cirrus.yml
--- old/fluidsynth-2.2.8/.cirrus.yml 2022-07-10 00:05:56.000000000 +0200
+++ new/fluidsynth-2.2.9/.cirrus.yml 2022-09-05 17:49:28.000000000 +0200
@@ -3,9 +3,9 @@
name: FreeBSD
freebsd_instance:
matrix:
- image_family: freebsd-11-4
- image_family: freebsd-12-2
+ image_family: freebsd-12-3
image_family: freebsd-13-0
+ image_family: freebsd-13-1
install_script: pwd && ls -la && pkg update --force && pkg install -y
cmake glib alsa-lib ladspa portaudio pulseaudio pkgconf sdl2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fluidsynth-2.2.8/CMakeLists.txt
new/fluidsynth-2.2.9/CMakeLists.txt
--- old/fluidsynth-2.2.8/CMakeLists.txt 2022-07-10 00:05:56.000000000 +0200
+++ new/fluidsynth-2.2.9/CMakeLists.txt 2022-09-05 17:49:28.000000000 +0200
@@ -38,7 +38,7 @@
# FluidSynth package version
set ( FLUIDSYNTH_VERSION_MAJOR 2 )
set ( FLUIDSYNTH_VERSION_MINOR 2 )
-set ( FLUIDSYNTH_VERSION_MICRO 8 )
+set ( FLUIDSYNTH_VERSION_MICRO 9 )
set ( VERSION
"${FLUIDSYNTH_VERSION_MAJOR}.${FLUIDSYNTH_VERSION_MINOR}.${FLUIDSYNTH_VERSION_MICRO}"
)
set ( FLUIDSYNTH_VERSION "\"${VERSION}\"" )
@@ -53,7 +53,7 @@
# This is not exactly the same algorithm as the libtool one, but the results
are the same.
set ( LIB_VERSION_CURRENT 3 )
set ( LIB_VERSION_AGE 1 )
-set ( LIB_VERSION_REVISION 1 )
+set ( LIB_VERSION_REVISION 2 )
set ( LIB_VERSION_INFO
"${LIB_VERSION_CURRENT}.${LIB_VERSION_AGE}.${LIB_VERSION_REVISION}" )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fluidsynth-2.2.8/doc/fluidsynth-v20-devdoc.txt
new/fluidsynth-2.2.9/doc/fluidsynth-v20-devdoc.txt
--- old/fluidsynth-2.2.8/doc/fluidsynth-v20-devdoc.txt 2022-07-10
00:05:56.000000000 +0200
+++ new/fluidsynth-2.2.9/doc/fluidsynth-v20-devdoc.txt 2022-09-05
17:49:28.000000000 +0200
@@ -8,8 +8,8 @@
\author David Henningsson
\author Tom Moebert
\author Copyright © 2003-2022 Peter Hanappe, Conrad Berh??rster, Antoine
Schmitt, Pedro L??pez-Cabanillas, Josh Green, David Henningsson, Tom Moebert
-\version Revision 2.2.8
-\date 2022-07-10
+\version Revision 2.2.9
+\date 2022-09-05
All the source code examples in this document are in the public domain; you
can use them as you please. This document is licensed under the Creative
Commons Attribution-Share Alike 3.0 Unported License. To view a copy of this
license, visit https://creativecommons.org/licenses/by-sa/3.0/ . The FluidSynth
library is distributed under the GNU Lesser General Public License. A copy of
the GNU Lesser General Public License is contained in the FluidSynth package;
if not, visit https://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt or write
to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301 USA.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fluidsynth-2.2.8/fluidsynth.service.in
new/fluidsynth-2.2.9/fluidsynth.service.in
--- old/fluidsynth-2.2.8/fluidsynth.service.in 2022-07-10 00:05:56.000000000
+0200
+++ new/fluidsynth-2.2.9/fluidsynth.service.in 2022-09-05 17:49:28.000000000
+0200
@@ -4,6 +4,16 @@
After=sound.target
[Service]
+# added automatically, for details please see
+# https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort
+ProtectSystem=full
+ProtectHome=read-only
+ProtectHostname=true
+ProtectKernelTunables=true
+ProtectKernelModules=true
+ProtectKernelLogs=true
+ProtectControlGroups=true
+# end of automatic additions
Type=notify
NotifyAccess=main
EnvironmentFile=@FLUID_DAEMON_ENV_FILE@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fluidsynth-2.2.8/src/bindings/fluid_cmd.c
new/fluidsynth-2.2.9/src/bindings/fluid_cmd.c
--- old/fluidsynth-2.2.8/src/bindings/fluid_cmd.c 2022-07-10
00:05:56.000000000 +0200
+++ new/fluidsynth-2.2.9/src/bindings/fluid_cmd.c 2022-09-05
17:49:28.000000000 +0200
@@ -686,13 +686,23 @@
* @param len Length of \a buf
* @return Returns \a buf pointer or NULL if no system command file for this
system type.
*
- * Windows and MACOS9 do not have a system-wide config file currently. For
anything else it
+ * MACOS does not have a system-wide config file currently. Since fluidsynth
2.2.9, the config
+ * on Windows is @c "%PROGRAMDATA%\fluidsynth\fluidsynth.cfg". For anything
else it
* returns @c "/etc/fluidsynth.conf".
*/
char *
fluid_get_sysconf(char *buf, int len)
{
-#if defined(WIN32) || defined(MACOS9)
+#if defined(WIN32)
+ const char* program_data = getenv("ProgramData");
+ if(program_data == NULL || program_data[0] == '\0')
+ {
+ return NULL;
+ }
+
+ FLUID_SNPRINTF(buf, len, "%s\\fluidsynth\\fluidsynth.cfg", program_data);
+ return buf;
+#elif defined(MACOS9)
return NULL;
#else
FLUID_SNPRINTF(buf, len, "/etc/fluidsynth.conf");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fluidsynth-2.2.8/src/drivers/fluid_winmidi.c
new/fluidsynth-2.2.9/src/drivers/fluid_winmidi.c
--- old/fluidsynth-2.2.8/src/drivers/fluid_winmidi.c 2022-07-10
00:05:56.000000000 +0200
+++ new/fluidsynth-2.2.9/src/drivers/fluid_winmidi.c 2022-09-05
17:49:28.000000000 +0200
@@ -145,7 +145,7 @@
break;
case MIM_DATA:
- if(msg_param < 0xF0) /* Voice category message */
+ if(msg_type(msg_param) < 0xf0) /* Voice category message */
{
event.type = msg_type(msg_param);
event.channel = msg_chan(msg_param) + dev_infos->channel_map;
@@ -166,7 +166,7 @@
}
else /* System message */
{
- event.type = msg_param;
+ event.type = (unsigned char)(msg_param & 0xff);
}
(*dev->driver.handler)(dev->driver.data, &event);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fluidsynth-2.2.8/src/midi/fluid_midi.c
new/fluidsynth-2.2.9/src/midi/fluid_midi.c
--- old/fluidsynth-2.2.8/src/midi/fluid_midi.c 2022-07-10 00:05:56.000000000
+0200
+++ new/fluidsynth-2.2.9/src/midi/fluid_midi.c 2022-09-05 17:49:28.000000000
+0200
@@ -2116,6 +2116,7 @@
{
fluid_midi_event_set_channel(&mute_event, i);
player->playback_callback(player->playback_userdata,
&mute_event);
+ player->channel_isplaying[i] = FALSE;
}
}
fluid_atomic_int_set(&player->stopping, 0);
@@ -2153,16 +2154,17 @@
{
fluid_midi_event_set_channel(&mute_event, i);
player->playback_callback(player->playback_userdata,
&mute_event);
+ player->channel_isplaying[i] = FALSE;
}
}
}
for(i = 0; i < player->ntracks; i++)
{
+ fluid_track_send_events(player->track[i], synth, player,
player->cur_ticks, seek_ticks);
if(!fluid_track_eot(player->track[i]))
{
status = FLUID_PLAYER_PLAYING;
- fluid_track_send_events(player->track[i], synth, player,
player->cur_ticks, seek_ticks);
}
}
