Page MenuHomeSolus
Files F11042199

D13190.id32241.diff
No OneTemporary
Actions

D13190.id32241.diff
View Options

diff --git a/MAINTAINERS.md b/MAINTAINERS.md
new file mode 100644
--- /dev/null
+++ b/MAINTAINERS.md
@@ -0,0 +1,5 @@
+This file is used to indicate responsibility for the maintenance of this package. Individuals on this list should be the sole modifiers of the package, excluding cases where the Solus Team may need to perform necessary rebuilds, upgrades, or security fixes. This list should not be used for any direct contact usage. If you believe this package requires a package update, follow documentation from https://getsol.us/articles/packaging/request-a-package-update/en/. In the event this package no longer becomes sufficiently maintained, Core Team reserves the right to request a new maintainer or remove this package from the repository.
+
+- Benoît Rouits
+ - IRC: be1
+ - Email: brouits@free.fr
diff --git a/abi_libs b/abi_libs
--- a/abi_libs
+++ b/abi_libs
@@ -1,16 +1,11 @@
audioadapter.so
-inprocess.so
jack_alsa.so
jack_alsarawmidi.so
jack_dummy.so
jack_loopback.so
jack_net.so
-jack_net_master
-jack_net_slave
jack_netone.so
-jack_netsource
jack_proxy.so
-jack_server_control
jackd
jackdbus
libjack.so.0
diff --git a/abi_libs32 b/abi_libs32
--- a/abi_libs32
+++ b/abi_libs32
@@ -1,5 +1,4 @@
audioadapter.so
-inprocess.so
jack_alsa.so
jack_alsarawmidi.so
jack_dummy.so
diff --git a/abi_symbols b/abi_symbols
--- a/abi_symbols
+++ b/abi_symbols
@@ -1,13 +1,10 @@
+audioadapter.so:__bss_start
+audioadapter.so:_edata
+audioadapter.so:_end
audioadapter.so:jack_finish
audioadapter.so:jack_get_descriptor
audioadapter.so:jack_initialize
audioadapter.so:jack_internal_initialize
-inprocess.so:__bss_start
-inprocess.so:_edata
-inprocess.so:_end
-inprocess.so:inprocess
-inprocess.so:jack_finish
-inprocess.so:jack_initialize
jack_alsa.so:ClearOutput
jack_alsa.so:JACK_client_create_thread
jack_alsa.so:JACK_frame_time
@@ -49,6 +46,9 @@
jack_alsa.so:_ZNK4Jack14JackAlsaDriver15get_sample_rateEv
jack_alsa.so:_ZNK4Jack14JackAlsaDriver15last_frame_timeEv
jack_alsa.so:_ZThn8_N4Jack14JackAlsaDriver5CloseEv
+jack_alsa.so:__bss_start
+jack_alsa.so:_edata
+jack_alsa.so:_end
jack_alsa.so:alsa_driver_clock_sync_notify
jack_alsa.so:alsa_driver_delete
jack_alsa.so:alsa_driver_listen_for_clock_sync_status
@@ -85,6 +85,10 @@
jack_alsa.so:sample_move_d16_sSs
jack_alsa.so:sample_move_d24_sS
jack_alsa.so:sample_move_d24_sSs
+jack_alsa.so:sample_move_d32_sS
+jack_alsa.so:sample_move_d32_sSs
+jack_alsa.so:sample_move_d32l24_sS
+jack_alsa.so:sample_move_d32l24_sSs
jack_alsa.so:sample_move_d32u24_sS
jack_alsa.so:sample_move_d32u24_sSs
jack_alsa.so:sample_move_dS_floatLE
@@ -92,6 +96,10 @@
jack_alsa.so:sample_move_dS_s16s
jack_alsa.so:sample_move_dS_s24
jack_alsa.so:sample_move_dS_s24s
+jack_alsa.so:sample_move_dS_s32
+jack_alsa.so:sample_move_dS_s32l24
+jack_alsa.so:sample_move_dS_s32l24s
+jack_alsa.so:sample_move_dS_s32s
jack_alsa.so:sample_move_dS_s32u24
jack_alsa.so:sample_move_dS_s32u24s
jack_alsa.so:sample_move_dither_rect_d16_sS
@@ -168,14 +176,23 @@
jack_alsarawmidi.so:_ZThn8_N4Jack21JackALSARawMidiDriver5CloseEv
jack_alsarawmidi.so:_ZThn8_N4Jack21JackALSARawMidiDriverD0Ev
jack_alsarawmidi.so:_ZThn8_N4Jack21JackALSARawMidiDriverD1Ev
+jack_alsarawmidi.so:__bss_start
+jack_alsarawmidi.so:_edata
+jack_alsarawmidi.so:_end
jack_alsarawmidi.so:driver_get_descriptor
jack_alsarawmidi.so:driver_initialize
+jack_dummy.so:__bss_start
+jack_dummy.so:_edata
+jack_dummy.so:_end
jack_dummy.so:driver_get_descriptor
jack_dummy.so:driver_initialize
jack_loopback.so:_ZN4Jack18JackLoopbackDriver15ProcessReadSyncEv
jack_loopback.so:_ZN4Jack18JackLoopbackDriver16ProcessReadAsyncEv
jack_loopback.so:_ZN4Jack18JackLoopbackDriver16ProcessWriteSyncEv
jack_loopback.so:_ZN4Jack18JackLoopbackDriver17ProcessWriteAsyncEv
+jack_loopback.so:__bss_start
+jack_loopback.so:_edata
+jack_loopback.so:_end
jack_loopback.so:driver_get_descriptor
jack_loopback.so:driver_initialize
jack_net.so:_ZN4Jack13JackNetDriver10AllocPortsEv
@@ -206,14 +223,11 @@
jack_net.so:_ZThn8_N4Jack13JackNetDriver5CloseEv
jack_net.so:_ZThn8_N4Jack13JackNetDriverD0Ev
jack_net.so:_ZThn8_N4Jack13JackNetDriverD1Ev
+jack_net.so:__bss_start
+jack_net.so:_edata
+jack_net.so:_end
jack_net.so:driver_get_descriptor
jack_net.so:driver_initialize
-jack_net_master:__bss_start
-jack_net_master:_edata
-jack_net_master:_end
-jack_net_slave:__bss_start
-jack_net_slave:_edata
-jack_net_slave:_end
jack_netone.so:_ZN4Jack16JackNetOneDriver10AllocPortsEv
jack_netone.so:_ZN4Jack16JackNetOneDriver10InitializeEv
jack_netone.so:_ZN4Jack16JackNetOneDriver28render_jack_ports_to_payloadEiP7_JSListS2_jPvji
@@ -291,9 +305,6 @@
jack_netone.so:render_payload_to_jack_ports_celt
jack_netone.so:render_payload_to_jack_ports_float
jack_netone.so:render_payload_to_jack_ports_opus
-jack_netsource:__bss_start
-jack_netsource:_edata
-jack_netsource:_end
jack_proxy.so:_ZN4Jack15JackProxyDriver10AllocPortsEv
jack_proxy.so:_ZN4Jack15JackProxyDriver10InitializeEv
jack_proxy.so:_ZN4Jack15JackProxyDriver12ConnectPortsEv
@@ -323,11 +334,11 @@
jack_proxy.so:_ZThn8_N4Jack15JackProxyDriver5CloseEv
jack_proxy.so:_ZThn8_N4Jack15JackProxyDriverD0Ev
jack_proxy.so:_ZThn8_N4Jack15JackProxyDriverD1Ev
+jack_proxy.so:__bss_start
+jack_proxy.so:_edata
+jack_proxy.so:_end
jack_proxy.so:driver_get_descriptor
jack_proxy.so:driver_initialize
-jack_server_control:__bss_start
-jack_server_control:_edata
-jack_server_control:_end
jackd:__bss_start
jackd:_edata
jackd:_end
@@ -367,6 +378,7 @@
libjack.so.0:jack_disconnect
libjack.so.0:jack_drop_real_time_scheduling
libjack.so.0:jack_engine_takeover_timebase
+libjack.so.0:jack_error_callback
libjack.so.0:jack_frame_time
libjack.so.0:jack_frames_since_cycle_start
libjack.so.0:jack_frames_to_time
@@ -391,6 +403,7 @@
libjack.so.0:jack_get_version
libjack.so.0:jack_get_version_string
libjack.so.0:jack_get_xrun_delayed_usecs
+libjack.so.0:jack_info_callback
libjack.so.0:jack_internal_client_close
libjack.so.0:jack_internal_client_handle
libjack.so.0:jack_internal_client_load
diff --git a/abi_symbols32 b/abi_symbols32
--- a/abi_symbols32
+++ b/abi_symbols32
@@ -1,13 +1,10 @@
+audioadapter.so:__bss_start
+audioadapter.so:_edata
+audioadapter.so:_end
audioadapter.so:jack_finish
audioadapter.so:jack_get_descriptor
audioadapter.so:jack_initialize
audioadapter.so:jack_internal_initialize
-inprocess.so:__bss_start
-inprocess.so:_edata
-inprocess.so:_end
-inprocess.so:inprocess
-inprocess.so:jack_finish
-inprocess.so:jack_initialize
jack_alsa.so:ClearOutput
jack_alsa.so:JACK_client_create_thread
jack_alsa.so:JACK_frame_time
@@ -49,6 +46,9 @@
jack_alsa.so:_ZNK4Jack14JackAlsaDriver15get_sample_rateEv
jack_alsa.so:_ZNK4Jack14JackAlsaDriver15last_frame_timeEv
jack_alsa.so:_ZThn4_N4Jack14JackAlsaDriver5CloseEv
+jack_alsa.so:__bss_start
+jack_alsa.so:_edata
+jack_alsa.so:_end
jack_alsa.so:alsa_driver_clock_sync_notify
jack_alsa.so:alsa_driver_delete
jack_alsa.so:alsa_driver_listen_for_clock_sync_status
@@ -85,6 +85,10 @@
jack_alsa.so:sample_move_d16_sSs
jack_alsa.so:sample_move_d24_sS
jack_alsa.so:sample_move_d24_sSs
+jack_alsa.so:sample_move_d32_sS
+jack_alsa.so:sample_move_d32_sSs
+jack_alsa.so:sample_move_d32l24_sS
+jack_alsa.so:sample_move_d32l24_sSs
jack_alsa.so:sample_move_d32u24_sS
jack_alsa.so:sample_move_d32u24_sSs
jack_alsa.so:sample_move_dS_floatLE
@@ -92,6 +96,10 @@
jack_alsa.so:sample_move_dS_s16s
jack_alsa.so:sample_move_dS_s24
jack_alsa.so:sample_move_dS_s24s
+jack_alsa.so:sample_move_dS_s32
+jack_alsa.so:sample_move_dS_s32l24
+jack_alsa.so:sample_move_dS_s32l24s
+jack_alsa.so:sample_move_dS_s32s
jack_alsa.so:sample_move_dS_s32u24
jack_alsa.so:sample_move_dS_s32u24s
jack_alsa.so:sample_move_dither_rect_d16_sS
@@ -168,14 +176,23 @@
jack_alsarawmidi.so:_ZThn4_N4Jack21JackALSARawMidiDriver5CloseEv
jack_alsarawmidi.so:_ZThn4_N4Jack21JackALSARawMidiDriverD0Ev
jack_alsarawmidi.so:_ZThn4_N4Jack21JackALSARawMidiDriverD1Ev
+jack_alsarawmidi.so:__bss_start
+jack_alsarawmidi.so:_edata
+jack_alsarawmidi.so:_end
jack_alsarawmidi.so:driver_get_descriptor
jack_alsarawmidi.so:driver_initialize
+jack_dummy.so:__bss_start
+jack_dummy.so:_edata
+jack_dummy.so:_end
jack_dummy.so:driver_get_descriptor
jack_dummy.so:driver_initialize
jack_loopback.so:_ZN4Jack18JackLoopbackDriver15ProcessReadSyncEv
jack_loopback.so:_ZN4Jack18JackLoopbackDriver16ProcessReadAsyncEv
jack_loopback.so:_ZN4Jack18JackLoopbackDriver16ProcessWriteSyncEv
jack_loopback.so:_ZN4Jack18JackLoopbackDriver17ProcessWriteAsyncEv
+jack_loopback.so:__bss_start
+jack_loopback.so:_edata
+jack_loopback.so:_end
jack_loopback.so:driver_get_descriptor
jack_loopback.so:driver_initialize
jack_net.so:_ZN4Jack13JackNetDriver10AllocPortsEv
@@ -206,6 +223,9 @@
jack_net.so:_ZThn4_N4Jack13JackNetDriver5CloseEv
jack_net.so:_ZThn4_N4Jack13JackNetDriverD0Ev
jack_net.so:_ZThn4_N4Jack13JackNetDriverD1Ev
+jack_net.so:__bss_start
+jack_net.so:_edata
+jack_net.so:_end
jack_net.so:driver_get_descriptor
jack_net.so:driver_initialize
jack_netone.so:_ZN4Jack16JackNetOneDriver10AllocPortsEv
@@ -314,6 +334,9 @@
jack_proxy.so:_ZThn4_N4Jack15JackProxyDriver5CloseEv
jack_proxy.so:_ZThn4_N4Jack15JackProxyDriverD0Ev
jack_proxy.so:_ZThn4_N4Jack15JackProxyDriverD1Ev
+jack_proxy.so:__bss_start
+jack_proxy.so:_edata
+jack_proxy.so:_end
jack_proxy.so:driver_get_descriptor
jack_proxy.so:driver_initialize
libjack.so.0:JACK_METADATA_CONNECTED
@@ -349,6 +372,7 @@
libjack.so.0:jack_disconnect
libjack.so.0:jack_drop_real_time_scheduling
libjack.so.0:jack_engine_takeover_timebase
+libjack.so.0:jack_error_callback
libjack.so.0:jack_frame_time
libjack.so.0:jack_frames_since_cycle_start
libjack.so.0:jack_frames_to_time
@@ -373,6 +397,7 @@
libjack.so.0:jack_get_version
libjack.so.0:jack_get_version_string
libjack.so.0:jack_get_xrun_delayed_usecs
+libjack.so.0:jack_info_callback
libjack.so.0:jack_internal_client_close
libjack.so.0:jack_internal_client_handle
libjack.so.0:jack_internal_client_load
diff --git a/abi_used_libs b/abi_used_libs
--- a/abi_used_libs
+++ b/abi_used_libs
@@ -8,8 +8,6 @@
libgcc_s.so.1
libm.so.6
libopus.so.0
-libreadline.so.8
libsamplerate.so.0
-libsndfile.so.1
libstdc++.so.6
libsystemd.so.0
diff --git a/abi_used_symbols b/abi_used_symbols
--- a/abi_used_symbols
+++ b/abi_used_symbols
@@ -50,7 +50,6 @@
libasound.so.2:snd_midi_event_new
libasound.so.2:snd_midi_event_reset_decode
libasound.so.2:snd_midi_event_reset_encode
-libasound.so.2:snd_pcm_avail
libasound.so.2:snd_pcm_avail_update
libasound.so.2:snd_pcm_close
libasound.so.2:snd_pcm_drop
@@ -61,27 +60,24 @@
libasound.so.2:snd_pcm_hw_params_any
libasound.so.2:snd_pcm_hw_params_free
libasound.so.2:snd_pcm_hw_params_get_access
-libasound.so.2:snd_pcm_hw_params_get_buffer_size
libasound.so.2:snd_pcm_hw_params_get_channels
libasound.so.2:snd_pcm_hw_params_get_channels_max
libasound.so.2:snd_pcm_hw_params_get_format
libasound.so.2:snd_pcm_hw_params_get_period_size
libasound.so.2:snd_pcm_hw_params_get_rate
+libasound.so.2:snd_pcm_hw_params_get_sbits
libasound.so.2:snd_pcm_hw_params_malloc
libasound.so.2:snd_pcm_hw_params_set_access
libasound.so.2:snd_pcm_hw_params_set_buffer_size
-libasound.so.2:snd_pcm_hw_params_set_buffer_time_near
libasound.so.2:snd_pcm_hw_params_set_channels
libasound.so.2:snd_pcm_hw_params_set_channels_near
libasound.so.2:snd_pcm_hw_params_set_format
libasound.so.2:snd_pcm_hw_params_set_period_size
-libasound.so.2:snd_pcm_hw_params_set_period_time_near
libasound.so.2:snd_pcm_hw_params_set_periods
libasound.so.2:snd_pcm_hw_params_set_periods_integer
libasound.so.2:snd_pcm_hw_params_set_periods_min
libasound.so.2:snd_pcm_hw_params_set_periods_near
libasound.so.2:snd_pcm_hw_params_set_rate_near
-libasound.so.2:snd_pcm_hw_params_sizeof
libasound.so.2:snd_pcm_info_get_name
libasound.so.2:snd_pcm_info_set_device
libasound.so.2:snd_pcm_info_set_stream
@@ -98,8 +94,6 @@
libasound.so.2:snd_pcm_prepare
libasound.so.2:snd_pcm_readi
libasound.so.2:snd_pcm_readn
-libasound.so.2:snd_pcm_resume
-libasound.so.2:snd_pcm_rewind
libasound.so.2:snd_pcm_start
libasound.so.2:snd_pcm_status
libasound.so.2:snd_pcm_status_get_state
@@ -116,9 +110,6 @@
libasound.so.2:snd_pcm_sw_params_set_stop_threshold
libasound.so.2:snd_pcm_sw_params_set_tstamp_mode
libasound.so.2:snd_pcm_sw_params_set_tstamp_type
-libasound.so.2:snd_pcm_sw_params_set_xfer_align
-libasound.so.2:snd_pcm_sw_params_sizeof
-libasound.so.2:snd_pcm_wait
libasound.so.2:snd_pcm_writei
libasound.so.2:snd_pcm_writen
libasound.so.2:snd_rawmidi_close
@@ -213,7 +204,6 @@
libc.so.6:__stack_chk_fail
libc.so.6:__stpcpy_chk
libc.so.6:__strcpy_chk
-libc.so.6:__vfprintf_chk
libc.so.6:__vsnprintf_chk
libc.so.6:__vsprintf_chk
libc.so.6:_exit
@@ -224,7 +214,6 @@
libc.so.6:calloc
libc.so.6:chmod
libc.so.6:chown
-libc.so.6:clock
libc.so.6:clock_gettime
libc.so.6:clock_nanosleep
libc.so.6:close
@@ -248,17 +237,14 @@
libc.so.6:fopen
libc.so.6:fork
libc.so.6:fputc
-libc.so.6:fputs
libc.so.6:free
libc.so.6:ftruncate
libc.so.6:fwrite
-libc.so.6:getc
libc.so.6:getenv
libc.so.6:geteuid
libc.so.6:getgrnam_r
libc.so.6:gethostbyname
libc.so.6:gethostname
-libc.so.6:getopt
libc.so.6:getopt_long
libc.so.6:getpid
libc.so.6:getsockopt
@@ -326,10 +312,8 @@
libc.so.6:pthread_setschedparam
libc.so.6:pthread_setspecific
libc.so.6:pthread_sigmask
-libc.so.6:putc
libc.so.6:putchar
libc.so.6:puts
-libc.so.6:rand
libc.so.6:read
libc.so.6:readdir
libc.so.6:realloc
@@ -343,10 +327,8 @@
libc.so.6:sched_get_priority_max
libc.so.6:sched_get_priority_min
libc.so.6:sem_close
-libc.so.6:sem_destroy
libc.so.6:sem_init
libc.so.6:sem_post
-libc.so.6:sem_trywait
libc.so.6:sem_wait
libc.so.6:semget
libc.so.6:semop
@@ -363,7 +345,6 @@
libc.so.6:sigemptyset
libc.so.6:sigfillset
libc.so.6:sigismember
-libc.so.6:signal
libc.so.6:sigprocmask
libc.so.6:sigwait
libc.so.6:sleep
@@ -371,7 +352,6 @@
libc.so.6:socket
libc.so.6:stat
libc.so.6:stderr
-libc.so.6:stdin
libc.so.6:stdout
libc.so.6:strcasecmp
libc.so.6:strchr
@@ -387,9 +367,7 @@
libc.so.6:strncpy
libc.so.6:strndup
libc.so.6:strrchr
-libc.so.6:strspn
libc.so.6:strstr
-libc.so.6:strtod
libc.so.6:strtok
libc.so.6:strtok_r
libc.so.6:strtol
@@ -476,47 +454,30 @@
libexpat.so.1:XML_SetElementHandler
libexpat.so.1:XML_SetUserData
libgcc_s.so.1:_Unwind_Resume
-libm.so.6:atan2f
-libm.so.6:ceilf
libm.so.6:cos
libm.so.6:floorf
-libm.so.6:hypotf
+libm.so.6:fmax
+libm.so.6:fmin
libm.so.6:logf
+libm.so.6:lrint
libm.so.6:lrintf
libm.so.6:lroundf
-libm.so.6:pow
libm.so.6:powf
-libm.so.6:round
-libm.so.6:sin
-libm.so.6:sincosf
-libm.so.6:sinf
-libm.so.6:trunc
libopus.so.0:opus_custom_decode_float
libopus.so.0:opus_custom_decoder_create
libopus.so.0:opus_custom_decoder_destroy
-libopus.so.0:opus_custom_decoder_init
libopus.so.0:opus_custom_encode_float
libopus.so.0:opus_custom_encoder_create
libopus.so.0:opus_custom_encoder_ctl
libopus.so.0:opus_custom_encoder_destroy
-libopus.so.0:opus_custom_encoder_init
libopus.so.0:opus_custom_mode_create
libopus.so.0:opus_custom_mode_destroy
-libreadline.so.8:add_history
-libreadline.so.8:readline
-libreadline.so.8:rl_cleanup_after_signal
-libreadline.so.8:rl_completion_entry_function
-libreadline.so.8:rl_readline_name
libsamplerate.so.0:src_delete
libsamplerate.so.0:src_new
libsamplerate.so.0:src_process
libsamplerate.so.0:src_reset
libsamplerate.so.0:src_set_ratio
libsamplerate.so.0:src_strerror
-libsndfile.so.1:sf_close
-libsndfile.so.1:sf_error_str
-libsndfile.so.1:sf_open
-libsndfile.so.1:sf_writef_float
libstdc++.so.6:_ZNKSt12__basic_fileIcE7is_openEv
libstdc++.so.6:_ZNKSt13runtime_error4whatEv
libstdc++.so.6:_ZNKSt5ctypeIcE13_M_widen_initEv
@@ -582,7 +543,6 @@
libstdc++.so.6:_ZTISt13runtime_error
libstdc++.so.6:_ZTISt9bad_alloc
libstdc++.so.6:_ZTISt9exception
-libstdc++.so.6:_ZTIi
libstdc++.so.6:_ZTTNSt7__cxx1119basic_istringstreamIcSt11char_traitsIcESaIcEEE
libstdc++.so.6:_ZTTSt14basic_ifstreamIcSt11char_traitsIcEE
libstdc++.so.6:_ZTTSt14basic_ofstreamIcSt11char_traitsIcEE
@@ -606,7 +566,6 @@
libstdc++.so.6:__cxa_demangle
libstdc++.so.6:__cxa_end_catch
libstdc++.so.6:__cxa_free_exception
-libstdc++.so.6:__cxa_guard_abort
libstdc++.so.6:__cxa_guard_acquire
libstdc++.so.6:__cxa_guard_release
libstdc++.so.6:__cxa_rethrow
diff --git a/abi_used_symbols32 b/abi_used_symbols32
--- a/abi_used_symbols32
+++ b/abi_used_symbols32
@@ -65,6 +65,7 @@
libasound.so.2:snd_pcm_hw_params_get_format
libasound.so.2:snd_pcm_hw_params_get_period_size
libasound.so.2:snd_pcm_hw_params_get_rate
+libasound.so.2:snd_pcm_hw_params_get_sbits
libasound.so.2:snd_pcm_hw_params_malloc
libasound.so.2:snd_pcm_hw_params_set_access
libasound.so.2:snd_pcm_hw_params_set_buffer_size
@@ -396,7 +397,10 @@
libgcc_s.so.1:__udivmoddi4
libm.so.6:cos
libm.so.6:floorf
+libm.so.6:fmax
+libm.so.6:fmin
libm.so.6:logf
+libm.so.6:lrint
libm.so.6:lrintf
libm.so.6:lroundf
libm.so.6:powf
diff --git a/files/0001-Force-fix-for-libdb-mixed-mode-build.patch b/files/0001-Force-fix-for-libdb-mixed-mode-build.patch
deleted file mode 100644
--- a/files/0001-Force-fix-for-libdb-mixed-mode-build.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From a39d2df15e13bc406f780ae6e91c7c1a61b68f76 Mon Sep 17 00:00:00 2001
-From: falkTX <falktx@falktx.com>
-Date: Tue, 3 Dec 2019 12:31:06 +0000
-Subject: [PATCH] Force fix for libdb mixed mode build
-
-Signed-off-by: falkTX <falktx@falktx.com>
----
- common/JackMetadata.h | 6 ++++++
- wscript | 3 ++-
- 2 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/common/JackMetadata.h b/common/JackMetadata.h
-index 7469737a..a6cf18f9 100644
---- a/common/JackMetadata.h
-+++ b/common/JackMetadata.h
-@@ -24,6 +24,12 @@
- #include "config.h"
- #endif
-
-+// libdb does not work in 32bit mixed mode
-+#ifdef BUILD_WITH_32_64
-+#undef HAVE_DB
-+#define HAVE_DB 0
-+#endif
-+
- #include <stdint.h>
-
- #if HAVE_DB
-diff --git a/wscript b/wscript
-index dbae6cac..3a187d8f 100644
---- a/wscript
-+++ b/wscript
-@@ -392,8 +392,9 @@ def configure(conf):
-
- if Options.options.mixed:
- conf.setenv(lib32, env=conf.env.derive())
-- conf.env.append_unique('CXXFLAGS', '-m32')
- conf.env.append_unique('CFLAGS', '-m32')
-+ conf.env.append_unique('CXXFLAGS', '-m32')
-+ conf.env.append_unique('CXXFLAGS', '-DBUILD_WITH_32_64')
- conf.env.append_unique('LINKFLAGS', '-m32')
- if Options.options.libdir32:
- conf.env['LIBDIR'] = Options.options.libdir32
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,8 +1,8 @@
name : jack-audio-connection-kit
-version : 1.9.14
-release : 14
+version : 1.9.21
+release : 15
source :
- - https://github.com/jackaudio/jack2/archive/v1.9.14.tar.gz : a20a32366780c0061fd58fbb5f09e514ea9b7ce6e53b080a44b11a558a83217c
+ - https://github.com/jackaudio/jack2/archive/refs/tags/v1.9.21.tar.gz : 8b044a40ba5393b47605a920ba30744fdf8bf77d210eca90d39c8637fe6bc65d
homepage : https://jackaudio.org/
license :
- GPL-2.0-or-later
@@ -28,7 +28,6 @@
- db5-32bit-devel
- readline-32bit-devel
setup : |
- %patch -p1 < $pkgfiles/0001-Force-fix-for-libdb-mixed-mode-build.patch
%waf_configure --libdir=%libdir% \
--systemd-unit \
--classic \
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -3,8 +3,8 @@
<Name>jack-audio-connection-kit</Name>
<Homepage>https://jackaudio.org/</Homepage>
<Packager>
- <Name>Joey Riches</Name>
- <Email>josephriches@gmail.com</Email>
+ <Name>Benoît Rouits</Name>
+ <Email>brouits@free.fr</Email>
</Packager>
<License>GPL-2.0-or-later</License>
<License>LGPL-2.1-or-later</License>
@@ -23,51 +23,11 @@
<Files>
<Path fileType="config">/etc/jack/example.conf</Path>
<Path fileType="config">/etc/security/limits.d/audio.conf</Path>
- <Path fileType="executable">/usr/bin/alsa_in</Path>
- <Path fileType="executable">/usr/bin/alsa_out</Path>
- <Path fileType="executable">/usr/bin/jack_alias</Path>
- <Path fileType="executable">/usr/bin/jack_bufsize</Path>
- <Path fileType="executable">/usr/bin/jack_connect</Path>
<Path fileType="executable">/usr/bin/jack_control</Path>
- <Path fileType="executable">/usr/bin/jack_cpu</Path>
- <Path fileType="executable">/usr/bin/jack_cpu_load</Path>
- <Path fileType="executable">/usr/bin/jack_disconnect</Path>
- <Path fileType="executable">/usr/bin/jack_evmon</Path>
- <Path fileType="executable">/usr/bin/jack_freewheel</Path>
- <Path fileType="executable">/usr/bin/jack_iodelay</Path>
- <Path fileType="executable">/usr/bin/jack_latent_client</Path>
- <Path fileType="executable">/usr/bin/jack_load</Path>
- <Path fileType="executable">/usr/bin/jack_lsp</Path>
- <Path fileType="executable">/usr/bin/jack_metro</Path>
- <Path fileType="executable">/usr/bin/jack_midi_dump</Path>
- <Path fileType="executable">/usr/bin/jack_midi_latency_test</Path>
- <Path fileType="executable">/usr/bin/jack_midiseq</Path>
- <Path fileType="executable">/usr/bin/jack_midisine</Path>
- <Path fileType="executable">/usr/bin/jack_monitor_client</Path>
- <Path fileType="executable">/usr/bin/jack_multiple_metro</Path>
- <Path fileType="executable">/usr/bin/jack_net_master</Path>
- <Path fileType="executable">/usr/bin/jack_net_slave</Path>
- <Path fileType="executable">/usr/bin/jack_netsource</Path>
- <Path fileType="executable">/usr/bin/jack_property</Path>
- <Path fileType="executable">/usr/bin/jack_rec</Path>
- <Path fileType="executable">/usr/bin/jack_samplerate</Path>
- <Path fileType="executable">/usr/bin/jack_server_control</Path>
- <Path fileType="executable">/usr/bin/jack_session_notify</Path>
- <Path fileType="executable">/usr/bin/jack_showtime</Path>
- <Path fileType="executable">/usr/bin/jack_simdtests</Path>
- <Path fileType="executable">/usr/bin/jack_simple_client</Path>
- <Path fileType="executable">/usr/bin/jack_simple_session_client</Path>
- <Path fileType="executable">/usr/bin/jack_test</Path>
- <Path fileType="executable">/usr/bin/jack_thru</Path>
- <Path fileType="executable">/usr/bin/jack_transport</Path>
- <Path fileType="executable">/usr/bin/jack_unload</Path>
- <Path fileType="executable">/usr/bin/jack_wait</Path>
- <Path fileType="executable">/usr/bin/jack_zombie</Path>
<Path fileType="executable">/usr/bin/jackd</Path>
<Path fileType="executable">/usr/bin/jackdbus</Path>
<Path fileType="library">/usr/lib/systemd/user/jack@.service</Path>
<Path fileType="library">/usr/lib64/jack/audioadapter.so</Path>
- <Path fileType="library">/usr/lib64/jack/inprocess.so</Path>
<Path fileType="library">/usr/lib64/jack/jack_alsa.so</Path>
<Path fileType="library">/usr/lib64/jack/jack_alsarawmidi.so</Path>
<Path fileType="library">/usr/lib64/jack/jack_dummy.so</Path>
@@ -85,28 +45,7 @@
<Path fileType="library">/usr/lib64/libjackserver.so.0</Path>
<Path fileType="library">/usr/lib64/libjackserver.so.0.1.0</Path>
<Path fileType="data">/usr/share/dbus-1/services/org.jackaudio.service</Path>
- <Path fileType="man">/usr/share/man/man1/alsa_in.1</Path>
- <Path fileType="man">/usr/share/man/man1/alsa_out.1</Path>
- <Path fileType="man">/usr/share/man/man1/jack_bufsize.1</Path>
- <Path fileType="man">/usr/share/man/man1/jack_connect.1</Path>
- <Path fileType="man">/usr/share/man/man1/jack_disconnect.1</Path>
- <Path fileType="man">/usr/share/man/man1/jack_freewheel.1</Path>
- <Path fileType="man">/usr/share/man/man1/jack_impulse_grabber.1</Path>
- <Path fileType="man">/usr/share/man/man1/jack_iodelay.1</Path>
- <Path fileType="man">/usr/share/man/man1/jack_load.1</Path>
- <Path fileType="man">/usr/share/man/man1/jack_lsp.1</Path>
- <Path fileType="man">/usr/share/man/man1/jack_metro.1</Path>
- <Path fileType="man">/usr/share/man/man1/jack_monitor_client.1</Path>
- <Path fileType="man">/usr/share/man/man1/jack_netsource.1</Path>
- <Path fileType="man">/usr/share/man/man1/jack_property.1</Path>
- <Path fileType="man">/usr/share/man/man1/jack_samplerate.1</Path>
- <Path fileType="man">/usr/share/man/man1/jack_showtime.1</Path>
- <Path fileType="man">/usr/share/man/man1/jack_simple_client.1</Path>
- <Path fileType="man">/usr/share/man/man1/jack_transport.1</Path>
- <Path fileType="man">/usr/share/man/man1/jack_unload.1</Path>
- <Path fileType="man">/usr/share/man/man1/jack_wait.1</Path>
<Path fileType="man">/usr/share/man/man1/jackd.1</Path>
- <Path fileType="man">/usr/share/man/man1/jackrec.1</Path>
</Files>
</Package>
<Package>
@@ -116,11 +55,10 @@
</Description>
<PartOf>emul32</PartOf>
<RuntimeDependencies>
- <Dependency release="14">jack-audio-connection-kit</Dependency>
+ <Dependency release="15">jack-audio-connection-kit</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib32/jack/audioadapter.so</Path>
- <Path fileType="library">/usr/lib32/jack/inprocess.so</Path>
<Path fileType="library">/usr/lib32/jack/jack_alsa.so</Path>
<Path fileType="library">/usr/lib32/jack/jack_alsarawmidi.so</Path>
<Path fileType="library">/usr/lib32/jack/jack_dummy.so</Path>
@@ -146,8 +84,8 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="14">jack-audio-connection-kit-32bit</Dependency>
- <Dependency release="14">jack-audio-connection-kit-devel</Dependency>
+ <Dependency release="15">jack-audio-connection-kit-32bit</Dependency>
+ <Dependency release="15">jack-audio-connection-kit-devel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib32/libjack.so</Path>
@@ -163,7 +101,7 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="14">jack-audio-connection-kit</Dependency>
+ <Dependency release="15">jack-audio-connection-kit</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/jack/control.h</Path>
@@ -190,12 +128,12 @@
</Files>
</Package>
<History>
- <Update release="14">
- <Date>2022-03-24</Date>
- <Version>1.9.14</Version>
+ <Update release="15">
+ <Date>2022-05-02</Date>
+ <Version>1.9.21</Version>
<Comment>Packaging update</Comment>
- <Name>Joey Riches</Name>
- <Email>josephriches@gmail.com</Email>
+ <Name>Benoît Rouits</Name>
+ <Email>brouits@free.fr</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 11, 5:49 AM (14 h, 53 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5791651
Default Alt Text
D13190.id32241.diff (27 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.