commit 6786fa5a7bdf226c9985d29d8adb8962e7be9fd4 Author: Tim Biermann <tbier@posteo.de> Date: Sun Nov 13 11:28:39 2022 +0000 libtorrent-rasterbar: 1.2.11 -> 2.0.8 diff --git a/libtorrent-rasterbar/.footprint b/libtorrent-rasterbar/.footprint index 6de251119..f4bf13b73 100644 --- a/libtorrent-rasterbar/.footprint +++ b/libtorrent-rasterbar/.footprint @@ -4,49 +4,82 @@ drwxr-xr-x root/root usr/include/libtorrent/ -rw-r--r-- root/root usr/include/libtorrent/add_torrent_params.hpp -rw-r--r-- root/root usr/include/libtorrent/address.hpp -rw-r--r-- root/root usr/include/libtorrent/alert.hpp --rw-r--r-- root/root usr/include/libtorrent/alert_manager.hpp -rw-r--r-- root/root usr/include/libtorrent/alert_types.hpp -rw-r--r-- root/root usr/include/libtorrent/announce_entry.hpp -rw-r--r-- root/root usr/include/libtorrent/assert.hpp drwxr-xr-x root/root usr/include/libtorrent/aux_/ +-rw-r--r-- root/root usr/include/libtorrent/aux_/alert_manager.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/aligned_storage.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/aligned_union.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/alloca.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/allocating_handler.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/announce_entry.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/apply_pad_files.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/array.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/bandwidth_limit.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/bandwidth_manager.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/bandwidth_queue_entry.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/bandwidth_socket.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/bind_to_device.hpp --rw-r--r-- root/root usr/include/libtorrent/aux_/block_cache_reference.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/buffer.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/byteswap.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/chained_buffer.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/container_wrapper.hpp --rw-r--r-- root/root usr/include/libtorrent/aux_/cppint_import_export.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/cpuid.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/deferred_handler.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/deprecated.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/deque.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/dev_random.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/directory.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/disable_deprecation_warnings_push.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/disable_warnings_pop.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/disable_warnings_push.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/disk_buffer_pool.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/disk_io_thread_pool.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/disk_job_fence.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/disk_job_pool.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/drive_info.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/ed25519.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/escape_string.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/export.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/ffs.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/file_descriptor.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/file_pointer.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/file_progress.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/file_view_pool.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/generate_peer_id.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/has_block.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/hasher512.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/heterogeneous_queue.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/instantiate_connection.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/invariant_check.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/io.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/ip_helpers.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/ip_notifier.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/keepalive.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/listen_socket_handle.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/lsd.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/merkle.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/merkle_tree.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/mmap.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/mmap_disk_job.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/netlink_utils.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/noexcept_movable.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/numeric_cast.hpp --rw-r--r-- root/root usr/include/libtorrent/aux_/openssl.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/open_mode.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/packet_buffer.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/packet_pool.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/path.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/polymorphic_socket.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/pool.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/portmap.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/posix_part_file.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/posix_storage.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/proxy_settings.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/range.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/receive_buffer.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/resolver.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/resolver_interface.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/route.h -rw-r--r-- root/root usr/include/libtorrent/aux_/scope_end.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/session_call.hpp @@ -55,33 +88,36 @@ drwxr-xr-x root/root usr/include/libtorrent/aux_/ -rw-r--r-- root/root usr/include/libtorrent/aux_/session_settings.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/session_udp_sockets.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/set_socket_buffer.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/set_traffic_class.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/sha512.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/socket_type.hpp --rw-r--r-- root/root usr/include/libtorrent/aux_/storage_piece_set.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/storage_free_list.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/storage_utils.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/store_buffer.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/string_ptr.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/strview_less.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/suggest_piece.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/throw.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/time.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/timestamp_history.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/torrent_impl.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/torrent_list.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/unique_ptr.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/utp_socket_manager.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/utp_stream.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/vector.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/win_cng.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/win_crypto_provider.hpp +-rw-r--r-- root/root usr/include/libtorrent/aux_/win_file_handle.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/win_util.hpp -rw-r--r-- root/root usr/include/libtorrent/aux_/windows.hpp --rw-r--r-- root/root usr/include/libtorrent/bandwidth_limit.hpp --rw-r--r-- root/root usr/include/libtorrent/bandwidth_manager.hpp --rw-r--r-- root/root usr/include/libtorrent/bandwidth_queue_entry.hpp --rw-r--r-- root/root usr/include/libtorrent/bandwidth_socket.hpp -rw-r--r-- root/root usr/include/libtorrent/bdecode.hpp -rw-r--r-- root/root usr/include/libtorrent/bencode.hpp -rw-r--r-- root/root usr/include/libtorrent/bitfield.hpp --rw-r--r-- root/root usr/include/libtorrent/block_cache.hpp -rw-r--r-- root/root usr/include/libtorrent/bloom_filter.hpp --rw-r--r-- root/root usr/include/libtorrent/broadcast_socket.hpp -rw-r--r-- root/root usr/include/libtorrent/bt_peer_connection.hpp --rw-r--r-- root/root usr/include/libtorrent/buffer.hpp --rw-r--r-- root/root usr/include/libtorrent/chained_buffer.hpp -rw-r--r-- root/root usr/include/libtorrent/choker.hpp +-rw-r--r-- root/root usr/include/libtorrent/client_data.hpp -rw-r--r-- root/root usr/include/libtorrent/close_reason.hpp -rw-r--r-- root/root usr/include/libtorrent/config.hpp -rw-r--r-- root/root usr/include/libtorrent/copy_ptr.hpp @@ -89,16 +125,11 @@ drwxr-xr-x root/root usr/include/libtorrent/aux_/ -rw-r--r-- root/root usr/include/libtorrent/create_torrent.hpp -rw-r--r-- root/root usr/include/libtorrent/deadline_timer.hpp -rw-r--r-- root/root usr/include/libtorrent/debug.hpp +-rw-r--r-- root/root usr/include/libtorrent/disabled_disk_io.hpp -rw-r--r-- root/root usr/include/libtorrent/disk_buffer_holder.hpp --rw-r--r-- root/root usr/include/libtorrent/disk_buffer_pool.hpp -rw-r--r-- root/root usr/include/libtorrent/disk_interface.hpp --rw-r--r-- root/root usr/include/libtorrent/disk_io_job.hpp --rw-r--r-- root/root usr/include/libtorrent/disk_io_thread.hpp --rw-r--r-- root/root usr/include/libtorrent/disk_io_thread_pool.hpp --rw-r--r-- root/root usr/include/libtorrent/disk_job_pool.hpp -rw-r--r-- root/root usr/include/libtorrent/disk_observer.hpp -rw-r--r-- root/root usr/include/libtorrent/download_priority.hpp --rw-r--r-- root/root usr/include/libtorrent/ed25519.hpp -rw-r--r-- root/root usr/include/libtorrent/entry.hpp -rw-r--r-- root/root usr/include/libtorrent/enum_net.hpp -rw-r--r-- root/root usr/include/libtorrent/error.hpp @@ -109,15 +140,14 @@ drwxr-xr-x root/root usr/include/libtorrent/extensions/ -rw-r--r-- root/root usr/include/libtorrent/extensions/ut_metadata.hpp -rw-r--r-- root/root usr/include/libtorrent/extensions/ut_pex.hpp -rw-r--r-- root/root usr/include/libtorrent/file.hpp --rw-r--r-- root/root usr/include/libtorrent/file_pool.hpp +-rw-r--r-- root/root usr/include/libtorrent/file_layout.hpp -rw-r--r-- root/root usr/include/libtorrent/file_storage.hpp -rw-r--r-- root/root usr/include/libtorrent/fingerprint.hpp -rw-r--r-- root/root usr/include/libtorrent/flags.hpp -rw-r--r-- root/root usr/include/libtorrent/fwd.hpp -rw-r--r-- root/root usr/include/libtorrent/gzip.hpp +-rw-r--r-- root/root usr/include/libtorrent/hash_picker.hpp -rw-r--r-- root/root usr/include/libtorrent/hasher.hpp --rw-r--r-- root/root usr/include/libtorrent/hasher512.hpp --rw-r--r-- root/root usr/include/libtorrent/heterogeneous_queue.hpp -rw-r--r-- root/root usr/include/libtorrent/hex.hpp -rw-r--r-- root/root usr/include/libtorrent/http_connection.hpp -rw-r--r-- root/root usr/include/libtorrent/http_parser.hpp @@ -127,10 +157,10 @@ drwxr-xr-x root/root usr/include/libtorrent/extensions/ -rw-r--r-- root/root usr/include/libtorrent/i2p_stream.hpp -rw-r--r-- root/root usr/include/libtorrent/identify_client.hpp -rw-r--r-- root/root usr/include/libtorrent/index_range.hpp --rw-r--r-- root/root usr/include/libtorrent/invariant_check.hpp +-rw-r--r-- root/root usr/include/libtorrent/info_hash.hpp -rw-r--r-- root/root usr/include/libtorrent/io.hpp +-rw-r--r-- root/root usr/include/libtorrent/io_context.hpp -rw-r--r-- root/root usr/include/libtorrent/io_service.hpp --rw-r--r-- root/root usr/include/libtorrent/io_service_fwd.hpp -rw-r--r-- root/root usr/include/libtorrent/ip_filter.hpp -rw-r--r-- root/root usr/include/libtorrent/ip_voter.hpp drwxr-xr-x root/root usr/include/libtorrent/kademlia/ @@ -160,17 +190,17 @@ drwxr-xr-x root/root usr/include/libtorrent/kademlia/ -rw-r--r-- root/root usr/include/libtorrent/kademlia/sample_infohashes.hpp -rw-r--r-- root/root usr/include/libtorrent/kademlia/traversal_algorithm.hpp -rw-r--r-- root/root usr/include/libtorrent/kademlia/types.hpp --rw-r--r-- root/root usr/include/libtorrent/lazy_entry.hpp +-rw-r--r-- root/root usr/include/libtorrent/libtorrent.hpp -rw-r--r-- root/root usr/include/libtorrent/link.hpp --rw-r--r-- root/root usr/include/libtorrent/linked_list.hpp +-rw-r--r-- root/root usr/include/libtorrent/load_torrent.hpp -rw-r--r-- root/root usr/include/libtorrent/lsd.hpp -rw-r--r-- root/root usr/include/libtorrent/magnet_uri.hpp +-rw-r--r-- root/root usr/include/libtorrent/mmap_disk_io.hpp +-rw-r--r-- root/root usr/include/libtorrent/mmap_storage.hpp -rw-r--r-- root/root usr/include/libtorrent/natpmp.hpp -rw-r--r-- root/root usr/include/libtorrent/netlink.hpp -rw-r--r-- root/root usr/include/libtorrent/operations.hpp -rw-r--r-- root/root usr/include/libtorrent/optional.hpp --rw-r--r-- root/root usr/include/libtorrent/packet_buffer.hpp --rw-r--r-- root/root usr/include/libtorrent/packet_pool.hpp -rw-r--r-- root/root usr/include/libtorrent/parse_url.hpp -rw-r--r-- root/root usr/include/libtorrent/part_file.hpp -rw-r--r-- root/root usr/include/libtorrent/pe_crypto.hpp @@ -192,17 +222,16 @@ drwxr-xr-x root/root usr/include/libtorrent/kademlia/ -rw-r--r-- root/root usr/include/libtorrent/piece_picker.hpp -rw-r--r-- root/root usr/include/libtorrent/platform_util.hpp -rw-r--r-- root/root usr/include/libtorrent/portmap.hpp +-rw-r--r-- root/root usr/include/libtorrent/posix_disk_io.hpp -rw-r--r-- root/root usr/include/libtorrent/proxy_base.hpp -rw-r--r-- root/root usr/include/libtorrent/puff.hpp -rw-r--r-- root/root usr/include/libtorrent/random.hpp -rw-r--r-- root/root usr/include/libtorrent/read_resume_data.hpp --rw-r--r-- root/root usr/include/libtorrent/receive_buffer.hpp -rw-r--r-- root/root usr/include/libtorrent/request_blocks.hpp -rw-r--r-- root/root usr/include/libtorrent/resolve_links.hpp --rw-r--r-- root/root usr/include/libtorrent/resolver.hpp --rw-r--r-- root/root usr/include/libtorrent/resolver_interface.hpp -rw-r--r-- root/root usr/include/libtorrent/session.hpp -rw-r--r-- root/root usr/include/libtorrent/session_handle.hpp +-rw-r--r-- root/root usr/include/libtorrent/session_params.hpp -rw-r--r-- root/root usr/include/libtorrent/session_settings.hpp -rw-r--r-- root/root usr/include/libtorrent/session_stats.hpp -rw-r--r-- root/root usr/include/libtorrent/session_status.hpp @@ -210,12 +239,14 @@ drwxr-xr-x root/root usr/include/libtorrent/kademlia/ -rw-r--r-- root/root usr/include/libtorrent/settings_pack.hpp -rw-r--r-- root/root usr/include/libtorrent/sha1.hpp -rw-r--r-- root/root usr/include/libtorrent/sha1_hash.hpp --rw-r--r-- root/root usr/include/libtorrent/sha512.hpp +-rw-r--r-- root/root usr/include/libtorrent/sha256.hpp -rw-r--r-- root/root usr/include/libtorrent/sliding_average.hpp -rw-r--r-- root/root usr/include/libtorrent/socket.hpp -rw-r--r-- root/root usr/include/libtorrent/socket_io.hpp +-rw-r--r-- root/root usr/include/libtorrent/socket_type.hpp -rw-r--r-- root/root usr/include/libtorrent/socks5_stream.hpp -rw-r--r-- root/root usr/include/libtorrent/span.hpp +-rw-r--r-- root/root usr/include/libtorrent/ssl.hpp -rw-r--r-- root/root usr/include/libtorrent/ssl_stream.hpp -rw-r--r-- root/root usr/include/libtorrent/stack_allocator.hpp -rw-r--r-- root/root usr/include/libtorrent/stat.hpp @@ -226,7 +257,6 @@ drwxr-xr-x root/root usr/include/libtorrent/kademlia/ -rw-r--r-- root/root usr/include/libtorrent/string_view.hpp -rw-r--r-- root/root usr/include/libtorrent/tailqueue.hpp -rw-r--r-- root/root usr/include/libtorrent/time.hpp --rw-r--r-- root/root usr/include/libtorrent/timestamp_history.hpp -rw-r--r-- root/root usr/include/libtorrent/torrent.hpp -rw-r--r-- root/root usr/include/libtorrent/torrent_flags.hpp -rw-r--r-- root/root usr/include/libtorrent/torrent_handle.hpp @@ -235,14 +265,13 @@ drwxr-xr-x root/root usr/include/libtorrent/kademlia/ -rw-r--r-- root/root usr/include/libtorrent/torrent_peer_allocator.hpp -rw-r--r-- root/root usr/include/libtorrent/torrent_status.hpp -rw-r--r-- root/root usr/include/libtorrent/tracker_manager.hpp +-rw-r--r-- root/root usr/include/libtorrent/truncate.hpp -rw-r--r-- root/root usr/include/libtorrent/udp_socket.hpp -rw-r--r-- root/root usr/include/libtorrent/udp_tracker_connection.hpp -rw-r--r-- root/root usr/include/libtorrent/union_endpoint.hpp -rw-r--r-- root/root usr/include/libtorrent/units.hpp -rw-r--r-- root/root usr/include/libtorrent/upnp.hpp -rw-r--r-- root/root usr/include/libtorrent/utf8.hpp --rw-r--r-- root/root usr/include/libtorrent/utp_socket_manager.hpp --rw-r--r-- root/root usr/include/libtorrent/utp_stream.hpp -rw-r--r-- root/root usr/include/libtorrent/vector_utils.hpp -rw-r--r-- root/root usr/include/libtorrent/version.hpp -rw-r--r-- root/root usr/include/libtorrent/web_connection_base.hpp @@ -250,27 +279,25 @@ drwxr-xr-x root/root usr/include/libtorrent/kademlia/ -rw-r--r-- root/root usr/include/libtorrent/write_resume_data.hpp -rw-r--r-- root/root usr/include/libtorrent/xml_parse.hpp drwxr-xr-x root/root usr/lib/ --rw-r--r-- root/root usr/lib/libtorrent-rasterbar.a --rwxr-xr-x root/root usr/lib/libtorrent-rasterbar.la -lrwxrwxrwx root/root usr/lib/libtorrent-rasterbar.so -> libtorrent-rasterbar.so.10.0.0 -lrwxrwxrwx root/root usr/lib/libtorrent-rasterbar.so.10 -> libtorrent-rasterbar.so.10.0.0 --rwxr-xr-x root/root usr/lib/libtorrent-rasterbar.so.10.0.0 +drwxr-xr-x root/root usr/lib/cmake/ +drwxr-xr-x root/root usr/lib/cmake/LibtorrentRasterbar/ +-rw-r--r-- root/root usr/lib/cmake/LibtorrentRasterbar/LibtorrentRasterbarConfig.cmake +-rw-r--r-- root/root usr/lib/cmake/LibtorrentRasterbar/LibtorrentRasterbarConfigVersion.cmake +-rw-r--r-- root/root usr/lib/cmake/LibtorrentRasterbar/LibtorrentRasterbarTargets-release.cmake +-rw-r--r-- root/root usr/lib/cmake/LibtorrentRasterbar/LibtorrentRasterbarTargets.cmake +lrwxrwxrwx root/root usr/lib/libtorrent-rasterbar.so -> libtorrent-rasterbar.so.2.0 +lrwxrwxrwx root/root usr/lib/libtorrent-rasterbar.so.2.0 -> libtorrent-rasterbar.so.2.0.8 +-rwxr-xr-x root/root usr/lib/libtorrent-rasterbar.so.2.0.8 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libtorrent-rasterbar.pc drwxr-xr-x root/root usr/lib/python3.10/ drwxr-xr-x root/root usr/lib/python3.10/site-packages/ -drwxr-xr-x root/root usr/lib/python3.10/site-packages/python_libtorrent-1.2.11-py3.10-linux-x86_64.egg/ -drwxr-xr-x root/root usr/lib/python3.10/site-packages/python_libtorrent-1.2.11-py3.10-linux-x86_64.egg/EGG-INFO/ --rw-r--r-- root/root usr/lib/python3.10/site-packages/python_libtorrent-1.2.11-py3.10-linux-x86_64.egg/EGG-INFO/PKG-INFO --rw-r--r-- root/root usr/lib/python3.10/site-packages/python_libtorrent-1.2.11-py3.10-linux-x86_64.egg/EGG-INFO/SOURCES.txt --rw-r--r-- root/root usr/lib/python3.10/site-packages/python_libtorrent-1.2.11-py3.10-linux-x86_64.egg/EGG-INFO/dependency_links.txt --rw-r--r-- root/root usr/lib/python3.10/site-packages/python_libtorrent-1.2.11-py3.10-linux-x86_64.egg/EGG-INFO/native_libs.txt --rw-r--r-- root/root usr/lib/python3.10/site-packages/python_libtorrent-1.2.11-py3.10-linux-x86_64.egg/EGG-INFO/not-zip-safe --rw-r--r-- root/root usr/lib/python3.10/site-packages/python_libtorrent-1.2.11-py3.10-linux-x86_64.egg/EGG-INFO/top_level.txt -drwxr-xr-x root/root usr/lib/python3.10/site-packages/python_libtorrent-1.2.11-py3.10-linux-x86_64.egg/__pycache__/ --rw-r--r-- root/root usr/lib/python3.10/site-packages/python_libtorrent-1.2.11-py3.10-linux-x86_64.egg/__pycache__/libtorrent.cpython-310.pyc --rwxr-xr-x root/root usr/lib/python3.10/site-packages/python_libtorrent-1.2.11-py3.10-linux-x86_64.egg/libtorrent.cpython-310-x86_64-linux-gnu.so --rw-r--r-- root/root usr/lib/python3.10/site-packages/python_libtorrent-1.2.11-py3.10-linux-x86_64.egg/libtorrent.py +-rwxr-xr-x root/root usr/lib/python3.10/site-packages/libtorrent.cpython-310-x86_64-linux-gnu.so +drwxr-xr-x root/root usr/lib/python3.10/site-packages/libtorrent.egg-info/ +-rw-r--r-- root/root usr/lib/python3.10/site-packages/libtorrent.egg-info/PKG-INFO +-rw-r--r-- root/root usr/lib/python3.10/site-packages/libtorrent.egg-info/SOURCES.txt +-rw-r--r-- root/root usr/lib/python3.10/site-packages/libtorrent.egg-info/dependency_links.txt +-rw-r--r-- root/root usr/lib/python3.10/site-packages/libtorrent.egg-info/top_level.txt drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/cmake/ drwxr-xr-x root/root usr/share/cmake/Modules/ diff --git a/libtorrent-rasterbar/.signature b/libtorrent-rasterbar/.signature index fb6ecda97..99766db79 100644 --- a/libtorrent-rasterbar/.signature +++ b/libtorrent-rasterbar/.signature @@ -1,7 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3yRlU7CmmmiRu0BhCwBjHbPr2WlrOhkFaC3NRC2s/7mogzNTzAvF7pgdGEAS85AXHK9cdz3MxIQnW3FKwQ2ELwA= -SHA256 (Pkgfile) = 9cc79ecf96125ecb6899627518967b0bc161db9ca58c6d0945f851df1db3a309 -SHA256 (.footprint) = d9e4bc207a5004b3d8bc010fae8a0ab5a41fe03d20f22cd96e9cad1b913fd084 -SHA256 (libtorrent-rasterbar-1.2.11.tar.gz) = cb6a9cc3c9a9e485174394baa82744cef8415d23a357f5721dcc9ee7622c4efb -SHA256 (libtorrent-rasterbar-cxx14-fix.patch) = e94a7545534d8f54ae27f1db0db9d551c803d6412f14d5be1f0f0544a0405dff -SHA256 (really-disable-debug-flags.patch) = 241bbc919a45a9de2e132d8fd68015d2dcef1238c645b5fedb6a662ea029df2c +RWSagIOpLGJF3zTf99xFoC5go4NEf5TJAHZzlf7nh8rX0NkJpBJstvRegrZYYquCT5T7GtMlnBtWEDARkcSQxAZvgaFAdHL5SgA= +SHA256 (Pkgfile) = e79b3abb8b8bb6c3ed181c7665aac9127811b5b0d88ff70e52127dd5b9eec33d +SHA256 (.footprint) = 3d2a3921fc76b7a8ca0ad7b1e4e50079092447beb88206de677f8316672dc4a0 +SHA256 (libtorrent-rasterbar-2.0.8.tar.gz) = 09dd399b4477638cf140183f5f85d376abffb9c192bc2910002988e27d69e13e diff --git a/libtorrent-rasterbar/Pkgfile b/libtorrent-rasterbar/Pkgfile index 46ae05017..916458255 100644 --- a/libtorrent-rasterbar/Pkgfile +++ b/libtorrent-rasterbar/Pkgfile @@ -4,29 +4,22 @@ # Depends on: boost python3-setuptools name=libtorrent-rasterbar -version=1.2.11 +version=2.0.8 release=1 -source=(https://github.com/arvidn/libtorrent/releases/download/v$version/$name-$vers... - libtorrent-rasterbar-cxx14-fix.patch - really-disable-debug-flags.patch) +source=(https://github.com/arvidn/libtorrent/releases/download/v$version/$name-$vers...) build() { - cd $name-$version + cmake -S $name-$version -B build -G Ninja \ + -D CMAKE_INSTALL_PREFIX=/usr \ + -D CMAKE_INSTALL_LIBDIR=lib \ + -D CMAKE_BUILD_TYPE=Release \ + -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \ + -D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \ + -D python-bindings=ON \ + -D boost-python-module-name="python" \ + -D python-egg-info=ON \ + -Wno-dev - # https://github.com/arvidn/libtorrent/issues/5024 - patch -p1 -i $SRC/libtorrent-rasterbar-cxx14-fix.patch - - patch -p1 -i $SRC/really-disable-debug-flags.patch - autoreconf -fi - - PYTHON='/usr/bin/python3' \ - ./configure \ - --prefix=/usr \ - --enable-python-binding \ - --with-libiconv \ - --enable-python-binding \ - --with-boost-python=boost_python3 - - make - make DESTDIR=$PKG install + cmake --build build + DESTDIR=$PKG cmake --install build } diff --git a/libtorrent-rasterbar/libtorrent-rasterbar-cxx14-fix.patch b/libtorrent-rasterbar/libtorrent-rasterbar-cxx14-fix.patch deleted file mode 100644 index 85c3288ef..000000000 --- a/libtorrent-rasterbar/libtorrent-rasterbar-cxx14-fix.patch +++ /dev/null @@ -1,737 +0,0 @@ -From ec286b37283a2bc03cf8b0b6ae72e920265eb754 Mon Sep 17 00:00:00 2001 -From: Nam Nguyen <namn@berkeley.edu> -Date: Fri, 21 Aug 2020 09:01:40 +0000 -Subject: [PATCH 01/10] Use ax_cxx_compile_stdcxx.m4 and move to c++14 Use - ax_cxx_compile_stdcxx.m4 instead of ax_cxx_compile_stdcxx_11.m4. Use c++14 - instead of c++11. - ---- - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0b9b0c446b..c037607874 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -143,8 +143,7 @@ AS_ECHO - AS_ECHO "Checking for boost libraries:" - - AX_BOOST_BASE([1.58]) -- --AX_CXX_COMPILE_STDCXX_11([noext], [mandatory]) -+AX_CXX_COMPILE_STDCXX(14, [noext], [mandatory]) - - AX_BOOST_SYSTEM() - AS_IF([test -z "$BOOST_SYSTEM_LIB"], - -From a9012add4018381ce50b83a81980b2fd7831606b Mon Sep 17 00:00:00 2001 -From: Nam Nguyen <namn@berkeley.edu> -Date: Fri, 21 Aug 2020 21:35:37 +0000 -Subject: [PATCH 02/10] add --with-std=c++14 configure switch --with-std=c++14 - allows the user to specify what C++ standard to use. It supports - {c,gnu}++{11,14,17}. If unspecified the default is c++11. Either - AX_CXX_COMPILE_STDCXX_11 or AX_CXX_COMPILE_STDCXX are called appropriately. - ---- - configure.ac | 37 ++++++++++++++++++++++++++++++++++++- - 1 file changed, 36 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index c037607874..c7ee9b8edd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -143,7 +143,41 @@ AS_ECHO - AS_ECHO "Checking for boost libraries:" - - AX_BOOST_BASE([1.58]) --AX_CXX_COMPILE_STDCXX(14, [noext], [mandatory]) -+ -+AC_ARG_WITH( -+ [std], -+ [AS_HELP_STRING( -+ [--with-std[=ARG]], -+ [specify C++ standard (e.g., c++14 or gnu++11) [default=c++11]])], -+ [[ARG_STD=$withval]], -+ [[ARG_STD=c++11]] -+) -+ -+AC_MSG_CHECKING([which c++ standard to use]) -+AS_CASE(["$ARG_STD"], -+ ["c++17"|"C++17"], [ -+ AC_MSG_RESULT([-std=c++17]) -+ AX_CXX_COMPILE_STDCXX(17, [noext], [mandatory]) -+ ], -+ ["gnu++17"], [ -+ AC_MSG_RESULT([-std=gnu++17]) -+ AX_CXX_COMPILE_STDCXX(17, [ext], [mandatory]) -+ ], -+ ["c++14"|"C++14"], [ -+ AC_MSG_RESULT([-std=c++14]) -+ AX_CXX_COMPILE_STDCXX(14, [noext], [mandatory]) -+ ], -+ [gnu++14], [ -+ AC_MSG_RESULT([-std=gnu++14]) -+ AX_CXX_COMPILE_STDCXX(14, [ext], [mandatory]) -+ ], -+ [gnu++11], [ -+ AC_MSG_RESULT([-std=gnu++11]) -+ AX_CXX_COMPILE_STDCXX_11([ext], [mandatory]) -+ ], -+ [AC_MSG_RESULT([-std=c++11]) -+ AX_CXX_COMPILE_STDCXX_11([noext], [mandatory])] -+) - - AX_BOOST_SYSTEM() - AS_IF([test -z "$BOOST_SYSTEM_LIB"], -@@ -589,6 +623,7 @@ Build options: - debug build: ${ARG_ENABLE_DEBUG:-no} - invariant checks: ${ARG_ENABLE_INVARIANT:-no} - logging support: ${ARG_ENABLE_LOGGING:-yes} -+ with std: ${ARG_STD:-c++11} - - Features: - encryption support: ${ARG_ENABLE_ENCRYPTION:-yes} - -From bca36cdcce209d1dfb473eab2e049ccf29b8a72e Mon Sep 17 00:00:00 2001 -From: Nam Nguyen <namn@berkeley.edu> -Date: Fri, 21 Aug 2020 21:53:20 +0000 -Subject: [PATCH 03/10] add quotes - ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index c7ee9b8edd..ba9b02106a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -167,11 +167,11 @@ AS_CASE(["$ARG_STD"], - AC_MSG_RESULT([-std=c++14]) - AX_CXX_COMPILE_STDCXX(14, [noext], [mandatory]) - ], -- [gnu++14], [ -+ ["gnu++14"], [ - AC_MSG_RESULT([-std=gnu++14]) - AX_CXX_COMPILE_STDCXX(14, [ext], [mandatory]) - ], -- [gnu++11], [ -+ ["gnu++11"], [ - AC_MSG_RESULT([-std=gnu++11]) - AX_CXX_COMPILE_STDCXX_11([ext], [mandatory]) - ], - -From bf6ed65a4068071a6b8565128f8cebd3f29fef55 Mon Sep 17 00:00:00 2001 -From: Nam Nguyen <namn@berkeley.edu> -Date: Fri, 21 Aug 2020 23:07:08 +0000 -Subject: [PATCH 04/10] capitalization - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index ba9b02106a..6ea4a4fde2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -153,7 +153,7 @@ AC_ARG_WITH( - [[ARG_STD=c++11]] - ) - --AC_MSG_CHECKING([which c++ standard to use]) -+AC_MSG_CHECKING([which C++ standard to use]) - AS_CASE(["$ARG_STD"], - ["c++17"|"C++17"], [ - AC_MSG_RESULT([-std=c++17]) - -From feb65af2bd7db89af0ad5ef57dfd669591742bb4 Mon Sep 17 00:00:00 2001 -From: Nam Nguyen <namn@berkeley.edu> -Date: Sat, 22 Aug 2020 08:51:12 +0000 -Subject: [PATCH 05/10] add --with-cxx-standard=14 configure switch C++ - standard is specified by 11, 14 or 17. Either AX_CXX_COMPILE_STDCXX_11 or - AX_CXX_COMPILE_STDCXX are called appropriately. - ---- - configure.ac | 64 ++++++++++++++++++++----------------- - m4/ax_cxx_compile_stdcxx.m4 | 36 ++++++++++++--------- - 2 files changed, 55 insertions(+), 45 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 6ea4a4fde2..2f0a4326f2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -145,39 +145,43 @@ AS_ECHO "Checking for boost libraries:" - AX_BOOST_BASE([1.58]) - - AC_ARG_WITH( -- [std], -+ [cxx-standard], - [AS_HELP_STRING( -- [--with-std[=ARG]], -- [specify C++ standard (e.g., c++14 or gnu++11) [default=c++11]])], -- [[ARG_STD=$withval]], -- [[ARG_STD=c++11]] -+ [--with-cxx-std[=ARG]], -+ [specify C++ standard (e.g., 11, 14 or 17) [default=11]])], -+ [[ARG_CXX_STANDARD=$withval]], -+ [[ARG_CXX_STANDARD=reverting to compiler default]] - ) - - AC_MSG_CHECKING([which C++ standard to use]) --AS_CASE(["$ARG_STD"], -- ["c++17"|"C++17"], [ -- AC_MSG_RESULT([-std=c++17]) -- AX_CXX_COMPILE_STDCXX(17, [noext], [mandatory]) -- ], -- ["gnu++17"], [ -- AC_MSG_RESULT([-std=gnu++17]) -- AX_CXX_COMPILE_STDCXX(17, [ext], [mandatory]) -- ], -- ["c++14"|"C++14"], [ -- AC_MSG_RESULT([-std=c++14]) -- AX_CXX_COMPILE_STDCXX(14, [noext], [mandatory]) -- ], -- ["gnu++14"], [ -- AC_MSG_RESULT([-std=gnu++14]) -- AX_CXX_COMPILE_STDCXX(14, [ext], [mandatory]) -- ], -- ["gnu++11"], [ -- AC_MSG_RESULT([-std=gnu++11]) -- AX_CXX_COMPILE_STDCXX_11([ext], [mandatory]) -- ], -- [AC_MSG_RESULT([-std=c++11]) -- AX_CXX_COMPILE_STDCXX_11([noext], [mandatory])] --) -+if test "x${ARG_CXX_STANDARD}" = "x17" ; then -+ AX_CXX_COMPILE_STDCXX(17, [noext], [optional], [setcxx]) -+elif test "x${ARG_CXX_STANDARD}" = "x14" ; then -+ AX_CXX_COMPILE_STDCXX(14, [noext], [optional], [setcxx]) -+elif test "x${ARG_CXX_STANDARD}" = "x11" ; then -+ AX_CXX_COMPILE_STDCXX(11, [noext], [optional], [setcxx]) -+else -+ dnl nothing specified so use compiler's default C++ dialect -+ AX_CXX_COMPILE_STDCXX(17, [noext], [optional], []) -+ AX_CXX_COMPILE_STDCXX(14, [noext], [optional], []) -+ AX_CXX_COMPILE_STDCXX(11, [noext], [optional], []) -+ if test "x${HAVE_CXX17}" = "x1" ; then -+ CXX="$CXX -std=c++17" -+ if test -n "$CXXCPP" ; then -+ CXXCPP="$CXXCPP -std=c++17" -+ fi -+ elif test "x${HAVE_CXX14}" = "x1" ; then -+ CXX="$CXX -std=c++14" -+ if test -n "$CXXCPP" ; then -+ CXXCPP="$CXXCPP -std=c++14" -+ fi -+ else -+ CXX="$CXX -std=c++11" -+ if test -n "$CXXCPP" ; then -+ CXXCPP="$CXXCPP -std=c++11" -+ fi -+ fi -+fi - - AX_BOOST_SYSTEM() - AS_IF([test -z "$BOOST_SYSTEM_LIB"], -@@ -623,7 +627,7 @@ Build options: - debug build: ${ARG_ENABLE_DEBUG:-no} - invariant checks: ${ARG_ENABLE_INVARIANT:-no} - logging support: ${ARG_ENABLE_LOGGING:-yes} -- with std: ${ARG_STD:-c++11} -+ with std: ${ARG_CXX_STANDARD:-default} - - Features: - encryption support: ${ARG_ENABLE_ENCRYPTION:-yes} -diff --git a/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4 -index 43087b2e68..69989d59d7 100644 ---- a/m4/ax_cxx_compile_stdcxx.m4 -+++ b/m4/ax_cxx_compile_stdcxx.m4 -@@ -4,7 +4,7 @@ - # - # SYNOPSIS - # --# AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional]) -+# AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional], [setcxx]) - # - # DESCRIPTION - # -@@ -25,6 +25,12 @@ - # regardless, after defining HAVE_CXX${VERSION} if and only if a - # supporting mode is found. - # -+# The fourth argument, if left unspecified, skips over setting the various -+# -std combinations and skips over setting CXX and CXXCPP. If specified -+# 'setcxx' it will restore the default behavior. This argument is augmented -+# for libtorrent-rasterbar and does not exist in the stock m4 interface. -+# Skipping over setting CXX is useful for detecting the default C++ dialect. -+# - # LICENSE - # - # Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com> -@@ -69,17 +75,17 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl - cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch]) - AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch, - $cachevar, -- [ac_save_CXX="$CXX" -- CXX="$CXX $switch" -+ [ifelse([$4], [setcxx], [ac_save_CXX="$CXX" CXX="$CXX $switch"], []) - AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], - [eval $cachevar=yes], - [eval $cachevar=no]) -- CXX="$ac_save_CXX"]) -+ ifelse([$4], [setcxx], [CXX="$ac_save_CXX"], [])]) - if eval test x\$$cachevar = xyes; then -- CXX="$CXX $switch" -- if test -n "$CXXCPP" ; then -- CXXCPP="$CXXCPP $switch" -- fi -+ ifelse([$4], [setcxx], -+ [CXX="$CXX $switch" -+ if test -n "$CXXCPP" ; then -+ CXXCPP="$CXXCPP $switch" -+ fi], []) - ac_success=yes - break - fi -@@ -96,17 +102,17 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl - cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch]) - AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch, - $cachevar, -- [ac_save_CXX="$CXX" -- CXX="$CXX $switch" -+ [ifelse([$4], [setcxx], [ac_save_CXX="$CXX" CXX="$CXX $switch"], []) - AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], - [eval $cachevar=yes], - [eval $cachevar=no]) -- CXX="$ac_save_CXX"]) -+ ifelse([$4], [setcxx], [CXX="$ac_save_CXX"], [])]) - if eval test x\$$cachevar = xyes; then -- CXX="$CXX $switch" -- if test -n "$CXXCPP" ; then -- CXXCPP="$CXXCPP $switch" -- fi -+ ifelse([$4], [setcxx], -+ [CXX="$CXX $switch" -+ if test -n "$CXXCPP" ; then -+ CXXCPP="$CXXCPP $switch" -+ fi], []) - ac_success=yes - break - fi - -From e7aeeaabd0ec6f623fd94d348e6db9312cb727c2 Mon Sep 17 00:00:00 2001 -From: Nam Nguyen <namn@berkeley.edu> -Date: Sat, 22 Aug 2020 09:29:12 +0000 -Subject: [PATCH 06/10] typo with naming - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 2f0a4326f2..7e48078a7c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -147,7 +147,7 @@ AX_BOOST_BASE([1.58]) - AC_ARG_WITH( - [cxx-standard], - [AS_HELP_STRING( -- [--with-cxx-std[=ARG]], -+ [--with-cxx-standard[=ARG]], - [specify C++ standard (e.g., 11, 14 or 17) [default=11]])], - [[ARG_CXX_STANDARD=$withval]], - [[ARG_CXX_STANDARD=reverting to compiler default]] - -From 9b45e622d4a815d31f50f5e4fba6e4316fe14272 Mon Sep 17 00:00:00 2001 -From: Nam Nguyen <namn@berkeley.edu> -Date: Sat, 22 Aug 2020 20:55:20 +0000 -Subject: [PATCH 07/10] invert behavior and be explicit with 'skip' argument - The 4th argument left unspecified means default behavior. 'skip' means to - skip setting CXX as should be done when detecting the default compiler. - ---- - configure.ac | 12 ++++++------ - m4/ax_cxx_compile_stdcxx.m4 | 39 +++++++++++++++++++++---------------- - 2 files changed, 28 insertions(+), 23 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7e48078a7c..59b0d6603b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -155,16 +155,16 @@ AC_ARG_WITH( - - AC_MSG_CHECKING([which C++ standard to use]) - if test "x${ARG_CXX_STANDARD}" = "x17" ; then -- AX_CXX_COMPILE_STDCXX(17, [noext], [optional], [setcxx]) -+ AX_CXX_COMPILE_STDCXX(17, [noext], [optional], []) - elif test "x${ARG_CXX_STANDARD}" = "x14" ; then -- AX_CXX_COMPILE_STDCXX(14, [noext], [optional], [setcxx]) -+ AX_CXX_COMPILE_STDCXX(14, [noext], [optional], []) - elif test "x${ARG_CXX_STANDARD}" = "x11" ; then -- AX_CXX_COMPILE_STDCXX(11, [noext], [optional], [setcxx]) -+ AX_CXX_COMPILE_STDCXX(11, [noext], [optional], []) - else - dnl nothing specified so use compiler's default C++ dialect -- AX_CXX_COMPILE_STDCXX(17, [noext], [optional], []) -- AX_CXX_COMPILE_STDCXX(14, [noext], [optional], []) -- AX_CXX_COMPILE_STDCXX(11, [noext], [optional], []) -+ AX_CXX_COMPILE_STDCXX(17, [noext], [optional], [skip]) -+ AX_CXX_COMPILE_STDCXX(14, [noext], [optional], [skip]) -+ AX_CXX_COMPILE_STDCXX(11, [noext], [optional], [skip]) - if test "x${HAVE_CXX17}" = "x1" ; then - CXX="$CXX -std=c++17" - if test -n "$CXXCPP" ; then -diff --git a/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4 -index 69989d59d7..50859df211 100644 ---- a/m4/ax_cxx_compile_stdcxx.m4 -+++ b/m4/ax_cxx_compile_stdcxx.m4 -@@ -4,7 +4,7 @@ - # - # SYNOPSIS - # --# AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional], [setcxx]) -+# AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional], [skip]) - # - # DESCRIPTION - # -@@ -25,11 +25,11 @@ - # regardless, after defining HAVE_CXX${VERSION} if and only if a - # supporting mode is found. - # --# The fourth argument, if left unspecified, skips over setting the various --# -std combinations and skips over setting CXX and CXXCPP. If specified --# 'setcxx' it will restore the default behavior. This argument is augmented --# for libtorrent-rasterbar and does not exist in the stock m4 interface. --# Skipping over setting CXX is useful for detecting the default C++ dialect. -+# The fourth argument, if left unspecified, does the default behavior. If -+# specified 'skip', it skips over setting the various -std combinations -+# and skips over setting CXX and CXXCPP. This argument is augmented for -+# libtorrent-rasterbar and does not exist in the stock m4 interface. -+# Skipping is useful for detecting the default C++ dialect. - # - # LICENSE - # -@@ -65,6 +65,9 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl - [$3], [mandatory], [ax_cxx_compile_cxx$1_required=true], - [$3], [optional], [ax_cxx_compile_cxx$1_required=false], - [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])]) -+ m4_if([$4], [], [], -+ [$4], [skip], [], -+ [m4_fatal([invalid second argument `$4' to AX_CXX_COMPILE_STDCXX])])dnl - AC_LANG_PUSH([C++])dnl - ac_success=no - -@@ -75,17 +78,18 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl - cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch]) - AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch, - $cachevar, -- [ifelse([$4], [setcxx], [ac_save_CXX="$CXX" CXX="$CXX $switch"], []) -+ [ifelse([$4], [skip], [], [ac_save_CXX="$CXX" CXX="$CXX $switch"]) - AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], - [eval $cachevar=yes], - [eval $cachevar=no]) -- ifelse([$4], [setcxx], [CXX="$ac_save_CXX"], [])]) -+ ifelse([$4], [skip], [], [CXX="$ac_save_CXX"])]) - if eval test x\$$cachevar = xyes; then -- ifelse([$4], [setcxx], -+ ifelse([$4], [skip], -+ [], - [CXX="$CXX $switch" - if test -n "$CXXCPP" ; then - CXXCPP="$CXXCPP $switch" -- fi], []) -+ fi]) - ac_success=yes - break - fi -@@ -102,17 +106,18 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl - cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch]) - AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch, - $cachevar, -- [ifelse([$4], [setcxx], [ac_save_CXX="$CXX" CXX="$CXX $switch"], []) -+ [ifelse([$4], [skip], [], [ac_save_CXX="$CXX" CXX="$CXX $switch"]) - AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], - [eval $cachevar=yes], - [eval $cachevar=no]) -- ifelse([$4], [setcxx], [CXX="$ac_save_CXX"], [])]) -+ ifelse([$4], [skip], [], [CXX="$ac_save_CXX"])]) - if eval test x\$$cachevar = xyes; then -- ifelse([$4], [setcxx], -- [CXX="$CXX $switch" -- if test -n "$CXXCPP" ; then -- CXXCPP="$CXXCPP $switch" -- fi], []) -+ ifelse([$4], [skip], -+ [], -+ [CXX="$CXX $switch" -+ if test -n "$CXXCPP" ; then -+ CXXCPP="$CXXCPP $switch" -+ fi]) - ac_success=yes - break - fi - -From 9c0a31ffb974a11a3ea00f96cfe45616cf75bcf4 Mon Sep 17 00:00:00 2001 -From: Nam Nguyen <namn@berkeley.edu> -Date: Fri, 25 Sep 2020 09:30:52 +0000 -Subject: [PATCH 08/10] revert ax_cxx_compile_stdcxx.m4 to default - ---- - configure.ac | 53 ++++++++++++++++++++----------------- - m4/ax_cxx_compile_stdcxx.m4 | 41 +++++++++++----------------- - 2 files changed, 44 insertions(+), 50 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 59b0d6603b..b7eee17d99 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -150,36 +150,41 @@ AC_ARG_WITH( - [--with-cxx-standard[=ARG]], - [specify C++ standard (e.g., 11, 14 or 17) [default=11]])], - [[ARG_CXX_STANDARD=$withval]], -- [[ARG_CXX_STANDARD=reverting to compiler default]] -+ [[ARG_CXX_STANDARD=default]] - ) - --AC_MSG_CHECKING([which C++ standard to use]) -+AC_MSG_CHECKING([which c++ standard to use]) - if test "x${ARG_CXX_STANDARD}" = "x17" ; then -- AX_CXX_COMPILE_STDCXX(17, [noext], [optional], []) -+ AX_CXX_COMPILE_STDCXX(17, [noext], [optional]) - elif test "x${ARG_CXX_STANDARD}" = "x14" ; then -- AX_CXX_COMPILE_STDCXX(14, [noext], [optional], []) -+ AX_CXX_COMPILE_STDCXX(14, [noext], [optional]) - elif test "x${ARG_CXX_STANDARD}" = "x11" ; then -- AX_CXX_COMPILE_STDCXX(11, [noext], [optional], []) -+ AX_CXX_COMPILE_STDCXX_11([noext], [optional]) -+elif test "${ARG_CXX_STANDARD}" -lt "11" ; then -+ dnl force 11 if user specified out of bounds, regardless of compiler default -+ ARG_CXX_STANDARD="11" -+ AX_CXX_COMPILE_STDCXX_11([noext], [optional]) -+elif test "${ARG_CXX_STANDARD}" -gt "17" ; then -+ dnl force 11 if user specified out of bounds, regardless of compiler default -+ ARG_CXX_STANDARD="11" -+ AX_CXX_COMPILE_STDCXX_11([noext], [optional]) - else -- dnl nothing specified so use compiler's default C++ dialect -- AX_CXX_COMPILE_STDCXX(17, [noext], [optional], [skip]) -- AX_CXX_COMPILE_STDCXX(14, [noext], [optional], [skip]) -- AX_CXX_COMPILE_STDCXX(11, [noext], [optional], [skip]) -- if test "x${HAVE_CXX17}" = "x1" ; then -- CXX="$CXX -std=c++17" -- if test -n "$CXXCPP" ; then -- CXXCPP="$CXXCPP -std=c++17" -- fi -- elif test "x${HAVE_CXX14}" = "x1" ; then -- CXX="$CXX -std=c++14" -- if test -n "$CXXCPP" ; then -- CXXCPP="$CXXCPP -std=c++14" -- fi -+ dnl nothing specified so use compiler default -+ -+ echo '#include <iostream>' > cpp_standard.cpp -+ echo 'using std::cout; using std::endl; int main() { switch (__cplusplus) { case 201103L: cout << 11 << endl; break; case 201402L: cout << 14 << endl; break; case 201703L: cout << 17 << endl; break; default: cout << 1 << endl; } }' >> cpp_standard.cpp -+ ${CXX} cpp_standard.cpp -o cpp_standard -+ DEFAULT_CXX_STANDARD=`./cpp_standard` -+ echo $DEFAULT_CXX_STANDARD -+ if test "x${DEFAULT_CXX_STANDARD}" = "x17" ; then -+ ARG_CXX_STANDARD="17" -+ AX_CXX_COMPILE_STDCXX(17, [noext], [optional]) -+ elif test "x${DEFAULT_CXX_STANDARD}" = "x14" ; then -+ ARG_CXX_STANDARD="14" -+ AX_CXX_COMPILE_STDCXX(14, [noext], [optional]) - else -- CXX="$CXX -std=c++11" -- if test -n "$CXXCPP" ; then -- CXXCPP="$CXXCPP -std=c++11" -- fi -+ ARG_CXX_STANDARD="11" -+ AX_CXX_COMPILE_STDCXX_11([noext], [optional]) - fi - fi - -@@ -627,7 +632,7 @@ Build options: - debug build: ${ARG_ENABLE_DEBUG:-no} - invariant checks: ${ARG_ENABLE_INVARIANT:-no} - logging support: ${ARG_ENABLE_LOGGING:-yes} -- with std: ${ARG_CXX_STANDARD:-default} -+ cxx standard: ${ARG_CXX_STANDARD:-default} - - Features: - encryption support: ${ARG_ENABLE_ENCRYPTION:-yes} -diff --git a/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4 -index 50859df211..43087b2e68 100644 ---- a/m4/ax_cxx_compile_stdcxx.m4 -+++ b/m4/ax_cxx_compile_stdcxx.m4 -@@ -4,7 +4,7 @@ - # - # SYNOPSIS - # --# AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional], [skip]) -+# AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional]) - # - # DESCRIPTION - # -@@ -25,12 +25,6 @@ - # regardless, after defining HAVE_CXX${VERSION} if and only if a - # supporting mode is found. - # --# The fourth argument, if left unspecified, does the default behavior. If --# specified 'skip', it skips over setting the various -std combinations --# and skips over setting CXX and CXXCPP. This argument is augmented for --# libtorrent-rasterbar and does not exist in the stock m4 interface. --# Skipping is useful for detecting the default C++ dialect. --# - # LICENSE - # - # Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com> -@@ -65,9 +59,6 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl - [$3], [mandatory], [ax_cxx_compile_cxx$1_required=true], - [$3], [optional], [ax_cxx_compile_cxx$1_required=false], - [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])]) -- m4_if([$4], [], [], -- [$4], [skip], [], -- [m4_fatal([invalid second argument `$4' to AX_CXX_COMPILE_STDCXX])])dnl - AC_LANG_PUSH([C++])dnl - ac_success=no - -@@ -78,18 +69,17 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl - cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch]) - AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch, - $cachevar, -- [ifelse([$4], [skip], [], [ac_save_CXX="$CXX" CXX="$CXX $switch"]) -+ [ac_save_CXX="$CXX" -+ CXX="$CXX $switch" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], - [eval $cachevar=yes], - [eval $cachevar=no]) -- ifelse([$4], [skip], [], [CXX="$ac_save_CXX"])]) -+ CXX="$ac_save_CXX"]) - if eval test x\$$cachevar = xyes; then -- ifelse([$4], [skip], -- [], -- [CXX="$CXX $switch" -- if test -n "$CXXCPP" ; then -- CXXCPP="$CXXCPP $switch" -- fi]) -+ CXX="$CXX $switch" -+ if test -n "$CXXCPP" ; then -+ CXXCPP="$CXXCPP $switch" -+ fi - ac_success=yes - break - fi -@@ -106,18 +96,17 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl - cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch]) - AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch, - $cachevar, -- [ifelse([$4], [skip], [], [ac_save_CXX="$CXX" CXX="$CXX $switch"]) -+ [ac_save_CXX="$CXX" -+ CXX="$CXX $switch" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], - [eval $cachevar=yes], - [eval $cachevar=no]) -- ifelse([$4], [skip], [], [CXX="$ac_save_CXX"])]) -+ CXX="$ac_save_CXX"]) - if eval test x\$$cachevar = xyes; then -- ifelse([$4], [skip], -- [], -- [CXX="$CXX $switch" -- if test -n "$CXXCPP" ; then -- CXXCPP="$CXXCPP $switch" -- fi]) -+ CXX="$CXX $switch" -+ if test -n "$CXXCPP" ; then -+ CXXCPP="$CXXCPP $switch" -+ fi - ac_success=yes - break - fi - -From 49b4683f484271e394612b80331af39c5a0c36c5 Mon Sep 17 00:00:00 2001 -From: Nam Nguyen <namn@berkeley.edu> -Date: Fri, 25 Sep 2020 23:54:23 +0000 -Subject: [PATCH 09/10] mandatory - ---- - configure.ac | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b7eee17d99..29c237fa8b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -155,19 +155,19 @@ AC_ARG_WITH( - - AC_MSG_CHECKING([which c++ standard to use]) - if test "x${ARG_CXX_STANDARD}" = "x17" ; then -- AX_CXX_COMPILE_STDCXX(17, [noext], [optional]) -+ AX_CXX_COMPILE_STDCXX(17, [noext], [mandatory]) - elif test "x${ARG_CXX_STANDARD}" = "x14" ; then -- AX_CXX_COMPILE_STDCXX(14, [noext], [optional]) -+ AX_CXX_COMPILE_STDCXX(14, [noext], [mandatory]) - elif test "x${ARG_CXX_STANDARD}" = "x11" ; then -- AX_CXX_COMPILE_STDCXX_11([noext], [optional]) -+ AX_CXX_COMPILE_STDCXX_11([noext], [mandatory]) - elif test "${ARG_CXX_STANDARD}" -lt "11" ; then - dnl force 11 if user specified out of bounds, regardless of compiler default - ARG_CXX_STANDARD="11" -- AX_CXX_COMPILE_STDCXX_11([noext], [optional]) -+ AX_CXX_COMPILE_STDCXX_11([noext], [mandatory]) - elif test "${ARG_CXX_STANDARD}" -gt "17" ; then - dnl force 11 if user specified out of bounds, regardless of compiler default - ARG_CXX_STANDARD="11" -- AX_CXX_COMPILE_STDCXX_11([noext], [optional]) -+ AX_CXX_COMPILE_STDCXX_11([noext], [mandatory]) - else - dnl nothing specified so use compiler default - -@@ -178,13 +178,13 @@ else - echo $DEFAULT_CXX_STANDARD - if test "x${DEFAULT_CXX_STANDARD}" = "x17" ; then - ARG_CXX_STANDARD="17" -- AX_CXX_COMPILE_STDCXX(17, [noext], [optional]) -+ AX_CXX_COMPILE_STDCXX(17, [noext], [mandatory]) - elif test "x${DEFAULT_CXX_STANDARD}" = "x14" ; then - ARG_CXX_STANDARD="14" -- AX_CXX_COMPILE_STDCXX(14, [noext], [optional]) -+ AX_CXX_COMPILE_STDCXX(14, [noext], [mandatory]) - else - ARG_CXX_STANDARD="11" -- AX_CXX_COMPILE_STDCXX_11([noext], [optional]) -+ AX_CXX_COMPILE_STDCXX_11([noext], [mandatory]) - fi - fi - - -From a942fa69062f5c1719cc96f8169c175fd6607c93 Mon Sep 17 00:00:00 2001 -From: Nam Nguyen <namn@berkeley.edu> -Date: Sat, 26 Sep 2020 00:51:45 +0000 -Subject: [PATCH 10/10] fix bug where unspecified default was not respected If - no --with-cxx-standard is given, there was a bug that resulted in 11 being - incorrectly preferred over the compiler's default. To resolve this make sure - that default is handled by the final else. Ensure it does not fall into the - elif clauses where the user gives an out of bounds standard (< 11 or > 17) - and it clamps it to 11. - ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 29c237fa8b..3fa925b1fa 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -160,11 +160,11 @@ elif test "x${ARG_CXX_STANDARD}" = "x14" ; then - AX_CXX_COMPILE_STDCXX(14, [noext], [mandatory]) - elif test "x${ARG_CXX_STANDARD}" = "x11" ; then - AX_CXX_COMPILE_STDCXX_11([noext], [mandatory]) --elif test "${ARG_CXX_STANDARD}" -lt "11" ; then -+elif test "x${ARG_CXX_STANDARD}" != "xdefault" -a "${ARG_CXX_STANDARD}" -lt "11" ; then - dnl force 11 if user specified out of bounds, regardless of compiler default - ARG_CXX_STANDARD="11" - AX_CXX_COMPILE_STDCXX_11([noext], [mandatory]) --elif test "${ARG_CXX_STANDARD}" -gt "17" ; then -+elif test "x${ARG_CXX_STANDARD}" != "xdefault" -a "${ARG_CXX_STANDARD}" -gt "17" ; then - dnl force 11 if user specified out of bounds, regardless of compiler default - ARG_CXX_STANDARD="11" - AX_CXX_COMPILE_STDCXX_11([noext], [mandatory]) diff --git a/libtorrent-rasterbar/really-disable-debug-flags.patch b/libtorrent-rasterbar/really-disable-debug-flags.patch deleted file mode 100644 index a8f4668f7..000000000 --- a/libtorrent-rasterbar/really-disable-debug-flags.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -pruN libtorrent-rasterbar-1.2.11.orig/configure.ac libtorrent-rasterbar-1.2.11/configure.ac ---- libtorrent-rasterbar-1.2.11.orig/configure.ac 2020-12-28 16:23:27.250050285 +1100 -+++ libtorrent-rasterbar-1.2.11/configure.ac 2020-12-28 16:24:25.168717701 +1100 -@@ -328,8 +328,8 @@ AS_CASE(["$ARG_ENABLE_DEBUG"], - ["no"], [ - AC_MSG_RESULT([no]) - AC_DEFINE([NDEBUG],[1],[Define to disable debug code.]) -- #COMPILETIME_OPTIONS="$COMPILETIME_OPTIONS -DNDEBUG " -- DEBUGFLAGS="-g0 -Os" -+ COMPILETIME_OPTIONS="$COMPILETIME_OPTIONS -DNDEBUG " -+ #DEBUGFLAGS="-g0 -Os" - ], - [AC_MSG_RESULT([$ARG_ENABLE_DEBUG]) - AC_MSG_ERROR([Unknown option "$ARG_ENABLE_DEBUG". Use either "yes" or "no".])]