From ceeb795693a00914d89914ec08f6de264d3eeebd Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Wed, 21 Nov 2018 17:29:12 +0100 Subject: [PATCH] */*: sync with upstream Taken from: HardenedBSD --- audio/x42-plugins-lv2/Makefile | 5 +- audio/x42-plugins-lv2/distinfo | 6 +- cad/gtkwave/Makefile | 2 +- cad/gtkwave/distinfo | 6 +- databases/clickhouse/Makefile | 6 +- databases/clickhouse/distinfo | 6 +- databases/clickhouse/pkg-plist | 98 +- databases/pg_stat_kcache/Makefile | 4 +- databases/pg_stat_kcache/distinfo | 6 +- databases/powa-archivist/Makefile | 4 +- databases/powa-archivist/distinfo | 6 +- devel/Makefile | 2 + devel/android-tools-simpleperf/Makefile | 2 - devel/awscli/Makefile | 4 +- devel/awscli/distinfo | 6 +- devel/ignition-cmake/Makefile | 4 +- devel/ignition-cmake/pkg-plist | 122 +- devel/ignition-common/Makefile | 37 + devel/ignition-common/distinfo | 3 + devel/ignition-common/pkg-descr | 6 + devel/ignition-common/pkg-plist | 116 ++ devel/ignition-msgs/Makefile | 2 +- devel/ignition-msgs/pkg-plist | 620 ++++---- devel/ignition-plugin/Makefile | 2 +- devel/ignition-plugin/pkg-plist | 96 +- devel/ignition-transport/Makefile | 42 + devel/ignition-transport/distinfo | 3 + .../files/patch-CMakeLists.txt | 11 + ...ude_ignition_transport_log_SqlStatement.hh | 29 + .../files/patch-log_src_QueryOptions.cc | 20 + .../files/patch-src_NetUtils.cc | 28 + .../files/patch-test_test__config.h.in | 20 + devel/ignition-transport/pkg-descr | 4 + devel/ignition-transport/pkg-plist | 64 + devel/py-llvmlite/Makefile | 5 +- devel/py-llvmlite/distinfo | 6 +- devel/py-numba/Makefile | 21 +- devel/py-numba/distinfo | 6 +- .../files/patch-numba_npyufunc_workqueue.c | 14 + devel/rust-bindgen/Makefile | 1 - editors/openoffice-4/distinfo | 4 +- graphics/Makefile | 1 + graphics/opencollada/Makefile | 2 +- graphics/opencollada/distinfo | 6 +- graphics/pencil2d/Makefile | 28 + graphics/pencil2d/distinfo | 3 + graphics/pencil2d/files/patch-app_app.pro | 11 + graphics/pencil2d/pkg-descr | 5 + mail/nocc/Makefile | 5 +- mail/nocc/distinfo | 6 +- mail/postfix-current/Makefile | 2 +- mail/postfix-current/distinfo | 6 +- mail/thunderbird/Makefile | 5 +- mail/thunderbird/files/patch-bug1021761 | 1269 ----------------- mail/thunderbird/files/patch-ijg-libjpeg | 383 ----- mail/thunderbird/files/patch-sample-type | 13 - mail/thunderbird/files/patch-z-bug517422 | 496 ------- math/ignition-math/Makefile | 10 +- math/ignition-math/pkg-plist | 132 +- math/ipopt/Makefile | 2 +- math/ipopt/distinfo | 6 +- math/ipopt/pkg-plist | 6 +- math/mkl-dnn/Makefile | 17 +- math/mkl-dnn/distinfo | 6 +- math/mkl-dnn/files/patch-CMakeLists.txt | 15 +- math/octave/Makefile | 2 +- math/octomap/Makefile | 3 +- math/octomap/distinfo | 6 +- .../files/patch-octomap_src_CMakeLists.txt | 10 +- math/py-pyFFTW/Makefile | 2 +- math/py-pyFFTW/distinfo | 6 +- math/py-pyFFTW/files/patch-setup.py | 13 - misc/Makefile | 2 + misc/ignition-fuel-tools/Makefile | 41 + misc/ignition-fuel-tools/distinfo | 3 + .../files/patch-CMakeLists.txt | 22 + .../files/patch-src_CMakeLists.txt | 11 + .../patch-test_integration_CMakeLists.txt | 9 + misc/ignition-fuel-tools/pkg-descr | 4 + misc/ignition-fuel-tools/pkg-plist | 33 + misc/sdformat/Makefile | 40 + misc/sdformat/distinfo | 3 + misc/sdformat/files/patch-CMakeLists.txt | 24 + .../sdformat/files/patch-cmake_SDFUtils.cmake | 17 + .../files/patch-cmake_SearchForStuff.cmake | 34 + misc/sdformat/files/patch-src_CMakeLists.txt | 13 + misc/sdformat/pkg-descr | 9 + misc/sdformat/pkg-plist | 387 +++++ multimedia/bitstream/Makefile | 2 +- multimedia/bitstream/distinfo | 6 +- multimedia/bitstream/pkg-plist | 1 + net-im/ktp-approver/Makefile | 3 + net-im/ktp-approver/pkg-descr | 2 +- net-mgmt/Makefile | 2 - .../Makefile | 34 - .../distinfo | 2 - .../pkg-descr | 13 - .../pkg-plist | 17 - .../Makefile | 28 - .../distinfo | 2 - .../pkg-descr | 3 - .../pkg-plist | 5 - net/torsocks/Makefile | 3 +- net/torsocks/distinfo | 6 +- net/torsocks/files/patch-src_common_compat.h | 4 +- net/torsocks/files/patch-src_lib_syscall.c | 50 - net/torsocks/files/patch-src_lib_torsocks.c | 14 + science/gpaw-setups/Makefile | 2 +- science/gpaw-setups/distinfo | 6 +- science/py-spglib/Makefile | 3 +- science/py-spglib/distinfo | 6 +- science/spglib/Makefile | 2 +- science/spglib/distinfo | 6 +- sysutils/bareos-client-static/Makefile | 1 - sysutils/bareos-client/Makefile | 1 - sysutils/bareos-docs/distinfo | 6 +- sysutils/bareos-server/Makefile | 11 +- sysutils/bareos-server/distinfo | 6 +- sysutils/bareos-server/files/bareos-dir.in | 20 +- sysutils/bareos-server/files/bareos-fd.in | 2 +- sysutils/bareos-server/files/bareos-sd.in | 2 +- sysutils/bareos-traymonitor/Makefile | 1 - textproc/elasticsearch6/Makefile | 4 +- www/Makefile | 1 + www/cliqz/Makefile | 110 ++ www/cliqz/distinfo | 11 + www/cliqz/files/patch-cliqz__env.sh | 24 + .../files/patch-magic__build__and__package.sh | 8 + ...lla-release_browser_config_cliqz.mozconfig | 10 + .../patch-mozilla-release_config_rules.mk | 26 + ...m_src_third__party_libevent_evutil__rand.c | 11 + ...hird__party_libevent_include_event2_util.h | 11 + ..._party_libevent_patches_noarc4random.patch | 68 + ...-release_nsprpub_pr_src_pthreads_ptsynch.c | 12 + www/cliqz/pkg-descr | 5 + www/cliqz/pkg-plist | 55 + www/firefox-esr/Makefile | 7 +- www/firefox-esr/files/patch-bug1021761 | 1269 ----------------- www/firefox-esr/files/patch-ijg-libjpeg | 383 ----- www/firefox-esr/files/patch-sample-type | 13 - www/firefox-esr/files/patch-z-bug517422 | 496 ------- www/firefox-esr/pkg-message | 4 +- www/firefox/Makefile | 6 +- www/firefox/Makefile.options | 10 +- www/firefox/files/patch-bug1021761 | 1268 ---------------- www/firefox/files/patch-bug991253 | 17 - www/firefox/files/patch-ijg-libjpeg | 383 ----- www/firefox/files/patch-sample-type | 22 - www/firefox/files/patch-z-bug517422 | 496 ------- www/firefox/pkg-message | 4 +- www/flashplayer/Makefile | 2 +- www/linux-flashplayer/Makefile | 2 +- www/linux-flashplayer/distinfo | 6 +- www/node/Makefile | 2 +- www/node/distinfo | 6 +- www/node8/Makefile | 3 +- www/node8/distinfo | 6 +- www/palemoon/Makefile | 8 +- www/py-django-redis/Makefile | 4 +- www/py-django-redis/distinfo | 6 +- www/py-python-digitalocean/Makefile | 2 +- www/py-python-digitalocean/distinfo | 6 +- www/seamonkey/Makefile | 5 +- www/seamonkey/files/patch-bug1021761 | 1157 --------------- www/seamonkey/files/patch-ijg-libjpeg | 383 ----- www/seamonkey/files/patch-sample-type | 13 - www/seamonkey/files/patch-z-bug517422 | 502 ------- 167 files changed, 2278 insertions(+), 9419 deletions(-) create mode 100644 devel/ignition-common/Makefile create mode 100644 devel/ignition-common/distinfo create mode 100644 devel/ignition-common/pkg-descr create mode 100644 devel/ignition-common/pkg-plist create mode 100644 devel/ignition-transport/Makefile create mode 100644 devel/ignition-transport/distinfo create mode 100644 devel/ignition-transport/files/patch-CMakeLists.txt create mode 100644 devel/ignition-transport/files/patch-log_include_ignition_transport_log_SqlStatement.hh create mode 100644 devel/ignition-transport/files/patch-log_src_QueryOptions.cc create mode 100644 devel/ignition-transport/files/patch-src_NetUtils.cc create mode 100644 devel/ignition-transport/files/patch-test_test__config.h.in create mode 100644 devel/ignition-transport/pkg-descr create mode 100644 devel/ignition-transport/pkg-plist create mode 100644 devel/py-numba/files/patch-numba_npyufunc_workqueue.c create mode 100644 graphics/pencil2d/Makefile create mode 100644 graphics/pencil2d/distinfo create mode 100644 graphics/pencil2d/files/patch-app_app.pro create mode 100644 graphics/pencil2d/pkg-descr delete mode 100644 mail/thunderbird/files/patch-bug1021761 delete mode 100644 mail/thunderbird/files/patch-ijg-libjpeg delete mode 100644 mail/thunderbird/files/patch-sample-type delete mode 100644 mail/thunderbird/files/patch-z-bug517422 delete mode 100644 math/py-pyFFTW/files/patch-setup.py create mode 100644 misc/ignition-fuel-tools/Makefile create mode 100644 misc/ignition-fuel-tools/distinfo create mode 100644 misc/ignition-fuel-tools/files/patch-CMakeLists.txt create mode 100644 misc/ignition-fuel-tools/files/patch-src_CMakeLists.txt create mode 100644 misc/ignition-fuel-tools/files/patch-test_integration_CMakeLists.txt create mode 100644 misc/ignition-fuel-tools/pkg-descr create mode 100644 misc/ignition-fuel-tools/pkg-plist create mode 100644 misc/sdformat/Makefile create mode 100644 misc/sdformat/distinfo create mode 100644 misc/sdformat/files/patch-CMakeLists.txt create mode 100644 misc/sdformat/files/patch-cmake_SDFUtils.cmake create mode 100644 misc/sdformat/files/patch-cmake_SearchForStuff.cmake create mode 100644 misc/sdformat/files/patch-src_CMakeLists.txt create mode 100644 misc/sdformat/pkg-descr create mode 100644 misc/sdformat/pkg-plist delete mode 100644 net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/Makefile delete mode 100644 net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/distinfo delete mode 100644 net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/pkg-descr delete mode 100644 net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/pkg-plist delete mode 100644 net-mgmt/p5-FusionInventory-Agent-Task-SNMPQuery/Makefile delete mode 100644 net-mgmt/p5-FusionInventory-Agent-Task-SNMPQuery/distinfo delete mode 100644 net-mgmt/p5-FusionInventory-Agent-Task-SNMPQuery/pkg-descr delete mode 100644 net-mgmt/p5-FusionInventory-Agent-Task-SNMPQuery/pkg-plist delete mode 100644 net/torsocks/files/patch-src_lib_syscall.c create mode 100644 net/torsocks/files/patch-src_lib_torsocks.c create mode 100644 www/cliqz/Makefile create mode 100644 www/cliqz/distinfo create mode 100644 www/cliqz/files/patch-cliqz__env.sh create mode 100644 www/cliqz/files/patch-magic__build__and__package.sh create mode 100644 www/cliqz/files/patch-mozilla-release_browser_config_cliqz.mozconfig create mode 100644 www/cliqz/files/patch-mozilla-release_config_rules.mk create mode 100644 www/cliqz/files/patch-mozilla-release_ipc_chromium_src_third__party_libevent_evutil__rand.c create mode 100644 www/cliqz/files/patch-mozilla-release_ipc_chromium_src_third__party_libevent_include_event2_util.h create mode 100644 www/cliqz/files/patch-mozilla-release_ipc_chromium_src_third__party_libevent_patches_noarc4random.patch create mode 100644 www/cliqz/files/patch-mozilla-release_nsprpub_pr_src_pthreads_ptsynch.c create mode 100644 www/cliqz/pkg-descr create mode 100644 www/cliqz/pkg-plist delete mode 100644 www/firefox-esr/files/patch-bug1021761 delete mode 100644 www/firefox-esr/files/patch-ijg-libjpeg delete mode 100644 www/firefox-esr/files/patch-sample-type delete mode 100644 www/firefox-esr/files/patch-z-bug517422 delete mode 100644 www/firefox/files/patch-bug1021761 delete mode 100644 www/firefox/files/patch-bug991253 delete mode 100644 www/firefox/files/patch-ijg-libjpeg delete mode 100644 www/firefox/files/patch-sample-type delete mode 100644 www/firefox/files/patch-z-bug517422 delete mode 100644 www/seamonkey/files/patch-bug1021761 delete mode 100644 www/seamonkey/files/patch-ijg-libjpeg delete mode 100644 www/seamonkey/files/patch-sample-type delete mode 100644 www/seamonkey/files/patch-z-bug517422 diff --git a/audio/x42-plugins-lv2/Makefile b/audio/x42-plugins-lv2/Makefile index bf1478b9ed4..85b171a3692 100644 --- a/audio/x42-plugins-lv2/Makefile +++ b/audio/x42-plugins-lv2/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= x42-plugins -DISTVERSION= 20180812 # the version is published here: http://gareus.org/misc/x42-plugins.php -PORTREVISION= 3 +DISTVERSION= 20181103 # the version is published here: http://gareus.org/misc/x42-plugins.php CATEGORIES= audio MASTER_SITES= http://gareus.org/misc/x42-plugins/ PKGNAMESUFFIX= -lv2 @@ -25,7 +24,7 @@ LIB_DEPENDS= libfftw3f.so:math/fftw3-float \ libsndfile.so:audio/libsndfile \ libzita-convolver.so:audio/zita-convolver -USES= gmake localbase pkgconfig tar:xz shebangfix +USES= gl gmake gnome localbase pkgconfig tar:xz shebangfix USE_GITHUB= nodefault GH_TUPLE= x42:convoLV2:f814f1e:x/convoLV2zita4 USE_GNOME= glib20 pango cairo diff --git a/audio/x42-plugins-lv2/distinfo b/audio/x42-plugins-lv2/distinfo index 64cfd774e8e..e9107befa56 100644 --- a/audio/x42-plugins-lv2/distinfo +++ b/audio/x42-plugins-lv2/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1534088724 -SHA256 (x42-plugins-20180812.tar.xz) = bf25df6d7557a4c7b0374da4b0f829cd3baa53e457df210d4b5c4ca16efffc3f -SIZE (x42-plugins-20180812.tar.xz) = 6900116 +TIMESTAMP = 1542737248 +SHA256 (x42-plugins-20181103.tar.xz) = 681070c46e53ae71ead6a1f2f9b8cb1f45de9dcd0d57d5811382da232536ad20 +SIZE (x42-plugins-20181103.tar.xz) = 6912412 SHA256 (x42-convoLV2-f814f1e_GH0.tar.gz) = eb6dac82ddffa7850292f41ee4be37c0ea3fa862ed7a9f258b4ca69b423940a7 SIZE (x42-convoLV2-f814f1e_GH0.tar.gz) = 21654 diff --git a/cad/gtkwave/Makefile b/cad/gtkwave/Makefile index a91511234f5..2b686fc3c2d 100644 --- a/cad/gtkwave/Makefile +++ b/cad/gtkwave/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gtkwave -PORTVERSION= 3.3.95 +PORTVERSION= 3.3.96 CATEGORIES= cad MASTER_SITES= http://gtkwave.sourceforge.net/ diff --git a/cad/gtkwave/distinfo b/cad/gtkwave/distinfo index f015b118985..65fbf1fe0f9 100644 --- a/cad/gtkwave/distinfo +++ b/cad/gtkwave/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1541244112 -SHA256 (gtkwave-3.3.95.tar.gz) = 4eb9aa2e52533a28a4a21d450a4d9b01bf9d9bbb2539f9e566364075a3e529a5 -SIZE (gtkwave-3.3.95.tar.gz) = 4162274 +TIMESTAMP = 1542643776 +SHA256 (gtkwave-3.3.96.tar.gz) = ad6808c3ca37684827f29a4169158f9fcbc171a9cd0aa69e0e293bcc9568000b +SIZE (gtkwave-3.3.96.tar.gz) = 4164520 diff --git a/databases/clickhouse/Makefile b/databases/clickhouse/Makefile index 7c8fb8f620b..0bef3429350 100644 --- a/databases/clickhouse/Makefile +++ b/databases/clickhouse/Makefile @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= clickhouse -PORTVERSION= 18.12.17 +PORTVERSION= 18.14.11 DISTVERSIONPREFIX= v DISTVERSIONSUFFIX= -stable -PORTREVISION= 1 CATEGORIES= databases MAINTAINER= proler@gmail.com @@ -32,11 +31,12 @@ LIB_DEPENDS= libtcmalloc.so:devel/google-perftools \ libPocoNet.so:devel/poco \ libunwind.so:devel/libunwind \ librdkafka.so:net/librdkafka \ + libcpuid.so:sysutils/libcpuid \ libgtest.so:devel/googletest -#TODO: libcpuid.so:sysutils/libcpuid \ # /usr/local/include/libcpuid/libcpuid_types.h:61:29: error: typedef redefinition with different types ('long long' vs '__int64_t' (aka 'long')) USES= compiler:c++14-lang cmake iconv mysql ssl readline shebangfix USE_LDCONFIG= yes + CMAKE_ARGS= -DUNBUNDLED=1 \ -DUSE_STATIC_LIBRARIES=0 \ -DNO_WERROR=1 \ diff --git a/databases/clickhouse/distinfo b/databases/clickhouse/distinfo index ca0e77e35ba..64266d83112 100644 --- a/databases/clickhouse/distinfo +++ b/databases/clickhouse/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1537184117 -SHA256 (yandex-ClickHouse-v18.12.17-stable_GH0.tar.gz) = 48cd12610223e690ebc2852cb5eae7bbdc7d47d564b1b61f5fb0a6fd7503645c -SIZE (yandex-ClickHouse-v18.12.17-stable_GH0.tar.gz) = 6495521 +TIMESTAMP = 1540814574 +SHA256 (yandex-ClickHouse-v18.14.11-stable_GH0.tar.gz) = 40c8f08f339829a2e5187c5990b8eaffcedfd1b6f169ae98d6b4e72cc183f469 +SIZE (yandex-ClickHouse-v18.14.11-stable_GH0.tar.gz) = 6694717 diff --git a/databases/clickhouse/pkg-plist b/databases/clickhouse/pkg-plist index 055283e1c29..388d5311175 100644 --- a/databases/clickhouse/pkg-plist +++ b/databases/clickhouse/pkg-plist @@ -23,7 +23,7 @@ bin/clickhouse-zookeeper-cli %%ETCDIR%%-server/server-test.xml @sample %%ETCDIR%%-server/users.xml.sample lib/libclickhouse.so -lib/libclickhouse.so.18.12 +lib/libclickhouse.so.18.14 lib/libclickhouse.so.%%SOVERSION%% %%DATADIR%%-test/external_dictionaries/CTestTestfile.cmake %%DATADIR%%-test/external_dictionaries/README.md @@ -81,6 +81,7 @@ lib/libclickhouse.so.%%SOVERSION%% %%DATADIR%%-test/performance/create_benchmark_page.py %%DATADIR%%-test/performance/date_parsing/date_parsing.xml %%DATADIR%%-test/performance/date_time/date_time.xml +%%DATADIR%%-test/performance/date_time/format_date_time.xml %%DATADIR%%-test/performance/float_parsing/float_parsing.xml %%DATADIR%%-test/performance/functions_coding/functions_coding.xml %%DATADIR%%-test/performance/functions_json/visit_param_extract_raw.xml @@ -1026,6 +1027,8 @@ lib/libclickhouse.so.%%SOVERSION%% %%DATADIR%%-test/queries/0_stateless/00441_nulls_in.sql %%DATADIR%%-test/queries/0_stateless/00442_filter_by_nullable.reference %%DATADIR%%-test/queries/0_stateless/00442_filter_by_nullable.sql +%%DATADIR%%-test/queries/0_stateless/00443_merge_tree_uniform_read_distribution_0.reference +%%DATADIR%%-test/queries/0_stateless/00443_merge_tree_uniform_read_distribution_0.sh %%DATADIR%%-test/queries/0_stateless/00443_optimize_final_vertical_merge.reference %%DATADIR%%-test/queries/0_stateless/00443_optimize_final_vertical_merge.sh %%DATADIR%%-test/queries/0_stateless/00443_preferred_block_size_bytes.reference @@ -1158,6 +1161,10 @@ lib/libclickhouse.so.%%SOVERSION%% %%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon.sql %%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon_bug.reference %%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon_bug.sql +%%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon_bug_2.reference +%%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon_bug_2.sql +%%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon_bug_3_linestring_rotation_precision.reference +%%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon_bug_3_linestring_rotation_precision.sql %%DATADIR%%-test/queries/0_stateless/00501_http_head.reference %%DATADIR%%-test/queries/0_stateless/00501_http_head.sh %%DATADIR%%-test/queries/0_stateless/00502_custom_partitioning_local.reference @@ -1682,10 +1689,16 @@ lib/libclickhouse.so.%%SOVERSION%% %%DATADIR%%-test/queries/0_stateless/00688_aggregation_retention.sql %%DATADIR%%-test/queries/0_stateless/00688_case_without_else.reference %%DATADIR%%-test/queries/0_stateless/00688_case_without_else.sql +%%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_alter_add_column.reference +%%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_alter_add_column.sql %%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_defaults.reference %%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_defaults.sql %%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_dictionary_deserialization.reference %%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_dictionary_deserialization.sql +%%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_in.reference +%%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_in.sql +%%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_nullable_cast.reference +%%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_nullable_cast.sql %%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_prewhere.reference %%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_prewhere.sql %%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_serialization.reference @@ -1729,6 +1742,8 @@ lib/libclickhouse.so.%%SOVERSION%% %%DATADIR%%-test/queries/0_stateless/00700_decimal_compare.sql %%DATADIR%%-test/queries/0_stateless/00700_decimal_complex_types.reference %%DATADIR%%-test/queries/0_stateless/00700_decimal_complex_types.sql +%%DATADIR%%-test/queries/0_stateless/00700_decimal_defaults.reference +%%DATADIR%%-test/queries/0_stateless/00700_decimal_defaults.sql %%DATADIR%%-test/queries/0_stateless/00700_decimal_formats.reference %%DATADIR%%-test/queries/0_stateless/00700_decimal_formats.sql %%DATADIR%%-test/queries/0_stateless/00700_decimal_in_keys.reference @@ -1759,6 +1774,10 @@ lib/libclickhouse.so.%%SOVERSION%% %%DATADIR%%-test/queries/0_stateless/00705_aggregate_states_addition.sql %%DATADIR%%-test/queries/0_stateless/00705_drop_create_merge_tree.reference %%DATADIR%%-test/queries/0_stateless/00705_drop_create_merge_tree.sh +%%DATADIR%%-test/queries/0_stateless/00706_iso_week_and_day_of_year.reference +%%DATADIR%%-test/queries/0_stateless/00706_iso_week_and_day_of_year.sql +%%DATADIR%%-test/queries/0_stateless/00707_float_csv_delimiter.reference +%%DATADIR%%-test/queries/0_stateless/00707_float_csv_delimiter.sql %%DATADIR%%-test/queries/0_stateless/00709_virtual_column_partition_id.reference %%DATADIR%%-test/queries/0_stateless/00709_virtual_column_partition_id.sql %%DATADIR%%-test/queries/0_stateless/00710_array_enumerate_dense.reference @@ -1773,8 +1792,12 @@ lib/libclickhouse.so.%%SOVERSION%% %%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_alias_and_virtual_column.sql %%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_alias_bug.reference %%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_alias_bug.sql +%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_final.reference +%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_final.sql %%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_missing_columns.reference %%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_missing_columns.sql +%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_missing_columns_2.reference +%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_missing_columns_2.sql %%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_sampling.reference %%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_sampling.sql %%DATADIR%%-test/queries/0_stateless/00713_collapsing_merge_tree.reference @@ -1785,10 +1808,82 @@ lib/libclickhouse.so.%%SOVERSION%% %%DATADIR%%-test/queries/0_stateless/00714_create_temporary_table_with_in_clause.sql %%DATADIR%%-test/queries/0_stateless/00715_fetch_merged_or_mutated_part_zookeeper.reference %%DATADIR%%-test/queries/0_stateless/00715_fetch_merged_or_mutated_part_zookeeper.sql +%%DATADIR%%-test/queries/0_stateless/00715_json_each_row_input_nested.reference +%%DATADIR%%-test/queries/0_stateless/00715_json_each_row_input_nested.sh %%DATADIR%%-test/queries/0_stateless/00716_allow_ddl.reference %%DATADIR%%-test/queries/0_stateless/00716_allow_ddl.sql +%%DATADIR%%-test/queries/0_stateless/00717_default_join_type.reference +%%DATADIR%%-test/queries/0_stateless/00717_default_join_type.sql +%%DATADIR%%-test/queries/0_stateless/00717_low_cardinaliry_group_by.reference +%%DATADIR%%-test/queries/0_stateless/00717_low_cardinaliry_group_by.sql %%DATADIR%%-test/queries/0_stateless/00717_merge_and_distributed.reference %%DATADIR%%-test/queries/0_stateless/00717_merge_and_distributed.sql +%%DATADIR%%-test/queries/0_stateless/00718_format_datetime.reference +%%DATADIR%%-test/queries/0_stateless/00718_format_datetime.sql +%%DATADIR%%-test/queries/0_stateless/00718_low_cardinaliry_alter.reference +%%DATADIR%%-test/queries/0_stateless/00718_low_cardinaliry_alter.sql +%%DATADIR%%-test/queries/0_stateless/00719_format_datetime_rand.reference +%%DATADIR%%-test/queries/0_stateless/00719_format_datetime_rand.sql +%%DATADIR%%-test/queries/0_stateless/00719_insert_block_without_column.reference +%%DATADIR%%-test/queries/0_stateless/00719_insert_block_without_column.sh +%%DATADIR%%-test/queries/0_stateless/00719_parallel_ddl_db.reference +%%DATADIR%%-test/queries/0_stateless/00719_parallel_ddl_db.sh +%%DATADIR%%-test/queries/0_stateless/00719_parallel_ddl_table.reference +%%DATADIR%%-test/queries/0_stateless/00719_parallel_ddl_table.sh +%%DATADIR%%-test/queries/0_stateless/00720_combinations_of_aggregate_combinators.reference +%%DATADIR%%-test/queries/0_stateless/00720_combinations_of_aggregate_combinators.sql +%%DATADIR%%-test/queries/0_stateless/00720_with_cube.reference +%%DATADIR%%-test/queries/0_stateless/00720_with_cube.sql +%%DATADIR%%-test/queries/0_stateless/00721_force_by_identical_result_after_merge_zookeeper.reference +%%DATADIR%%-test/queries/0_stateless/00721_force_by_identical_result_after_merge_zookeeper.sql +%%DATADIR%%-test/queries/0_stateless/00722_inner_join.reference +%%DATADIR%%-test/queries/0_stateless/00722_inner_join.sql +%%DATADIR%%-test/queries/0_stateless/00723_remerge_sort.reference +%%DATADIR%%-test/queries/0_stateless/00723_remerge_sort.sql +%%DATADIR%%-test/queries/0_stateless/00724_insert_values_datetime_conversion.reference +%%DATADIR%%-test/queries/0_stateless/00724_insert_values_datetime_conversion.sql +%%DATADIR%%-test/queries/0_stateless/00725_join_on_bug_1.reference +%%DATADIR%%-test/queries/0_stateless/00725_join_on_bug_1.sql +%%DATADIR%%-test/queries/0_stateless/00725_join_on_bug_2.reference +%%DATADIR%%-test/queries/0_stateless/00725_join_on_bug_2.sql +%%DATADIR%%-test/queries/0_stateless/00725_join_on_bug_3.reference +%%DATADIR%%-test/queries/0_stateless/00725_join_on_bug_3.sql +%%DATADIR%%-test/queries/0_stateless/00725_join_on_bug_4.reference +%%DATADIR%%-test/queries/0_stateless/00725_join_on_bug_4.sql +%%DATADIR%%-test/queries/0_stateless/00725_memory_tracking.reference +%%DATADIR%%-test/queries/0_stateless/00725_memory_tracking.sql +%%DATADIR%%-test/queries/0_stateless/00725_quantiles_shard.reference +%%DATADIR%%-test/queries/0_stateless/00725_quantiles_shard.sql +%%DATADIR%%-test/queries/0_stateless/00726_length_aliases.reference +%%DATADIR%%-test/queries/0_stateless/00726_length_aliases.sql +%%DATADIR%%-test/queries/0_stateless/00726_materialized_view_concurrent.reference +%%DATADIR%%-test/queries/0_stateless/00726_materialized_view_concurrent.sql +%%DATADIR%%-test/queries/0_stateless/00727_concat.reference +%%DATADIR%%-test/queries/0_stateless/00727_concat.sql +%%DATADIR%%-test/queries/0_stateless/00728_json_each_row_parsing.reference +%%DATADIR%%-test/queries/0_stateless/00728_json_each_row_parsing.sh +%%DATADIR%%-test/queries/0_stateless/00729_prewhere_array_join.reference +%%DATADIR%%-test/queries/0_stateless/00729_prewhere_array_join.sql +%%DATADIR%%-test/queries/0_stateless/00730_unicode_terminal_format.reference +%%DATADIR%%-test/queries/0_stateless/00730_unicode_terminal_format.sql +%%DATADIR%%-test/queries/0_stateless/00731_merge_tree_select_opened_files.reference +%%DATADIR%%-test/queries/0_stateless/00731_merge_tree_select_opened_files.sh +%%DATADIR%%-test/queries/0_stateless/00732_decimal_summing_merge_tree.reference +%%DATADIR%%-test/queries/0_stateless/00732_decimal_summing_merge_tree.sql +%%DATADIR%%-test/queries/0_stateless/00733_if_datetime.reference +%%DATADIR%%-test/queries/0_stateless/00733_if_datetime.sql +%%DATADIR%%-test/queries/0_stateless/00734_timeslot.reference +%%DATADIR%%-test/queries/0_stateless/00734_timeslot.sql +%%DATADIR%%-test/queries/0_stateless/00735_conditional.reference +%%DATADIR%%-test/queries/0_stateless/00735_conditional.sql +%%DATADIR%%-test/queries/0_stateless/00735_or_expr_optimize_bug.reference +%%DATADIR%%-test/queries/0_stateless/00735_or_expr_optimize_bug.sql +%%DATADIR%%-test/queries/0_stateless/00736_disjunction_optimisation.reference +%%DATADIR%%-test/queries/0_stateless/00736_disjunction_optimisation.sql +%%DATADIR%%-test/queries/0_stateless/00737_decimal_group_by.reference +%%DATADIR%%-test/queries/0_stateless/00737_decimal_group_by.sql +%%DATADIR%%-test/queries/0_stateless/00738_nested_merge_multidimensional_array.reference +%%DATADIR%%-test/queries/0_stateless/00738_nested_merge_multidimensional_array.sql %%DATADIR%%-test/queries/0_stateless/mergetree_mutations.lib %%DATADIR%%-test/queries/1_stateful/00001_count_hits.reference %%DATADIR%%-test/queries/1_stateful/00001_count_hits.sql @@ -1976,6 +2071,7 @@ lib/libclickhouse.so.%%SOVERSION%% %%DATADIR%%-test/queries/1_stateful/00149_quantiles_timing_distributed.sql %%DATADIR%%-test/queries/1_stateful/00150_quantiles_timing_precision.reference %%DATADIR%%-test/queries/1_stateful/00150_quantiles_timing_precision.sql +%%DATADIR%%-test/queries/bugs/prewhere_alias_array.sql %%DATADIR%%-test/queries/shell_config.sh @dir %%DATADIR%%/headers/%%SOVERSION%% @dir %%DATADIR%%-test/external_dictionaries/CMakeFiles diff --git a/databases/pg_stat_kcache/Makefile b/databases/pg_stat_kcache/Makefile index 67854478130..4b4264c36e9 100644 --- a/databases/pg_stat_kcache/Makefile +++ b/databases/pg_stat_kcache/Makefile @@ -2,7 +2,8 @@ # $FreeBSD$ PORTNAME= pg_stat_kcache -PORTVERSION= 2.1.1 +DISTVERSIONPREFIX= REL +DISTVERSION= 2_1_1 CATEGORIES= databases MAINTAINER= girgen@FreeBSD.org @@ -16,7 +17,6 @@ WANT_PGSQL= server contrib USE_GITHUB= yes GH_ACCOUNT= powa-team -GH_TAGNAME= REL${PORTVERSION:S/./_/g} pre-patch: @${MV} ${BUILD_WRKSRC}/README.rst ${BUILD_WRKSRC}/${PORTNAME}-README.rst diff --git a/databases/pg_stat_kcache/distinfo b/databases/pg_stat_kcache/distinfo index d10ecb1268d..e3a133a3290 100644 --- a/databases/pg_stat_kcache/distinfo +++ b/databases/pg_stat_kcache/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1541542618 -SHA256 (powa-team-pg_stat_kcache-2.1.1-REL2_1_1_GH0.tar.gz) = 6d3bcbd1aba6263cd35b2c8b3b502618bb29ce7e5ac9dce0d23060f70342931a -SIZE (powa-team-pg_stat_kcache-2.1.1-REL2_1_1_GH0.tar.gz) = 14786 +TIMESTAMP = 1542789219 +SHA256 (powa-team-pg_stat_kcache-REL2_1_1_GH0.tar.gz) = 6d3bcbd1aba6263cd35b2c8b3b502618bb29ce7e5ac9dce0d23060f70342931a +SIZE (powa-team-pg_stat_kcache-REL2_1_1_GH0.tar.gz) = 14786 diff --git a/databases/powa-archivist/Makefile b/databases/powa-archivist/Makefile index 1d047db436a..dd0ab84a85b 100644 --- a/databases/powa-archivist/Makefile +++ b/databases/powa-archivist/Makefile @@ -2,7 +2,8 @@ # $FreeBSD$ PORTNAME= powa-archivist -PORTVERSION= 3.2.0 +DISTVERSIONPREFIX= REL_ +DISTVERSION= 3_2_0 CATEGORIES= databases MAINTAINER= girgen@FreeBSD.org @@ -15,7 +16,6 @@ RUN_DEPENDS= ${LOCALBASE}/lib/postgresql/pg_stat_kcache.so:databases/pg_stat_kca USE_GITHUB= yes GH_ACCOUNT= powa-team -GH_TAGNAME= REL_${PORTVERSION:S/./_/g} USES= gmake pgsql:9.4+ WANT_PGSQL= server contrib diff --git a/databases/powa-archivist/distinfo b/databases/powa-archivist/distinfo index f7ef4bfa5a4..85e83c63b16 100644 --- a/databases/powa-archivist/distinfo +++ b/databases/powa-archivist/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1541541549 -SHA256 (powa-team-powa-archivist-3.2.0-REL_3_2_0_GH0.tar.gz) = 8c582d7dc2a04a463959e6dee5a43285867cbcc8575f99a2396329ccae82af5f -SIZE (powa-team-powa-archivist-3.2.0-REL_3_2_0_GH0.tar.gz) = 82410 +TIMESTAMP = 1542789269 +SHA256 (powa-team-powa-archivist-REL_3_2_0_GH0.tar.gz) = 8c582d7dc2a04a463959e6dee5a43285867cbcc8575f99a2396329ccae82af5f +SIZE (powa-team-powa-archivist-REL_3_2_0_GH0.tar.gz) = 82410 diff --git a/devel/Makefile b/devel/Makefile index 2387a74dc24..caf5eb7c8cf 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1228,9 +1228,11 @@ SUBDIR += icu-lx SUBDIR += idutils SUBDIR += ignition-cmake + SUBDIR += ignition-common SUBDIR += ignition-msgs SUBDIR += ignition-plugin SUBDIR += ignition-tools + SUBDIR += ignition-transport SUBDIR += imake SUBDIR += inastemp SUBDIR += include-what-you-use diff --git a/devel/android-tools-simpleperf/Makefile b/devel/android-tools-simpleperf/Makefile index ba903f42aa3..35acd0625de 100644 --- a/devel/android-tools-simpleperf/Makefile +++ b/devel/android-tools-simpleperf/Makefile @@ -30,8 +30,6 @@ TEST_TARGET= test LDFLAGS+= -Wl,--as-needed # avoid overlinking (llvm deps) PLIST_FILES= bin/simpleperf -LLVM_DEFAULT?= 70 - OPTIONS_DEFINE= TEST TEST_BUILD_DEPENDS= googletest>=1.6.0:devel/googletest diff --git a/devel/awscli/Makefile b/devel/awscli/Makefile index 942729ca07b..d1c8949021e 100644 --- a/devel/awscli/Makefile +++ b/devel/awscli/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= awscli -PORTVERSION= 1.16.55 +PORTVERSION= 1.16.59 CATEGORIES= devel MASTER_SITES= CHEESESHOP @@ -12,7 +12,7 @@ COMMENT= Universal Command Line Interface for Amazon Web Services LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}botocore>=1.12.45:devel/py-botocore@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}botocore>=1.12.49:devel/py-botocore@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}colorama>=0.2.5:devel/py-colorama@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}s3transfer>=0.1.12:net/py-s3transfer@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}docutils>=0.10:textproc/py-docutils@${PY_FLAVOR} \ diff --git a/devel/awscli/distinfo b/devel/awscli/distinfo index 1536ac6dfd4..e31c645aa59 100644 --- a/devel/awscli/distinfo +++ b/devel/awscli/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1542313163 -SHA256 (awscli-1.16.55.tar.gz) = 621faf36bd630b2adeddf5485a24e6f3e93993b8121c02fdd6b8518d989fca93 -SIZE (awscli-1.16.55.tar.gz) = 637265 +TIMESTAMP = 1542775587 +SHA256 (awscli-1.16.59.tar.gz) = 54495270305bef777f4d363396b69395bb7fffc9592433adb8be0317b1e2f097 +SIZE (awscli-1.16.59.tar.gz) = 637277 diff --git a/devel/ignition-cmake/Makefile b/devel/ignition-cmake/Makefile index 8cd62407251..86d822a85e0 100644 --- a/devel/ignition-cmake/Makefile +++ b/devel/ignition-cmake/Makefile @@ -21,9 +21,9 @@ BB_ACCOUNT= ignitionrobotics BB_PROJECT= ign-cmake BB_COMMIT= 776c2bfe1d18 -PLIST_SUB+= IGN_VER=${DISTVERSION:R:R} - WRKSRC= ${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT} NO_ARCH= yes +PLIST_SUB+= CMAKE_IGN_VER=cmake${DISTVERSION:R:R} + .include diff --git a/devel/ignition-cmake/pkg-plist b/devel/ignition-cmake/pkg-plist index 37a7bd2abcd..07061169f28 100644 --- a/devel/ignition-cmake/pkg-plist +++ b/devel/ignition-cmake/pkg-plist @@ -1,61 +1,61 @@ -include/ignition/cmake%%IGN_VER%%/ignition/utilities/SuppressWarning.hh -include/ignition/cmake%%IGN_VER%%/ignition/utilities/detail/SuppressWarning.hh -libdata/pkgconfig/ignition-cmake%%IGN_VER%%.pc -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/Export.hh.in -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/FindAVCODEC.cmake -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/FindAVDEVICE.cmake -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/FindAVFORMAT.cmake -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/FindAVUTIL.cmake -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/FindCPPZMQ.cmake -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/FindDL.cmake -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/FindEIGEN3.cmake -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/FindFreeImage.cmake -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/FindGTS.cmake -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/FindIFADDRS.cmake -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/FindIgnCURL.cmake -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/FindIgnOGRE.cmake -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/FindIgnProtobuf.cmake -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/FindJSONCPP.cmake -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/FindODE.cmake -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/FindOGRE2.cmake -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/FindOptiX.cmake -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/FindSQLite3.cmake -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/FindSWSCALE.cmake -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/FindTINYXML2.cmake -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/FindUUID.cmake -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/FindYAML.cmake -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/FindZIP.cmake -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/FindZeroMQ.cmake -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/IgnCMake.cmake -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/IgnCheckSSE.cmake -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/IgnCodeCheck.cmake -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/IgnCodeCoverage.cmake -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/IgnConfigureBuild.cmake -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/IgnConfigureProject.cmake -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/IgnCreateDocs.cmake -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/IgnImportTarget.cmake -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/IgnPackaging.cmake -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/IgnPkgConfig.cmake -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/IgnRonn2Man.cmake -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/IgnSetCompilerFlags.cmake -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/IgnUtils.cmake -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/cmake_uninstall.cmake.in -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/cpack_options.cmake.in -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/ign_auto_headers.hh.in -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/ignition-all-config.cmake.in -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/ignition-component-config.cmake.in -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/ignition-config.cmake.in -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/pkgconfig/ignition-component.pc.in -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/pkgconfig/ignition.pc.in -share/cmake/ignition-cmake%%IGN_VER%%/cmake%%IGN_VER%%/upload_doc.sh.in -share/cmake/ignition-cmake%%IGN_VER%%/ignition-cmake%%IGN_VER%%-config-version.cmake -share/cmake/ignition-cmake%%IGN_VER%%/ignition-cmake%%IGN_VER%%-config.cmake -share/cmake/ignition-cmake%%IGN_VER%%/ignition-cmake%%IGN_VER%%-utilities-targets.cmake -share/ignition/ignition-cmake%%IGN_VER%%/codecheck/cpplint.py -share/ignition/ignition-cmake%%IGN_VER%%/codecheck/header_guard.rule -share/ignition/ignition-cmake%%IGN_VER%%/codecheck/namespace_AZ.rule -share/ignition/ignition-cmake%%IGN_VER%%/doxygen/api.in -share/ignition/ignition-cmake%%IGN_VER%%/doxygen/cppreference.tag.xml -share/ignition/ignition-cmake%%IGN_VER%%/doxygen/footer.html -share/ignition/ignition-cmake%%IGN_VER%%/doxygen/header.html -share/ignition/ignition-cmake%%IGN_VER%%/doxygen/layout.xml +include/ignition/%%CMAKE_IGN_VER%%/ignition/utilities/SuppressWarning.hh +include/ignition/%%CMAKE_IGN_VER%%/ignition/utilities/detail/SuppressWarning.hh +libdata/pkgconfig/ignition-%%CMAKE_IGN_VER%%.pc +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/Export.hh.in +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindAVCODEC.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindAVDEVICE.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindAVFORMAT.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindAVUTIL.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindCPPZMQ.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindDL.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindEIGEN3.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindFreeImage.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindGTS.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindIFADDRS.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindIgnCURL.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindIgnOGRE.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindIgnProtobuf.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindJSONCPP.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindODE.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindOGRE2.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindOptiX.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindSQLite3.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindSWSCALE.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindTINYXML2.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindUUID.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindYAML.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindZIP.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/FindZeroMQ.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/IgnCMake.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/IgnCheckSSE.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/IgnCodeCheck.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/IgnCodeCoverage.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/IgnConfigureBuild.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/IgnConfigureProject.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/IgnCreateDocs.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/IgnImportTarget.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/IgnPackaging.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/IgnPkgConfig.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/IgnRonn2Man.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/IgnSetCompilerFlags.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/IgnUtils.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/cmake_uninstall.cmake.in +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/cpack_options.cmake.in +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/ign_auto_headers.hh.in +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/ignition-all-config.cmake.in +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/ignition-component-config.cmake.in +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/ignition-config.cmake.in +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/pkgconfig/ignition-component.pc.in +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/pkgconfig/ignition.pc.in +share/cmake/ignition-%%CMAKE_IGN_VER%%/%%CMAKE_IGN_VER%%/upload_doc.sh.in +share/cmake/ignition-%%CMAKE_IGN_VER%%/ignition-%%CMAKE_IGN_VER%%-config-version.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/ignition-%%CMAKE_IGN_VER%%-config.cmake +share/cmake/ignition-%%CMAKE_IGN_VER%%/ignition-%%CMAKE_IGN_VER%%-utilities-targets.cmake +share/ignition/ignition-%%CMAKE_IGN_VER%%/codecheck/cpplint.py +share/ignition/ignition-%%CMAKE_IGN_VER%%/codecheck/header_guard.rule +share/ignition/ignition-%%CMAKE_IGN_VER%%/codecheck/namespace_AZ.rule +share/ignition/ignition-%%CMAKE_IGN_VER%%/doxygen/api.in +share/ignition/ignition-%%CMAKE_IGN_VER%%/doxygen/cppreference.tag.xml +share/ignition/ignition-%%CMAKE_IGN_VER%%/doxygen/footer.html +share/ignition/ignition-%%CMAKE_IGN_VER%%/doxygen/header.html +share/ignition/ignition-%%CMAKE_IGN_VER%%/doxygen/layout.xml diff --git a/devel/ignition-common/Makefile b/devel/ignition-common/Makefile new file mode 100644 index 00000000000..3aed46fe4b1 --- /dev/null +++ b/devel/ignition-common/Makefile @@ -0,0 +1,37 @@ +# $FreeBSD$ + +PORTNAME= ignition-common +DISTVERSION= 3.0.0 +CATEGORIES= devel +MASTER_SITES= https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/ + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Set of libraries designed to rapidly develop robot applications + +LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/COPYING + +BUILD_DEPENDS= ignition-cmake==2:devel/ignition-cmake +LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ + libfreeimage.so:graphics/freeimage \ + libgts.so:graphics/gts \ + libtinyxml2.so:textproc/tinyxml2 \ + libuuid.so:misc/e2fsprogs-libuuid \ + libignition-math6.so:math/ignition-math + +USES= cmake:outsource compiler:c++17-lang gnome pkgconfig +USE_GNOME= glib20 +USE_LDCONFIG= yes + +CMAKE_ON= USE_EXTERNAL_TINYXML2 +CMAKE_OFF= BUILD_TESTING + +BB_ACCOUNT= ignitionrobotics +BB_PROJECT= ign-common +BB_COMMIT= a5c4d5a35bb8 + +WRKSRC= ${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT} + +PLIST_SUB+= COMMON_IGN_VER=common${DISTVERSION:R:R} + +.include diff --git a/devel/ignition-common/distinfo b/devel/ignition-common/distinfo new file mode 100644 index 00000000000..aed54536b58 --- /dev/null +++ b/devel/ignition-common/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1542739222 +SHA256 (ignition-common-3.0.0.tar.gz) = a4cd8961aac4345780ae4e7b45e48e4594596a428cfa80110c19dc0fd583ff79 +SIZE (ignition-common-3.0.0.tar.gz) = 6834872 diff --git a/devel/ignition-common/pkg-descr b/devel/ignition-common/pkg-descr new file mode 100644 index 00000000000..d7576e0f1ac --- /dev/null +++ b/devel/ignition-common/pkg-descr @@ -0,0 +1,6 @@ +Ignition Common classes and functions for robot applications. + +Ignition Common is a component in the ignition framework, a set of libraries +designed to rapidly develop robot applications. + +WWW: https://ignitionrobotics.org/home diff --git a/devel/ignition-common/pkg-plist b/devel/ignition-common/pkg-plist new file mode 100644 index 00000000000..2872db4b82a --- /dev/null +++ b/devel/ignition-common/pkg-plist @@ -0,0 +1,116 @@ +include/ignition/%%COMMON_IGN_VER%%/ignition/common.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/Animation.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/AudioDecoder.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/BVHLoader.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/Base64.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/Battery.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/ColladaExporter.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/ColladaLoader.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/Console.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/Dem.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/EnumIface.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/Event.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/Export.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/Filesystem.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/GTSMeshUtils.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/HeightmapData.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/Image.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/ImageHeightmap.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/KeyEvent.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/KeyFrame.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/Material.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/MaterialDensity.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/Mesh.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/MeshCSG.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/MeshExporter.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/MeshLoader.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/MeshManager.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/MouseEvent.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/MovingWindowFilter.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/NodeAnimation.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/NodeTransform.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/OBJLoader.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/Plugin.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/PluginInfo.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/PluginLoader.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/PluginMacros.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/PluginPtr.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/STLLoader.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/SVGLoader.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/SignalHandler.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/SingletonT.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/Skeleton.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/SkeletonAnimation.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/SkeletonNode.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/SpecializedPlugin.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/SpecializedPluginPtr.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/StringUtils.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/SubMesh.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/SuppressWarning.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/SystemPaths.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/TemplateHelpers.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/Time.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/Timer.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/URI.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/Util.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/Uuid.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/Video.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/VideoEncoder.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/WorkerPool.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/av.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/av/Export.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/av/Util.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/av/detail/Export.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/config.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/detail/Export.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/detail/Plugin.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/detail/PluginLoader.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/detail/PluginMacros.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/detail/PluginPtr.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/detail/SpecializedPlugin.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/detail/SuppressWarning.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/detail/TemplateHelpers.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/events.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/events/Export.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/events/Types.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/events/detail/Export.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/ffmpeg_inc.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/graphics.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/graphics/Export.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/graphics/Types.hh +include/ignition/%%COMMON_IGN_VER%%/ignition/common/graphics/detail/Export.hh +lib/cmake/ignition-%%COMMON_IGN_VER%%-all/ignition-%%COMMON_IGN_VER%%-all-config-version.cmake +lib/cmake/ignition-%%COMMON_IGN_VER%%-all/ignition-%%COMMON_IGN_VER%%-all-config.cmake +lib/cmake/ignition-%%COMMON_IGN_VER%%-all/ignition-%%COMMON_IGN_VER%%-all-targets.cmake +lib/cmake/ignition-%%COMMON_IGN_VER%%-av/ignition-%%COMMON_IGN_VER%%-av-config-version.cmake +lib/cmake/ignition-%%COMMON_IGN_VER%%-av/ignition-%%COMMON_IGN_VER%%-av-config.cmake +lib/cmake/ignition-%%COMMON_IGN_VER%%-av/ignition-%%COMMON_IGN_VER%%-av-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/ignition-%%COMMON_IGN_VER%%-av/ignition-%%COMMON_IGN_VER%%-av-targets.cmake +lib/cmake/ignition-%%COMMON_IGN_VER%%-events/ignition-%%COMMON_IGN_VER%%-events-config-version.cmake +lib/cmake/ignition-%%COMMON_IGN_VER%%-events/ignition-%%COMMON_IGN_VER%%-events-config.cmake +lib/cmake/ignition-%%COMMON_IGN_VER%%-events/ignition-%%COMMON_IGN_VER%%-events-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/ignition-%%COMMON_IGN_VER%%-events/ignition-%%COMMON_IGN_VER%%-events-targets.cmake +lib/cmake/ignition-%%COMMON_IGN_VER%%-graphics/ignition-%%COMMON_IGN_VER%%-graphics-config-version.cmake +lib/cmake/ignition-%%COMMON_IGN_VER%%-graphics/ignition-%%COMMON_IGN_VER%%-graphics-config.cmake +lib/cmake/ignition-%%COMMON_IGN_VER%%-graphics/ignition-%%COMMON_IGN_VER%%-graphics-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/ignition-%%COMMON_IGN_VER%%-graphics/ignition-%%COMMON_IGN_VER%%-graphics-targets.cmake +lib/cmake/ignition-%%COMMON_IGN_VER%%/ignition-%%COMMON_IGN_VER%%-config-version.cmake +lib/cmake/ignition-%%COMMON_IGN_VER%%/ignition-%%COMMON_IGN_VER%%-config.cmake +lib/cmake/ignition-%%COMMON_IGN_VER%%/ignition-%%COMMON_IGN_VER%%-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/ignition-%%COMMON_IGN_VER%%/ignition-%%COMMON_IGN_VER%%-targets.cmake +lib/libignition-%%COMMON_IGN_VER%%-av.so +lib/libignition-%%COMMON_IGN_VER%%-av.so.3 +lib/libignition-%%COMMON_IGN_VER%%-av.so.%%GTK3_VERSION%%~pre2 +lib/libignition-%%COMMON_IGN_VER%%-events.so +lib/libignition-%%COMMON_IGN_VER%%-events.so.3 +lib/libignition-%%COMMON_IGN_VER%%-events.so.%%GTK3_VERSION%%~pre2 +lib/libignition-%%COMMON_IGN_VER%%-graphics.so +lib/libignition-%%COMMON_IGN_VER%%-graphics.so.3 +lib/libignition-%%COMMON_IGN_VER%%-graphics.so.%%GTK3_VERSION%%~pre2 +lib/libignition-%%COMMON_IGN_VER%%.so +lib/libignition-%%COMMON_IGN_VER%%.so.3 +lib/libignition-%%COMMON_IGN_VER%%.so.%%GTK3_VERSION%%~pre2 +libdata/pkgconfig/ignition-%%COMMON_IGN_VER%%-av.pc +libdata/pkgconfig/ignition-%%COMMON_IGN_VER%%-events.pc +libdata/pkgconfig/ignition-%%COMMON_IGN_VER%%-graphics.pc +libdata/pkgconfig/ignition-%%COMMON_IGN_VER%%.pc diff --git a/devel/ignition-msgs/Makefile b/devel/ignition-msgs/Makefile index fb043f5bbbf..f8738aa92ab 100644 --- a/devel/ignition-msgs/Makefile +++ b/devel/ignition-msgs/Makefile @@ -25,6 +25,6 @@ BB_COMMIT= 4a1cbcabff7d WRKSRC= ${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT} -PLIST_SUB+= IGN_VER=${DISTVERSION:R:R} +PLIST_SUB+= MSGS_IGN_VER=msgs${DISTVERSION:R:R} .include diff --git a/devel/ignition-msgs/pkg-plist b/devel/ignition-msgs/pkg-plist index ff2f706a8b8..de7c349cfda 100644 --- a/devel/ignition-msgs/pkg-plist +++ b/devel/ignition-msgs/pkg-plist @@ -1,311 +1,311 @@ -include/ignition/msgs%%IGN_VER%%/ignition/msgs.hh -include/ignition/msgs%%IGN_VER%%/ignition/msgs/Export.hh -include/ignition/msgs%%IGN_VER%%/ignition/msgs/Factory.hh -include/ignition/msgs%%IGN_VER%%/ignition/msgs/Filesystem.hh -include/ignition/msgs%%IGN_VER%%/ignition/msgs/MessageTypes.hh -include/ignition/msgs%%IGN_VER%%/ignition/msgs/SuppressWarning.hh -include/ignition/msgs%%IGN_VER%%/ignition/msgs/Utility.hh -include/ignition/msgs%%IGN_VER%%/ignition/msgs/altimeter.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/altimeter.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/any.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/any.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/atmosphere.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/atmosphere.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/axis.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/axis.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/battery.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/battery.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/boolean.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/boolean.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/boxgeom.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/boxgeom.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/bytes.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/bytes.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/camera_cmd.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/camera_cmd.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/camera_lens.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/camera_lens.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/camerasensor.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/camerasensor.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/cessna.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/cessna.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/clock.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/clock.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/cmd_vel2d.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/cmd_vel2d.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/collision.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/collision.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/color.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/color.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/config.hh -include/ignition/msgs%%IGN_VER%%/ignition/msgs/contact.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/contact.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/contacts.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/contacts.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/contactsensor.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/contactsensor.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/cylindergeom.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/cylindergeom.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/density.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/density.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/detail/Export.hh -include/ignition/msgs%%IGN_VER%%/ignition/msgs/detail/SuppressWarning.hh -include/ignition/msgs%%IGN_VER%%/ignition/msgs/diagnostics.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/diagnostics.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/distortion.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/distortion.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/double.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/double.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/double_v.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/double_v.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/duration.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/duration.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/empty.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/empty.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/entity_factory.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/entity_factory.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/float.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/float.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/float_v.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/float_v.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/fluid.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/fluid.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/fog.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/fog.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/friction.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/friction.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/geometry.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/geometry.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/gps.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/gps.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/gps_sensor.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/gps_sensor.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/gui.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/gui.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/gui_camera.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/gui_camera.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/header.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/header.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/heightmapgeom.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/heightmapgeom.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/hydra.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/hydra.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/ign.hh -include/ignition/msgs%%IGN_VER%%/ignition/msgs/image.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/image.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/imagegeom.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/imagegeom.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/imu.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/imu.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/imu_sensor.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/imu_sensor.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/inertial.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/inertial.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/int32.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/int32.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/int32_v.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/int32_v.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/int64.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/int64.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/int64_v.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/int64_v.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/joint.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/joint.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/joint_animation.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/joint_animation.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/joint_cmd.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/joint_cmd.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/joint_wrench.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/joint_wrench.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/joy.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/joy.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/joystick.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/joystick.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/laserscan.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/laserscan.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/light.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/light.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/link.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/link.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/link_data.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/link_data.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/log_control.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/log_control.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/log_playback_control.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/log_playback_control.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/log_playback_stats.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/log_playback_stats.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/log_status.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/log_status.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/logical_camera_image.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/logical_camera_image.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/logical_camera_sensor.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/logical_camera_sensor.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/magnetometer.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/magnetometer.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/marker.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/marker.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/marker_v.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/marker_v.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/material.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/material.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/meshgeom.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/meshgeom.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/model.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/model.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/model_configuration.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/model_configuration.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/model_v.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/model_v.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/packet.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/packet.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/param.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/param.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/param_v.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/param_v.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/physics.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/physics.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/pid.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/pid.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/planegeom.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/planegeom.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/plugin.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/plugin.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/plugin_v.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/plugin_v.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/pointcloud.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/pointcloud.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/polylinegeom.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/polylinegeom.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/pose.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/pose.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/pose_animation.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/pose_animation.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/pose_trajectory.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/pose_trajectory.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/pose_v.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/pose_v.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/projector.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/projector.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/propagation_grid.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/propagation_grid.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/propagation_particle.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/propagation_particle.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/publish.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/publish.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/publishers.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/publishers.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/quaternion.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/quaternion.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/raysensor.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/raysensor.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/request.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/request.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/response.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/response.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/rest_login.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/rest_login.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/rest_logout.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/rest_logout.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/rest_post.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/rest_post.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/rest_response.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/rest_response.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/road.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/road.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/scene.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/scene.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/selection.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/selection.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/sensor.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/sensor.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/sensor_noise.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/sensor_noise.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/sensor_v.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/sensor_v.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/server_control.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/server_control.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/shadows.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/shadows.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/sim_event.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/sim_event.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/sky.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/sky.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/sonar.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/sonar.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/spheregeom.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/spheregeom.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/spherical_coordinates.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/spherical_coordinates.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/stringmsg.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/stringmsg.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/stringmsg_v.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/stringmsg_v.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/subscribe.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/subscribe.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/surface.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/surface.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/tactile.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/tactile.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/test.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/test.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/time.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/time.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/topic_info.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/topic_info.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/track_visual.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/track_visual.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/uint32.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/uint32.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/uint32_v.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/uint32_v.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/uint64.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/uint64.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/uint64_v.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/uint64_v.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/undo_redo.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/undo_redo.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/user_cmd.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/user_cmd.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/user_cmd_stats.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/user_cmd_stats.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/vector2d.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/vector2d.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/vector3d.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/vector3d.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/visual.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/visual.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/visual_v.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/visual_v.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/web_request.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/web_request.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/wind.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/wind.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/wireless_node.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/wireless_node.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/wireless_nodes.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/wireless_nodes.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/world_control.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/world_control.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/world_modify.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/world_modify.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/world_reset.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/world_reset.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/world_stats.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/world_stats.proto -include/ignition/msgs%%IGN_VER%%/ignition/msgs/wrench.pb.h -include/ignition/msgs%%IGN_VER%%/ignition/msgs/wrench.proto -lib/cmake/ignition-msgs%%IGN_VER%%-all/ignition-msgs%%IGN_VER%%-all-config-version.cmake -lib/cmake/ignition-msgs%%IGN_VER%%-all/ignition-msgs%%IGN_VER%%-all-config.cmake -lib/cmake/ignition-msgs%%IGN_VER%%-all/ignition-msgs%%IGN_VER%%-all-targets.cmake -lib/cmake/ignition-msgs%%IGN_VER%%/ignition-msgs%%IGN_VER%%-config-version.cmake -lib/cmake/ignition-msgs%%IGN_VER%%/ignition-msgs%%IGN_VER%%-config.cmake -lib/cmake/ignition-msgs%%IGN_VER%%/ignition-msgs%%IGN_VER%%-targets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/ignition-msgs%%IGN_VER%%/ignition-msgs%%IGN_VER%%-targets.cmake -lib/libignition-msgs%%IGN_VER%%.so -lib/libignition-msgs%%IGN_VER%%.so.3 -lib/libignition-msgs%%IGN_VER%%.so.3.0.0~pre3 -lib/ruby/ignition/cmdmsgs%%IGN_VER%%.rb +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs.hh +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/Export.hh +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/Factory.hh +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/Filesystem.hh +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/MessageTypes.hh +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/SuppressWarning.hh +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/Utility.hh +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/altimeter.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/altimeter.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/any.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/any.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/atmosphere.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/atmosphere.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/axis.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/axis.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/battery.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/battery.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/boolean.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/boolean.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/boxgeom.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/boxgeom.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/bytes.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/bytes.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/camera_cmd.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/camera_cmd.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/camera_lens.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/camera_lens.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/camerasensor.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/camerasensor.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/cessna.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/cessna.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/clock.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/clock.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/cmd_vel2d.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/cmd_vel2d.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/collision.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/collision.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/color.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/color.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/config.hh +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/contact.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/contact.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/contacts.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/contacts.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/contactsensor.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/contactsensor.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/cylindergeom.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/cylindergeom.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/density.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/density.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/detail/Export.hh +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/detail/SuppressWarning.hh +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/diagnostics.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/diagnostics.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/distortion.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/distortion.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/double.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/double.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/double_v.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/double_v.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/duration.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/duration.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/empty.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/empty.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/entity_factory.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/entity_factory.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/float.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/float.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/float_v.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/float_v.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/fluid.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/fluid.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/fog.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/fog.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/friction.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/friction.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/geometry.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/geometry.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/gps.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/gps.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/gps_sensor.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/gps_sensor.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/gui.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/gui.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/gui_camera.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/gui_camera.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/header.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/header.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/heightmapgeom.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/heightmapgeom.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/hydra.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/hydra.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/ign.hh +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/image.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/image.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/imagegeom.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/imagegeom.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/imu.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/imu.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/imu_sensor.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/imu_sensor.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/inertial.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/inertial.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/int32.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/int32.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/int32_v.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/int32_v.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/int64.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/int64.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/int64_v.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/int64_v.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/joint.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/joint.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/joint_animation.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/joint_animation.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/joint_cmd.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/joint_cmd.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/joint_wrench.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/joint_wrench.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/joy.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/joy.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/joystick.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/joystick.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/laserscan.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/laserscan.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/light.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/light.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/link.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/link.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/link_data.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/link_data.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/log_control.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/log_control.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/log_playback_control.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/log_playback_control.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/log_playback_stats.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/log_playback_stats.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/log_status.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/log_status.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/logical_camera_image.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/logical_camera_image.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/logical_camera_sensor.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/logical_camera_sensor.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/magnetometer.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/magnetometer.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/marker.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/marker.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/marker_v.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/marker_v.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/material.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/material.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/meshgeom.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/meshgeom.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/model.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/model.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/model_configuration.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/model_configuration.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/model_v.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/model_v.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/packet.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/packet.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/param.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/param.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/param_v.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/param_v.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/physics.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/physics.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/pid.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/pid.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/planegeom.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/planegeom.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/plugin.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/plugin.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/plugin_v.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/plugin_v.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/pointcloud.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/pointcloud.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/polylinegeom.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/polylinegeom.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/pose.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/pose.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/pose_animation.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/pose_animation.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/pose_trajectory.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/pose_trajectory.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/pose_v.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/pose_v.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/projector.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/projector.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/propagation_grid.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/propagation_grid.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/propagation_particle.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/propagation_particle.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/publish.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/publish.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/publishers.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/publishers.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/quaternion.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/quaternion.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/raysensor.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/raysensor.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/request.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/request.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/response.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/response.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/rest_login.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/rest_login.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/rest_logout.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/rest_logout.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/rest_post.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/rest_post.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/rest_response.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/rest_response.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/road.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/road.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/scene.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/scene.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/selection.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/selection.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/sensor.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/sensor.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/sensor_noise.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/sensor_noise.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/sensor_v.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/sensor_v.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/server_control.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/server_control.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/shadows.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/shadows.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/sim_event.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/sim_event.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/sky.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/sky.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/sonar.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/sonar.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/spheregeom.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/spheregeom.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/spherical_coordinates.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/spherical_coordinates.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/stringmsg.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/stringmsg.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/stringmsg_v.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/stringmsg_v.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/subscribe.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/subscribe.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/surface.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/surface.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/tactile.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/tactile.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/test.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/test.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/time.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/time.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/topic_info.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/topic_info.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/track_visual.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/track_visual.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/uint32.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/uint32.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/uint32_v.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/uint32_v.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/uint64.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/uint64.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/uint64_v.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/uint64_v.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/undo_redo.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/undo_redo.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/user_cmd.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/user_cmd.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/user_cmd_stats.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/user_cmd_stats.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/vector2d.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/vector2d.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/vector3d.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/vector3d.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/visual.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/visual.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/visual_v.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/visual_v.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/web_request.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/web_request.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/wind.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/wind.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/wireless_node.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/wireless_node.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/wireless_nodes.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/wireless_nodes.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/world_control.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/world_control.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/world_modify.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/world_modify.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/world_reset.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/world_reset.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/world_stats.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/world_stats.proto +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/wrench.pb.h +include/ignition/%%MSGS_IGN_VER%%/ignition/msgs/wrench.proto +lib/cmake/ignition-%%MSGS_IGN_VER%%-all/ignition-%%MSGS_IGN_VER%%-all-config-version.cmake +lib/cmake/ignition-%%MSGS_IGN_VER%%-all/ignition-%%MSGS_IGN_VER%%-all-config.cmake +lib/cmake/ignition-%%MSGS_IGN_VER%%-all/ignition-%%MSGS_IGN_VER%%-all-targets.cmake +lib/cmake/ignition-%%MSGS_IGN_VER%%/ignition-%%MSGS_IGN_VER%%-config-version.cmake +lib/cmake/ignition-%%MSGS_IGN_VER%%/ignition-%%MSGS_IGN_VER%%-config.cmake +lib/cmake/ignition-%%MSGS_IGN_VER%%/ignition-%%MSGS_IGN_VER%%-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/ignition-%%MSGS_IGN_VER%%/ignition-%%MSGS_IGN_VER%%-targets.cmake +lib/libignition-%%MSGS_IGN_VER%%.so +lib/libignition-%%MSGS_IGN_VER%%.so.3 +lib/libignition-%%MSGS_IGN_VER%%.so.3.0.0~pre3 +lib/ruby/ignition/cmd%%MSGS_IGN_VER%%.rb lib/ruby/ignition/msgs/altimeter_pb.rb lib/ruby/ignition/msgs/any_pb.rb lib/ruby/ignition/msgs/atmosphere_pb.rb @@ -449,5 +449,5 @@ lib/ruby/ignition/msgs/world_modify_pb.rb lib/ruby/ignition/msgs/world_reset_pb.rb lib/ruby/ignition/msgs/world_stats_pb.rb lib/ruby/ignition/msgs/wrench_pb.rb -libdata/pkgconfig/ignition-msgs%%IGN_VER%%.pc -share/ignition/msgs%%IGN_VER%%.yaml +libdata/pkgconfig/ignition-%%MSGS_IGN_VER%%.pc +share/ignition/%%MSGS_IGN_VER%%.yaml diff --git a/devel/ignition-plugin/Makefile b/devel/ignition-plugin/Makefile index 3dfa7a1084a..e944d713f0a 100644 --- a/devel/ignition-plugin/Makefile +++ b/devel/ignition-plugin/Makefile @@ -22,6 +22,6 @@ BB_COMMIT= 6bf2bf09570f WRKSRC= ${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT} -PLIST_SUB+= IGN_VER=${DISTVERSION:R:R} +PLIST_SUB+= PLUGIN_IGN_VER=plugin${DISTVERSION:R:R} .include diff --git a/devel/ignition-plugin/pkg-plist b/devel/ignition-plugin/pkg-plist index a649eb8b463..275e275b749 100644 --- a/devel/ignition-plugin/pkg-plist +++ b/devel/ignition-plugin/pkg-plist @@ -1,48 +1,48 @@ -include/ignition/plugin%%IGN_VER%%/ignition/plugin.hh -include/ignition/plugin%%IGN_VER%%/ignition/plugin/EnablePluginFromThis.hh -include/ignition/plugin%%IGN_VER%%/ignition/plugin/Export.hh -include/ignition/plugin%%IGN_VER%%/ignition/plugin/Factory.hh -include/ignition/plugin%%IGN_VER%%/ignition/plugin/Info.hh -include/ignition/plugin%%IGN_VER%%/ignition/plugin/Loader.hh -include/ignition/plugin%%IGN_VER%%/ignition/plugin/Plugin.hh -include/ignition/plugin%%IGN_VER%%/ignition/plugin/PluginPtr.hh -include/ignition/plugin%%IGN_VER%%/ignition/plugin/Register.hh -include/ignition/plugin%%IGN_VER%%/ignition/plugin/RegisterMore.hh -include/ignition/plugin%%IGN_VER%%/ignition/plugin/SpecializedPlugin.hh -include/ignition/plugin%%IGN_VER%%/ignition/plugin/SpecializedPluginPtr.hh -include/ignition/plugin%%IGN_VER%%/ignition/plugin/WeakPluginPtr.hh -include/ignition/plugin%%IGN_VER%%/ignition/plugin/config.hh -include/ignition/plugin%%IGN_VER%%/ignition/plugin/detail/Export.hh -include/ignition/plugin%%IGN_VER%%/ignition/plugin/detail/Factory.hh -include/ignition/plugin%%IGN_VER%%/ignition/plugin/detail/Loader.hh -include/ignition/plugin%%IGN_VER%%/ignition/plugin/detail/Plugin.hh -include/ignition/plugin%%IGN_VER%%/ignition/plugin/detail/PluginPtr.hh -include/ignition/plugin%%IGN_VER%%/ignition/plugin/detail/Register.hh -include/ignition/plugin%%IGN_VER%%/ignition/plugin/detail/SpecializedPlugin.hh -include/ignition/plugin%%IGN_VER%%/ignition/plugin/detail/utility.hh -include/ignition/plugin%%IGN_VER%%/ignition/plugin/loader/Export.hh -include/ignition/plugin%%IGN_VER%%/ignition/plugin/loader/detail/Export.hh -include/ignition/plugin%%IGN_VER%%/ignition/plugin/utility.hh -lib/cmake/ignition-plugin%%IGN_VER%%-all/ignition-plugin%%IGN_VER%%-all-config-version.cmake -lib/cmake/ignition-plugin%%IGN_VER%%-all/ignition-plugin%%IGN_VER%%-all-config.cmake -lib/cmake/ignition-plugin%%IGN_VER%%-all/ignition-plugin%%IGN_VER%%-all-targets.cmake -lib/cmake/ignition-plugin%%IGN_VER%%-loader/ignition-plugin%%IGN_VER%%-loader-config-version.cmake -lib/cmake/ignition-plugin%%IGN_VER%%-loader/ignition-plugin%%IGN_VER%%-loader-config.cmake -lib/cmake/ignition-plugin%%IGN_VER%%-loader/ignition-plugin%%IGN_VER%%-loader-targets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/ignition-plugin%%IGN_VER%%-loader/ignition-plugin%%IGN_VER%%-loader-targets.cmake -lib/cmake/ignition-plugin%%IGN_VER%%-register/ignition-plugin%%IGN_VER%%-register-config-version.cmake -lib/cmake/ignition-plugin%%IGN_VER%%-register/ignition-plugin%%IGN_VER%%-register-config.cmake -lib/cmake/ignition-plugin%%IGN_VER%%-register/ignition-plugin%%IGN_VER%%-register-targets.cmake -lib/cmake/ignition-plugin%%IGN_VER%%/ignition-plugin%%IGN_VER%%-config-version.cmake -lib/cmake/ignition-plugin%%IGN_VER%%/ignition-plugin%%IGN_VER%%-config.cmake -lib/cmake/ignition-plugin%%IGN_VER%%/ignition-plugin%%IGN_VER%%-targets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/ignition-plugin%%IGN_VER%%/ignition-plugin%%IGN_VER%%-targets.cmake -lib/libignition-plugin%%IGN_VER%%-loader.so -lib/libignition-plugin%%IGN_VER%%-loader.so.1 -lib/libignition-plugin%%IGN_VER%%-loader.so.1.0.0~pre1 -lib/libignition-plugin%%IGN_VER%%.so -lib/libignition-plugin%%IGN_VER%%.so.1 -lib/libignition-plugin%%IGN_VER%%.so.1.0.0~pre1 -libdata/pkgconfig/ignition-plugin%%IGN_VER%%-loader.pc -libdata/pkgconfig/ignition-plugin%%IGN_VER%%-register.pc -libdata/pkgconfig/ignition-plugin%%IGN_VER%%.pc +include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin.hh +include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/EnablePluginFromThis.hh +include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/Export.hh +include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/Factory.hh +include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/Info.hh +include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/Loader.hh +include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/Plugin.hh +include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/PluginPtr.hh +include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/Register.hh +include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/RegisterMore.hh +include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/SpecializedPlugin.hh +include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/SpecializedPluginPtr.hh +include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/WeakPluginPtr.hh +include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/config.hh +include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/detail/Export.hh +include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/detail/Factory.hh +include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/detail/Loader.hh +include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/detail/Plugin.hh +include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/detail/PluginPtr.hh +include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/detail/Register.hh +include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/detail/SpecializedPlugin.hh +include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/detail/utility.hh +include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/loader/Export.hh +include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/loader/detail/Export.hh +include/ignition/%%PLUGIN_IGN_VER%%/ignition/plugin/utility.hh +lib/cmake/ignition-%%PLUGIN_IGN_VER%%-all/ignition-%%PLUGIN_IGN_VER%%-all-config-version.cmake +lib/cmake/ignition-%%PLUGIN_IGN_VER%%-all/ignition-%%PLUGIN_IGN_VER%%-all-config.cmake +lib/cmake/ignition-%%PLUGIN_IGN_VER%%-all/ignition-%%PLUGIN_IGN_VER%%-all-targets.cmake +lib/cmake/ignition-%%PLUGIN_IGN_VER%%-loader/ignition-%%PLUGIN_IGN_VER%%-loader-config-version.cmake +lib/cmake/ignition-%%PLUGIN_IGN_VER%%-loader/ignition-%%PLUGIN_IGN_VER%%-loader-config.cmake +lib/cmake/ignition-%%PLUGIN_IGN_VER%%-loader/ignition-%%PLUGIN_IGN_VER%%-loader-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/ignition-%%PLUGIN_IGN_VER%%-loader/ignition-%%PLUGIN_IGN_VER%%-loader-targets.cmake +lib/cmake/ignition-%%PLUGIN_IGN_VER%%-register/ignition-%%PLUGIN_IGN_VER%%-register-config-version.cmake +lib/cmake/ignition-%%PLUGIN_IGN_VER%%-register/ignition-%%PLUGIN_IGN_VER%%-register-config.cmake +lib/cmake/ignition-%%PLUGIN_IGN_VER%%-register/ignition-%%PLUGIN_IGN_VER%%-register-targets.cmake +lib/cmake/ignition-%%PLUGIN_IGN_VER%%/ignition-%%PLUGIN_IGN_VER%%-config-version.cmake +lib/cmake/ignition-%%PLUGIN_IGN_VER%%/ignition-%%PLUGIN_IGN_VER%%-config.cmake +lib/cmake/ignition-%%PLUGIN_IGN_VER%%/ignition-%%PLUGIN_IGN_VER%%-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/ignition-%%PLUGIN_IGN_VER%%/ignition-%%PLUGIN_IGN_VER%%-targets.cmake +lib/libignition-%%PLUGIN_IGN_VER%%-loader.so +lib/libignition-%%PLUGIN_IGN_VER%%-loader.so.1 +lib/libignition-%%PLUGIN_IGN_VER%%-loader.so.1.0.0~pre1 +lib/libignition-%%PLUGIN_IGN_VER%%.so +lib/libignition-%%PLUGIN_IGN_VER%%.so.1 +lib/libignition-%%PLUGIN_IGN_VER%%.so.1.0.0~pre1 +libdata/pkgconfig/ignition-%%PLUGIN_IGN_VER%%-loader.pc +libdata/pkgconfig/ignition-%%PLUGIN_IGN_VER%%-register.pc +libdata/pkgconfig/ignition-%%PLUGIN_IGN_VER%%.pc diff --git a/devel/ignition-transport/Makefile b/devel/ignition-transport/Makefile new file mode 100644 index 00000000000..d024b1fad60 --- /dev/null +++ b/devel/ignition-transport/Makefile @@ -0,0 +1,42 @@ +# $FreeBSD$ + +PORTNAME= ignition-transport +DISTVERSION= 6.0.0 +CATEGORIES= devel +MASTER_SITES= https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/ + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Ignition transport classes and functions for robot applications + +LICENSE= APACHE20 + +BUILD_DEPENDS= ignition-cmake==2:devel/ignition-cmake \ + ignition-tools>0:devel/ignition-tools \ + cppzmq>0:net/cppzmq +LIB_DEPENDS= libignition-math6.so:math/ignition-math \ + libignition-msgs3.so:devel/ignition-msgs \ + libprotobuf.so:devel/protobuf \ + libuuid.so:misc/e2fsprogs-libuuid \ + libzmq.so:net/libzmq4 +RUN_DEPENDS= ignition-tools>0:devel/ignition-tools + +USES= cmake:outsource pkgconfig sqlite +USE_LDCONFIG= yes + +CMAKE_OFF= BUILD_TESTING + +BB_ACCOUNT= ignitionrobotics +BB_PROJECT= ign-transport +BB_COMMIT= 4b78da2af04c + +WRKSRC= ${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT} + +PLIST_SUB+= TRANSPORT_IGN_VER=transport${DISTVERSION:R:R} + +do-test: # 1 test is known to fail: https://bitbucket.org/ignitionrobotics/ign-transport/issues/100/test-integration_log_versioned_symbols + @cd ${BUILD_WRKSRC} && \ + ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING=ON ${CMAKE_SOURCE_PATH} && \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test + +.include diff --git a/devel/ignition-transport/distinfo b/devel/ignition-transport/distinfo new file mode 100644 index 00000000000..3e012fc0c4d --- /dev/null +++ b/devel/ignition-transport/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1542653754 +SHA256 (ignition-transport-6.0.0.tar.gz) = 691a6566774f7952297aee2d48fc638cdbc49c4a6529606b56d879fcda155185 +SIZE (ignition-transport-6.0.0.tar.gz) = 529120 diff --git a/devel/ignition-transport/files/patch-CMakeLists.txt b/devel/ignition-transport/files/patch-CMakeLists.txt new file mode 100644 index 00000000000..a14c1562af1 --- /dev/null +++ b/devel/ignition-transport/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2018-11-19 20:02:52 UTC ++++ CMakeLists.txt +@@ -22,7 +22,7 @@ ign_configure_project(VERSION_SUFFIX pre + + # ignition-transport currently has no options that are unique to it + +-if (UNIX AND NOT APPLE) ++if (UNIX AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "^(FreeBSD|DragonFly)$") + set (EXTRA_TEST_LIB_DEPS stdc++fs) + else() + set (EXTRA_TEST_LIB_DEPS) diff --git a/devel/ignition-transport/files/patch-log_include_ignition_transport_log_SqlStatement.hh b/devel/ignition-transport/files/patch-log_include_ignition_transport_log_SqlStatement.hh new file mode 100644 index 00000000000..7d81dee1260 --- /dev/null +++ b/devel/ignition-transport/files/patch-log_include_ignition_transport_log_SqlStatement.hh @@ -0,0 +1,29 @@ +--- log/include/ignition/transport/log/SqlStatement.hh.orig 2018-11-20 22:07:06 UTC ++++ log/include/ignition/transport/log/SqlStatement.hh +@@ -59,22 +59,22 @@ namespace ignition + + /// \sa Set(std::nullptr_t) + /// \brief Construct NULL parameter +- public: explicit SqlParameter(std::nullptr_t); ++ public: SqlParameter(std::nullptr_t); + + /// \sa Set(int64_t) + /// \brief Construct integer parameter + /// \param[in] _integer an integer +- public: explicit SqlParameter(int64_t _integer); ++ public: SqlParameter(int64_t _integer); + + /// \sa Set(double) + /// \brief Construct real parameter + /// \param[in] _real a real number +- public: explicit SqlParameter(double _real); ++ public: SqlParameter(double _real); + + /// \sa Set(const std::string &) + /// \brief Construct string parameter + /// \param[in] _string a string +- public: explicit SqlParameter(const std::string &_text); ++ public: SqlParameter(const std::string &_text); + + /// \brief Copy constructor + /// \param[in] _other Another SqlParameter diff --git a/devel/ignition-transport/files/patch-log_src_QueryOptions.cc b/devel/ignition-transport/files/patch-log_src_QueryOptions.cc new file mode 100644 index 00000000000..3f3dc3ffa4d --- /dev/null +++ b/devel/ignition-transport/files/patch-log_src_QueryOptions.cc @@ -0,0 +1,20 @@ +--- log/src/QueryOptions.cc.orig 2018-11-20 22:08:14 UTC ++++ log/src/QueryOptions.cc +@@ -113,7 +113,7 @@ class TimeRangeOption::Implementation + if (!startCompare.empty()) + { + sql.statement += "time_recv " + startCompare + " ?"; +- sql.parameters.emplace_back(start.GetTime()->count()); ++ sql.parameters.emplace_back((int64_t)start.GetTime()->count()); + + if (!finishCompare.empty()) + sql.statement += " AND "; +@@ -122,7 +122,7 @@ class TimeRangeOption::Implementation + if (!finishCompare.empty()) + { + sql.statement += "time_recv " + finishCompare + " ?"; +- sql.parameters.emplace_back(finish.GetTime()->count()); ++ sql.parameters.emplace_back((int64_t)finish.GetTime()->count()); + } + + return sql; diff --git a/devel/ignition-transport/files/patch-src_NetUtils.cc b/devel/ignition-transport/files/patch-src_NetUtils.cc new file mode 100644 index 00000000000..ceaa618a237 --- /dev/null +++ b/devel/ignition-transport/files/patch-src_NetUtils.cc @@ -0,0 +1,28 @@ +--- src/NetUtils.cc.orig 2018-11-19 19:50:00 UTC ++++ src/NetUtils.cc +@@ -23,6 +23,7 @@ + #else + #include + #include ++ #include + #include + #include + #include +@@ -208,10 +209,17 @@ inline namespace IGNITION_TRANSPORT_VERS + } + + // If we already have the same SIOCGIFINDEX, ignore it (subinterface). ++# if defined(__FreeBSD__) || defined(__DragonFly__) ++ if (realIdx.find(ifIdx.ifr_index) != realIdx.end()) ++ continue; ++ ++ realIdx.insert(ifIdx.ifr_index); ++# else + if (realIdx.find(ifIdx.ifr_ifindex) != realIdx.end()) + continue; + + realIdx.insert(ifIdx.ifr_ifindex); ++# endif + #endif + + if (getnameinfo(ifa->ifa_addr, salen, ip_, sizeof(ip_), nullptr, 0, diff --git a/devel/ignition-transport/files/patch-test_test__config.h.in b/devel/ignition-transport/files/patch-test_test__config.h.in new file mode 100644 index 00000000000..4b69428b02a --- /dev/null +++ b/devel/ignition-transport/files/patch-test_test__config.h.in @@ -0,0 +1,20 @@ +--- test/test_config.h.in.orig 2018-09-11 18:30:00 UTC ++++ test/test_config.h.in +@@ -30,7 +30,7 @@ + DETAIL_IGN_TRANSPORT_TEST_DIR + #endif + +-#ifndef __APPLE__ ++#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__DragonFly__) + #include + #include + #endif +@@ -91,7 +91,7 @@ namespace testing + std::string portablePathUnion(const std::string &_str1, + const std::string &_str2) + { +-#ifdef __APPLE__ ++#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__DragonFly__) + // Ugly as hell but trying to avoid boost::filesystem + return _str1 + "/" + _str2; + #else diff --git a/devel/ignition-transport/pkg-descr b/devel/ignition-transport/pkg-descr new file mode 100644 index 00000000000..f2069bd137d --- /dev/null +++ b/devel/ignition-transport/pkg-descr @@ -0,0 +1,4 @@ +Ignition transport is a component in the ignition framework, a set of libraries +designed to rapidly develop robot applications. + +WWW: https://ignitionrobotics.org/home diff --git a/devel/ignition-transport/pkg-plist b/devel/ignition-transport/pkg-plist new file mode 100644 index 00000000000..2b83eba9894 --- /dev/null +++ b/devel/ignition-transport/pkg-plist @@ -0,0 +1,64 @@ +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/AdvertiseOptions.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/Clock.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/Discovery.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/Export.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/HandlerStorage.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/Helpers.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/MessageInfo.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/NetUtils.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/Node.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/NodeOptions.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/NodeShared.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/Packet.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/Publisher.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/RepHandler.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/ReqHandler.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/SubscribeOptions.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/SubscriptionHandler.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/TopicStorage.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/TopicUtils.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/TransportTypes.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/Uuid.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/config.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/detail/Export.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/detail/Node.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/ign.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/log.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/log/Batch.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/log/Descriptor.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/log/Export.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/log/Log.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/log/Message.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/log/MsgIter.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/log/Playback.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/log/QualifiedTime.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/log/QueryOptions.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/log/Recorder.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/log/SqlStatement.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/log/detail/Export.hh +include/ignition/%%TRANSPORT_IGN_VER%%/ignition/transport/log/detail/QueryOptions.hh +lib/cmake/ignition-%%TRANSPORT_IGN_VER%%-all/ignition-%%TRANSPORT_IGN_VER%%-all-config-version.cmake +lib/cmake/ignition-%%TRANSPORT_IGN_VER%%-all/ignition-%%TRANSPORT_IGN_VER%%-all-config.cmake +lib/cmake/ignition-%%TRANSPORT_IGN_VER%%-all/ignition-%%TRANSPORT_IGN_VER%%-all-targets.cmake +lib/cmake/ignition-%%TRANSPORT_IGN_VER%%-log/ignition-%%TRANSPORT_IGN_VER%%-log-config-version.cmake +lib/cmake/ignition-%%TRANSPORT_IGN_VER%%-log/ignition-%%TRANSPORT_IGN_VER%%-log-config.cmake +lib/cmake/ignition-%%TRANSPORT_IGN_VER%%-log/ignition-%%TRANSPORT_IGN_VER%%-log-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/ignition-%%TRANSPORT_IGN_VER%%-log/ignition-%%TRANSPORT_IGN_VER%%-log-targets.cmake +lib/cmake/ignition-%%TRANSPORT_IGN_VER%%/ignition-%%TRANSPORT_IGN_VER%%-config-version.cmake +lib/cmake/ignition-%%TRANSPORT_IGN_VER%%/ignition-%%TRANSPORT_IGN_VER%%-config.cmake +lib/cmake/ignition-%%TRANSPORT_IGN_VER%%/ignition-%%TRANSPORT_IGN_VER%%-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/ignition-%%TRANSPORT_IGN_VER%%/ignition-%%TRANSPORT_IGN_VER%%-targets.cmake +lib/libignition-%%TRANSPORT_IGN_VER%%-log.so +lib/libignition-%%TRANSPORT_IGN_VER%%-log.so.6 +lib/libignition-%%TRANSPORT_IGN_VER%%-log.so.6.0.0~pre2 +lib/libignition-%%TRANSPORT_IGN_VER%%.so +lib/libignition-%%TRANSPORT_IGN_VER%%.so.6 +lib/libignition-%%TRANSPORT_IGN_VER%%.so.6.0.0~pre2 +lib/ruby/ignition/cmdlog6.rb +lib/ruby/ignition/cmd%%TRANSPORT_IGN_VER%%.rb +libdata/pkgconfig/ignition-%%TRANSPORT_IGN_VER%%-log.pc +libdata/pkgconfig/ignition-%%TRANSPORT_IGN_VER%%.pc +share/ignition/ignition-%%TRANSPORT_IGN_VER%%/sql/0.1.0.sql +share/ignition/%%TRANSPORT_IGN_VER%%.yaml +share/ignition/transportlog6.yaml diff --git a/devel/py-llvmlite/Makefile b/devel/py-llvmlite/Makefile index 4f932e25f8c..0b955825380 100644 --- a/devel/py-llvmlite/Makefile +++ b/devel/py-llvmlite/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= llvmlite -DISTVERSION= 0.23.0 -PORTREVISION= 1 +DISTVERSION= 0.25.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -22,7 +21,7 @@ LIB_DEPENDS= libLLVM-6.0.so:devel/llvm60 # Python 2.7,3.4+ USES= python fortran -USE_PYTHON= concurrent distutils autoplist +USE_PYTHON= distutils autoplist # devel/llvm60 required as of version 0.23.0 LLVM_VER= 60 diff --git a/devel/py-llvmlite/distinfo b/devel/py-llvmlite/distinfo index b1c03d086c0..f1e346937aa 100644 --- a/devel/py-llvmlite/distinfo +++ b/devel/py-llvmlite/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1527443006 -SHA256 (llvmlite-0.23.0.tar.gz) = bc8b1b46274d05b578fe9e980a6d98fa71c8727f6f9ed31d4d8468dce7aa5762 -SIZE (llvmlite-0.23.0.tar.gz) = 98850 +TIMESTAMP = 1542234868 +SHA256 (llvmlite-0.25.0.tar.gz) = fd64def9a51dd7dc61913a7a08eeba5b9785522740bec5a7c5995b2a90525025 +SIZE (llvmlite-0.25.0.tar.gz) = 102079 diff --git a/devel/py-numba/Makefile b/devel/py-numba/Makefile index adae6696fff..ab34136a954 100644 --- a/devel/py-numba/Makefile +++ b/devel/py-numba/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= numba -DISTVERSION= 0.38.0 -PORTREVISION= 1 +DISTVERSION= 0.40.1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,21 +14,17 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>1.7,1:math/py-numpy@${PY_FLAVOR} +LIB_DEPENDS= libomp.so:devel/openmp \ + libtbb.so:devel/tbb RUN_DEPENDS= ${PY_ENUM34} \ ${PYTHON_PKGNAMEPREFIX}llvmlite>=0.12:devel/py-llvmlite@${PY_FLAVOR} - -USES= python fortran -USE_PYTHON= distutils concurrent autoplist - -.include - -# Required for Python 2.7 -.if ${PYTHON_REL} < 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}singledispatch>0:devel/py-singledispatch@${PY_FLAVOR} \ +py27_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}singledispatch>0:devel/py-singledispatch@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}funcsigs>0:devel/py-funcsigs@${PY_FLAVOR} -.endif + +USES= python fortran localbase +USE_PYTHON= distutils concurrent autoplist post-install: @${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name "*.so" | ${XARGS} ${STRIP_CMD} -.include +.include diff --git a/devel/py-numba/distinfo b/devel/py-numba/distinfo index 9706f264a70..7d83365238b 100644 --- a/devel/py-numba/distinfo +++ b/devel/py-numba/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1527530784 -SHA256 (numba-0.38.0.tar.gz) = da1a5ae35a64536dcc46880450e0f839e53a2cf5c587fb09e5e1bf9cbcca8693 -SIZE (numba-0.38.0.tar.gz) = 1406895 +TIMESTAMP = 1542233569 +SHA256 (numba-0.40.1.tar.gz) = 52d046c13bcf0de79dbfb936874b7228f141b9b8e3447cc35855e9ad3e12aa33 +SIZE (numba-0.40.1.tar.gz) = 1518126 diff --git a/devel/py-numba/files/patch-numba_npyufunc_workqueue.c b/devel/py-numba/files/patch-numba_npyufunc_workqueue.c new file mode 100644 index 00000000000..2005a5c9e99 --- /dev/null +++ b/devel/py-numba/files/patch-numba_npyufunc_workqueue.c @@ -0,0 +1,14 @@ +--- numba/npyufunc/workqueue.c.orig 2018-11-14 22:14:35 UTC ++++ numba/npyufunc/workqueue.c +@@ -19,7 +19,11 @@ race condition. + /* PThread */ + #include + #include ++#if defined(__FreeBSD__) ++#include ++#else + #include ++#endif + #define NUMBA_PTHREAD + #endif + diff --git a/devel/rust-bindgen/Makefile b/devel/rust-bindgen/Makefile index 86927a021bd..a6d1f579cf9 100644 --- a/devel/rust-bindgen/Makefile +++ b/devel/rust-bindgen/Makefile @@ -17,7 +17,6 @@ USES= cargo USE_GITHUB= yes GH_ACCOUNT= rust-lang-nursery PLIST_FILES= bin/bindgen -LLVM_DEFAULT?= 70 # Keep in sync with Mk/bsd.gecko.mk CARGO_CRATES= aho-corasick-0.6.8 \ ansi_term-0.11.0 \ diff --git a/editors/openoffice-4/distinfo b/editors/openoffice-4/distinfo index 57898edf075..0554dfed1ab 100644 --- a/editors/openoffice-4/distinfo +++ b/editors/openoffice-4/distinfo @@ -1,5 +1,7 @@ -TIMESTAMP = 1542135943 +TIMESTAMP = 1542783715 SHA256 (openoffice/apache-openoffice-4.1.6-r1844436-src.tar.bz2) = 5189880207977a0fd6d4ef5eada7d18d8dbf94cddcc71822889cfb6c82cfed18 SIZE (openoffice/apache-openoffice-4.1.6-r1844436-src.tar.bz2) = 220017032 SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 966a8333c83a18ddd84401389006d6e0b52b8175924b808b54b88211669985fa SIZE (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 28957004 +SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c +SIZE (openoffice/unowinreg.dll) = 6144 diff --git a/graphics/Makefile b/graphics/Makefile index d1894a7d621..6aafb6452ce 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -815,6 +815,7 @@ SUBDIR += pecl-qrencode SUBDIR += pecomato SUBDIR += pencil + SUBDIR += pencil2d SUBDIR += peps SUBDIR += perceptualdiff SUBDIR += pfstools diff --git a/graphics/opencollada/Makefile b/graphics/opencollada/Makefile index cc999422909..a67d628d8dc 100644 --- a/graphics/opencollada/Makefile +++ b/graphics/opencollada/Makefile @@ -2,7 +2,7 @@ PORTNAME= opencollada DISTVERSIONPREFIX= v -DISTVERSION= 1.6.65 +DISTVERSION= 1.6.67 CATEGORIES= graphics devel MAINTAINER= ports@FreeBSD.org diff --git a/graphics/opencollada/distinfo b/graphics/opencollada/distinfo index 50fbb69b741..f2894c54abe 100644 --- a/graphics/opencollada/distinfo +++ b/graphics/opencollada/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1539329060 -SHA256 (KhronosGroup-OpenCOLLADA-v1.6.65_GH0.tar.gz) = c8b4744be671ddf09a112e94503af276cf5fe8d2e52cdf8bbbd3b7b93ac9d5b9 -SIZE (KhronosGroup-OpenCOLLADA-v1.6.65_GH0.tar.gz) = 12096904 +TIMESTAMP = 1542760647 +SHA256 (KhronosGroup-OpenCOLLADA-v1.6.67_GH0.tar.gz) = 1c83f48371f9ab355268a1805dda33bdf46a4b0e6c495773a657f48b6e6a73ae +SIZE (KhronosGroup-OpenCOLLADA-v1.6.67_GH0.tar.gz) = 12095681 diff --git a/graphics/pencil2d/Makefile b/graphics/pencil2d/Makefile new file mode 100644 index 00000000000..7026c273524 --- /dev/null +++ b/graphics/pencil2d/Makefile @@ -0,0 +1,28 @@ +# $FreeBSD$ + +PORTNAME= pencil2d +DISTVERSIONPREFIX= v +DISTVERSION= 0.6.2-63 +DISTVERSIONSUFFIX= -gd05fbae0 +CATEGORIES= graphics math + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Easy and intuitive tool to make 2D hand-drawn animations + +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/LICENSE.TXT + +USES= desktop-file-utils gl gmake qmake qt:5 shared-mime-info +USE_GITHUB= yes +USE_QT= core gui multimedia network svg widgets xml buildtools_build +USE_GL= gl +GH_PROJECT= pencil + +PLIST_FILES= bin/pencil2d \ + share/applications/pencil2d.desktop \ + share/bash-completion/completions/pencil2d \ + share/icons/hicolor/256x256/apps/pencil2d.png \ + share/mime/packages/pencil2d.xml \ + share/zsh/site-functions/_pencil2d + +.include diff --git a/graphics/pencil2d/distinfo b/graphics/pencil2d/distinfo new file mode 100644 index 00000000000..378cd7050a1 --- /dev/null +++ b/graphics/pencil2d/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1542783932 +SHA256 (pencil2d-pencil-v0.6.2-63-gd05fbae0_GH0.tar.gz) = 24a9f143a13b667ff3ec398fcf0d6d2f5937b6b410ecff16b3133a1fda2f7a32 +SIZE (pencil2d-pencil-v0.6.2-63-gd05fbae0_GH0.tar.gz) = 3198984 diff --git a/graphics/pencil2d/files/patch-app_app.pro b/graphics/pencil2d/files/patch-app_app.pro new file mode 100644 index 00000000000..3ad4c2f03ad --- /dev/null +++ b/graphics/pencil2d/files/patch-app_app.pro @@ -0,0 +1,11 @@ +--- app/app.pro.orig 2018-11-21 09:01:18 UTC ++++ app/app.pro +@@ -135,7 +135,7 @@ win32 { + RC_FILE = data/pencil2d.rc + } + +-linux { ++freebsd { + target.path = $${PREFIX}/bin + + bashcompletion.files = data/pencil2d diff --git a/graphics/pencil2d/pkg-descr b/graphics/pencil2d/pkg-descr new file mode 100644 index 00000000000..793cf190eef --- /dev/null +++ b/graphics/pencil2d/pkg-descr @@ -0,0 +1,5 @@ +Pencil2D is an animation/drawing software for FreeBSD, Linux, macOS, and +Windows. It lets you create traditional hand-drawn animation (cartoon) +using both bitmap and vector graphics. Pencil2D is free and open source. + +WWW: https://www.pencil2d.org/ diff --git a/mail/nocc/Makefile b/mail/nocc/Makefile index 4724beccc74..29189edca3f 100644 --- a/mail/nocc/Makefile +++ b/mail/nocc/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nocc -PORTVERSION= 1.9.7 +PORTVERSION= 1.9.8 CATEGORIES= mail www MASTER_SITES= SF/${PORTNAME}/NOCC/${PORTVERSION} @@ -11,9 +11,10 @@ COMMENT= Webmail system which access POP3 and IMAP mail servers LICENSE= GPLv2 +USES= php:web + OPTIONS_DEFINE= DOCS -USES= php:web USE_PHP= ctype iconv imap mbstring pcre session SUB_FILES= pkg-message diff --git a/mail/nocc/distinfo b/mail/nocc/distinfo index 57f55bea79c..b67b754f077 100644 --- a/mail/nocc/distinfo +++ b/mail/nocc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1511338149 -SHA256 (nocc-1.9.7.tar.gz) = 33c9687c613929db76f1fecef24358c3cc90c5200c64bc27392431c441407fc9 -SIZE (nocc-1.9.7.tar.gz) = 1717561 +TIMESTAMP = 1542791685 +SHA256 (nocc-1.9.8.tar.gz) = 415511865a2f3c141313b8d33a6fad7ed265beda65ae52448a2d5fa944992e65 +SIZE (nocc-1.9.8.tar.gz) = 1726666 diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index 5916eb2e6a1..6cffd8c1cf6 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= postfix -DISTVERSION= 3.4-20181118 +DISTVERSION= 3.4-20181119 PORTREVISION?= 0 PORTEPOCH= 5 CATEGORIES= mail ipv6 diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo index ec33400ae5b..6c74514e554 100644 --- a/mail/postfix-current/distinfo +++ b/mail/postfix-current/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1542570037 -SHA256 (postfix/postfix-3.4-20181118.tar.gz) = 3327bee92680f15581027a11aed6ae521f674f4b1191d10b5f65ac2e556c9a7d -SIZE (postfix/postfix-3.4-20181118.tar.gz) = 4499405 +TIMESTAMP = 1542675420 +SHA256 (postfix/postfix-3.4-20181119.tar.gz) = 3792b138f2641132ac8436c48e70e17f6eac405a9ba5125fb89485d8f634dd8f +SIZE (postfix/postfix-3.4-20181119.tar.gz) = 4499449 diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index 293761cc765..8eeba0acd7a 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -3,6 +3,7 @@ PORTNAME= thunderbird DISTVERSION= 60.3.1 +PORTREVISION= 2 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source @@ -26,13 +27,12 @@ BUILD_DEPENDS= nspr>=4.19:devel/nspr \ autoconf-2.13:devel/autoconf213 \ yasm:devel/yasm \ zip:archivers/zip -# soundtouch>=1.9.0:audio/soundtouch \ USE_HARDENING= pie:off relro:off SSP_UNSAFE= yes USE_GECKO= gecko -USE_MOZILLA= -cairo -soundtouch +USE_MOZILLA= # empty USES= tar:xz @@ -51,7 +51,6 @@ MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome OPTIONS_DEFINE= LIGHTNING OPTIONS_DEFAULT=CANBERRA LIGHTNING -OPTIONS_EXCLUDE=BUNDLED_CAIRO .include "${.CURDIR}/../../www/firefox/Makefile.options" .include diff --git a/mail/thunderbird/files/patch-bug1021761 b/mail/thunderbird/files/patch-bug1021761 deleted file mode 100644 index 245f4fd8695..00000000000 --- a/mail/thunderbird/files/patch-bug1021761 +++ /dev/null @@ -1,1269 +0,0 @@ -commit f9bcf9c81c4a -Author: Evgeniy Vodolazskiy -Date: Tue Sep 9 14:38:00 2014 -0700 - - Bug 1021761 - Make ALSA optional on Linux, allowing fallback to another backend. r=kinetik r=glandium ---- - media/libcubeb/gtest/moz.build | 1 - - media/libcubeb/src/cubeb_alsa.c | 228 +++++++++++++++++++++++++++++----------- - toolkit/library/moz.build | 3 - - 3 files changed, 168 insertions(+), 64 deletions(-) - -diff --git media/libcubeb/gtest/moz.build media/libcubeb/gtest/moz.build -index 558130188c2e..0cf157d41903 100644 ---- media/libcubeb/gtest/moz.build -+++ media/libcubeb/gtest/moz.build -@@ -72,7 +72,6 @@ elif CONFIG['OS_TARGET'] == 'OpenBSD': - 'sndio', - ] - else: -- OS_LIBS += CONFIG['MOZ_ALSA_LIBS'] - OS_LIBS += CONFIG['MOZ_PULSEAUDIO_LIBS'] - - if CONFIG['CC_TYPE'] in ('clang', 'gcc'): -diff --git media/libcubeb/src/cubeb_alsa.c media/libcubeb/src/cubeb_alsa.c -index bfd4d8f199d4..213c1eaa3d07 100644 ---- media/libcubeb/src/cubeb_alsa.c -+++ media/libcubeb/src/cubeb_alsa.c -@@ -12,6 +12,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -25,6 +26,52 @@ - - #define ALSA_PA_PLUGIN "ALSA <-> PulseAudio PCM I/O Plugin" - -+#ifdef DISABLE_LIBASOUND_DLOPEN -+#define WRAP(x) x -+#else -+#define WRAP(x) cubeb_##x -+#define MAKE_TYPEDEF(x) static typeof(x) * cubeb_##x -+MAKE_TYPEDEF(snd_config); -+MAKE_TYPEDEF(snd_config_add); -+MAKE_TYPEDEF(snd_config_copy); -+MAKE_TYPEDEF(snd_config_delete); -+MAKE_TYPEDEF(snd_config_get_id); -+MAKE_TYPEDEF(snd_config_get_string); -+MAKE_TYPEDEF(snd_config_imake_integer); -+MAKE_TYPEDEF(snd_config_search); -+MAKE_TYPEDEF(snd_config_search_definition); -+MAKE_TYPEDEF(snd_lib_error_set_handler); -+MAKE_TYPEDEF(snd_pcm_avail_update); -+MAKE_TYPEDEF(snd_pcm_close); -+MAKE_TYPEDEF(snd_pcm_delay); -+MAKE_TYPEDEF(snd_pcm_drain); -+MAKE_TYPEDEF(snd_pcm_frames_to_bytes); -+MAKE_TYPEDEF(snd_pcm_get_params); -+/* snd_pcm_hw_params_alloca is actually a macro */ -+/* MAKE_TYPEDEF(snd_pcm_hw_params_alloca); */ -+MAKE_TYPEDEF(snd_pcm_hw_params_sizeof); -+#define snd_pcm_hw_params_sizeof cubeb_snd_pcm_hw_params_sizeof -+MAKE_TYPEDEF(snd_pcm_hw_params_any); -+MAKE_TYPEDEF(snd_pcm_hw_params_get_channels_max); -+MAKE_TYPEDEF(snd_pcm_hw_params_get_rate); -+MAKE_TYPEDEF(snd_pcm_hw_params_set_rate_near); -+MAKE_TYPEDEF(snd_pcm_nonblock); -+MAKE_TYPEDEF(snd_pcm_open); -+MAKE_TYPEDEF(snd_pcm_open_lconf); -+MAKE_TYPEDEF(snd_pcm_pause); -+MAKE_TYPEDEF(snd_pcm_poll_descriptors); -+MAKE_TYPEDEF(snd_pcm_poll_descriptors_count); -+MAKE_TYPEDEF(snd_pcm_poll_descriptors_revents); -+MAKE_TYPEDEF(snd_pcm_readi); -+MAKE_TYPEDEF(snd_pcm_recover); -+MAKE_TYPEDEF(snd_pcm_set_params); -+MAKE_TYPEDEF(snd_pcm_start); -+MAKE_TYPEDEF(snd_pcm_state); -+MAKE_TYPEDEF(snd_pcm_writei); -+ -+#undef MAKE_TYPEDEF -+#endif -+ - /* ALSA is not thread-safe. snd_pcm_t instances are individually protected - by the owning cubeb_stream's mutex. snd_pcm_t creation and destruction - is not thread-safe until ALSA 1.0.24 (see alsa-lib.git commit 91c9c8f1), -@@ -65,6 +112,8 @@ struct cubeb { - workaround is not required. */ - snd_config_t * local_config; - int is_pa; -+ -+ void * libasound; - }; - - enum stream_state { -@@ -245,8 +294,8 @@ set_timeout(struct timeval * timeout, unsigned int ms) - static void - stream_buffer_decrement(cubeb_stream * stm, long count) - { -- char * bufremains = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, count); -- memmove(stm->buffer, bufremains, snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes - count)); -+ char * bufremains = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, count); -+ memmove(stm->buffer, bufremains, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes - count)); - stm->bufframes -= count; - } - -@@ -278,9 +327,9 @@ alsa_process_stream(cubeb_stream * stm) - /* Call _poll_descriptors_revents() even if we don't use it - to let underlying plugins clear null events. Otherwise poll() - may wake up again and again, producing unnecessary CPU usage. */ -- snd_pcm_poll_descriptors_revents(stm->pcm, stm->fds, stm->nfds, &revents); -+ WRAP(snd_pcm_poll_descriptors_revents)(stm->pcm, stm->fds, stm->nfds, &revents); - -- avail = snd_pcm_avail_update(stm->pcm); -+ avail = WRAP(snd_pcm_avail_update)(stm->pcm); - - /* Got null event? Bail and wait for another wakeup. */ - if (avail == 0) { -@@ -303,7 +352,7 @@ alsa_process_stream(cubeb_stream * stm) - // TODO: should it be marked as DRAINING? - } - -- got = snd_pcm_readi(stm->pcm, stm->buffer+stm->bufframes, avail); -+ got = WRAP(snd_pcm_readi)(stm->pcm, stm->buffer+stm->bufframes, avail); - - if (got < 0) { - avail = got; // the error handler below will recover us -@@ -347,7 +396,7 @@ alsa_process_stream(cubeb_stream * stm) - (!stm->other_stream || stm->other_stream->bufframes > 0)) { - long got = avail - stm->bufframes; - void * other_buffer = stm->other_stream ? stm->other_stream->buffer : NULL; -- char * buftail = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes); -+ char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes); - - /* Correct read size to the other stream available frames */ - if (stm->other_stream && got > (snd_pcm_sframes_t) stm->other_stream->bufframes) { -@@ -374,8 +423,8 @@ alsa_process_stream(cubeb_stream * stm) - long drain_frames = avail - stm->bufframes; - double drain_time = (double) drain_frames / stm->params.rate; - -- char * buftail = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes); -- memset(buftail, 0, snd_pcm_frames_to_bytes(stm->pcm, drain_frames)); -+ char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes); -+ memset(buftail, 0, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, drain_frames)); - stm->bufframes = avail; - - /* Mark as draining, unless we're waiting for capture */ -@@ -402,7 +451,7 @@ alsa_process_stream(cubeb_stream * stm) - } - } - -- wrote = snd_pcm_writei(stm->pcm, stm->buffer, avail); -+ wrote = WRAP(snd_pcm_writei)(stm->pcm, stm->buffer, avail); - if (wrote < 0) { - avail = wrote; // the error handler below will recover us - } else { -@@ -415,13 +464,13 @@ alsa_process_stream(cubeb_stream * stm) - - /* Got some error? Let's try to recover the stream. */ - if (avail < 0) { -- avail = snd_pcm_recover(stm->pcm, avail, 0); -+ avail = WRAP(snd_pcm_recover)(stm->pcm, avail, 0); - - /* Capture pcm must be started after initial setup/recover */ - if (avail >= 0 && - stm->stream_type == SND_PCM_STREAM_CAPTURE && -- snd_pcm_state(stm->pcm) == SND_PCM_STATE_PREPARED) { -- avail = snd_pcm_start(stm->pcm); -+ WRAP(snd_pcm_state)(stm->pcm) == SND_PCM_STATE_PREPARED) { -+ avail = WRAP(snd_pcm_start)(stm->pcm); - } - } - -@@ -537,26 +586,26 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm) - - slave_def = NULL; - -- r = snd_config_search(root_pcm, "slave", &slave_pcm); -+ r = WRAP(snd_config_search)(root_pcm, "slave", &slave_pcm); - if (r < 0) { - return NULL; - } - -- r = snd_config_get_string(slave_pcm, &string); -+ r = WRAP(snd_config_get_string)(slave_pcm, &string); - if (r >= 0) { -- r = snd_config_search_definition(lconf, "pcm_slave", string, &slave_def); -+ r = WRAP(snd_config_search_definition)(lconf, "pcm_slave", string, &slave_def); - if (r < 0) { - return NULL; - } - } - - do { -- r = snd_config_search(slave_def ? slave_def : slave_pcm, "pcm", &pcm); -+ r = WRAP(snd_config_search)(slave_def ? slave_def : slave_pcm, "pcm", &pcm); - if (r < 0) { - break; - } - -- r = snd_config_get_string(slave_def ? slave_def : slave_pcm, &string); -+ r = WRAP(snd_config_get_string)(slave_def ? slave_def : slave_pcm, &string); - if (r < 0) { - break; - } -@@ -565,7 +614,7 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm) - if (r < 0 || r > (int) sizeof(node_name)) { - break; - } -- r = snd_config_search(lconf, node_name, &pcm); -+ r = WRAP(snd_config_search)(lconf, node_name, &pcm); - if (r < 0) { - break; - } -@@ -574,7 +623,7 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm) - } while (0); - - if (slave_def) { -- snd_config_delete(slave_def); -+ WRAP(snd_config_delete)(slave_def); - } - - return NULL; -@@ -597,22 +646,22 @@ init_local_config_with_workaround(char const * pcm_name) - - lconf = NULL; - -- if (snd_config == NULL) { -+ if (*WRAP(snd_config) == NULL) { - return NULL; - } - -- r = snd_config_copy(&lconf, snd_config); -+ r = WRAP(snd_config_copy)(&lconf, *WRAP(snd_config)); - if (r < 0) { - return NULL; - } - - do { -- r = snd_config_search_definition(lconf, "pcm", pcm_name, &pcm_node); -+ r = WRAP(snd_config_search_definition)(lconf, "pcm", pcm_name, &pcm_node); - if (r < 0) { - break; - } - -- r = snd_config_get_id(pcm_node, &string); -+ r = WRAP(snd_config_get_id)(pcm_node, &string); - if (r < 0) { - break; - } -@@ -621,7 +670,7 @@ init_local_config_with_workaround(char const * pcm_name) - if (r < 0 || r > (int) sizeof(node_name)) { - break; - } -- r = snd_config_search(lconf, node_name, &pcm_node); -+ r = WRAP(snd_config_search)(lconf, node_name, &pcm_node); - if (r < 0) { - break; - } -@@ -632,12 +681,12 @@ init_local_config_with_workaround(char const * pcm_name) - } - - /* Fetch the PCM node's type, and bail out if it's not the PulseAudio plugin. */ -- r = snd_config_search(pcm_node, "type", &node); -+ r = WRAP(snd_config_search)(pcm_node, "type", &node); - if (r < 0) { - break; - } - -- r = snd_config_get_string(node, &string); -+ r = WRAP(snd_config_get_string)(node, &string); - if (r < 0) { - break; - } -@@ -648,18 +697,18 @@ init_local_config_with_workaround(char const * pcm_name) - - /* Don't clobber an explicit existing handle_underrun value, set it only - if it doesn't already exist. */ -- r = snd_config_search(pcm_node, "handle_underrun", &node); -+ r = WRAP(snd_config_search)(pcm_node, "handle_underrun", &node); - if (r != -ENOENT) { - break; - } - - /* Disable pcm_pulse's asynchronous underrun handling. */ -- r = snd_config_imake_integer(&node, "handle_underrun", 0); -+ r = WRAP(snd_config_imake_integer)(&node, "handle_underrun", 0); - if (r < 0) { - break; - } - -- r = snd_config_add(pcm_node, node); -+ r = WRAP(snd_config_add)(pcm_node, node); - if (r < 0) { - break; - } -@@ -667,7 +716,7 @@ init_local_config_with_workaround(char const * pcm_name) - return lconf; - } while (0); - -- snd_config_delete(lconf); -+ WRAP(snd_config_delete)(lconf); - - return NULL; - } -@@ -679,9 +728,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, char const * pcm_name, snd_pcm_stream_t s - - pthread_mutex_lock(&cubeb_alsa_mutex); - if (local_config) { -- r = snd_pcm_open_lconf(pcm, pcm_name, stream, SND_PCM_NONBLOCK, local_config); -+ r = WRAP(snd_pcm_open_lconf)(pcm, pcm_name, stream, SND_PCM_NONBLOCK, local_config); - } else { -- r = snd_pcm_open(pcm, pcm_name, stream, SND_PCM_NONBLOCK); -+ r = WRAP(snd_pcm_open)(pcm, pcm_name, stream, SND_PCM_NONBLOCK); - } - pthread_mutex_unlock(&cubeb_alsa_mutex); - -@@ -694,7 +743,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm) - int r; - - pthread_mutex_lock(&cubeb_alsa_mutex); -- r = snd_pcm_close(pcm); -+ r = WRAP(snd_pcm_close)(pcm); - pthread_mutex_unlock(&cubeb_alsa_mutex); - - return r; -@@ -757,12 +806,65 @@ alsa_init(cubeb ** context, char const * context_name) - pthread_attr_t attr; - snd_pcm_t * dummy; - -+ void * libasound = NULL; -+ -+#ifndef DISABLE_LIBASOUND_DLOPEN -+ libasound = dlopen("libasound.so", RTLD_LAZY); -+ if (!libasound) { -+ return CUBEB_ERROR; -+ } -+ -+#define LOAD(x) do { \ -+ cubeb_##x = dlsym(libasound, #x); \ -+ if (!cubeb_##x) { \ -+ dlclose(libasound); \ -+ return CUBEB_ERROR; \ -+ } \ -+ } while(0) -+ -+ LOAD(snd_config); -+ LOAD(snd_config_add); -+ LOAD(snd_config_copy); -+ LOAD(snd_config_delete); -+ LOAD(snd_config_get_id); -+ LOAD(snd_config_get_string); -+ LOAD(snd_config_imake_integer); -+ LOAD(snd_config_search); -+ LOAD(snd_config_search_definition); -+ LOAD(snd_lib_error_set_handler); -+ LOAD(snd_pcm_avail_update); -+ LOAD(snd_pcm_close); -+ LOAD(snd_pcm_delay); -+ LOAD(snd_pcm_drain); -+ LOAD(snd_pcm_frames_to_bytes); -+ LOAD(snd_pcm_get_params); -+ /* snd_pcm_hw_params_alloca is actually a macro */ -+ /* LOAD(snd_pcm_hw_params_alloca); */ -+ LOAD(snd_pcm_hw_params_sizeof); -+ LOAD(snd_pcm_hw_params_any); -+ LOAD(snd_pcm_hw_params_get_channels_max); -+ LOAD(snd_pcm_hw_params_get_rate); -+ LOAD(snd_pcm_hw_params_set_rate_near); -+ LOAD(snd_pcm_nonblock); -+ LOAD(snd_pcm_open); -+ LOAD(snd_pcm_open_lconf); -+ LOAD(snd_pcm_pause); -+ LOAD(snd_pcm_poll_descriptors); -+ LOAD(snd_pcm_poll_descriptors_count); -+ LOAD(snd_pcm_poll_descriptors_revents); -+ LOAD(snd_pcm_recover); -+ LOAD(snd_pcm_set_params); -+ LOAD(snd_pcm_state); -+ LOAD(snd_pcm_writei); -+ -+#undef LOAD -+#endif - assert(context); - *context = NULL; - - pthread_mutex_lock(&cubeb_alsa_mutex); - if (!cubeb_alsa_error_handler_set) { -- snd_lib_error_set_handler(silent_error_handler); -+ WRAP(snd_lib_error_set_handler)(silent_error_handler); - cubeb_alsa_error_handler_set = 1; - } - pthread_mutex_unlock(&cubeb_alsa_mutex); -@@ -770,6 +872,8 @@ alsa_init(cubeb ** context, char const * context_name) - ctx = calloc(1, sizeof(*ctx)); - assert(ctx); - -+ ctx->libasound = libasound; -+ - ctx->ops = &alsa_ops; - - r = pthread_mutex_init(&ctx->mutex, NULL); -@@ -819,7 +923,7 @@ alsa_init(cubeb ** context, char const * context_name) - config fails with EINVAL, the PA PCM is too old for this workaround. */ - if (r == -EINVAL) { - pthread_mutex_lock(&cubeb_alsa_mutex); -- snd_config_delete(ctx->local_config); -+ WRAP(snd_config_delete)(ctx->local_config); - pthread_mutex_unlock(&cubeb_alsa_mutex); - ctx->local_config = NULL; - } else if (r >= 0) { -@@ -859,9 +963,13 @@ alsa_destroy(cubeb * ctx) - pthread_mutex_destroy(&ctx->mutex); - free(ctx->fds); - -+ if (ctx->libasound) { -+ dlclose(ctx->libasound); -+ } -+ - if (ctx->local_config) { - pthread_mutex_lock(&cubeb_alsa_mutex); -- snd_config_delete(ctx->local_config); -+ WRAP(snd_config_delete)(ctx->local_config); - pthread_mutex_unlock(&cubeb_alsa_mutex); - } - -@@ -948,7 +1056,7 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream - return CUBEB_ERROR; - } - -- r = snd_pcm_nonblock(stm->pcm, 1); -+ r = WRAP(snd_pcm_nonblock)(stm->pcm, 1); - assert(r == 0); - - latency_us = latency_frames * 1e6 / stm->params.rate; -@@ -961,7 +1069,7 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream - latency_us = latency_us < min_latency ? min_latency: latency_us; - } - -- r = snd_pcm_set_params(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED, -+ r = WRAP(snd_pcm_set_params)(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED, - stm->params.channels, stm->params.rate, 1, - latency_us); - if (r < 0) { -@@ -969,20 +1077,20 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream - return CUBEB_ERROR_INVALID_FORMAT; - } - -- r = snd_pcm_get_params(stm->pcm, &stm->buffer_size, &period_size); -+ r = WRAP(snd_pcm_get_params)(stm->pcm, &stm->buffer_size, &period_size); - assert(r == 0); - - /* Double internal buffer size to have enough space when waiting for the other side of duplex connection */ - stm->buffer_size *= 2; -- stm->buffer = calloc(1, snd_pcm_frames_to_bytes(stm->pcm, stm->buffer_size)); -+ stm->buffer = calloc(1, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->buffer_size)); - assert(stm->buffer); - -- stm->nfds = snd_pcm_poll_descriptors_count(stm->pcm); -+ stm->nfds = WRAP(snd_pcm_poll_descriptors_count)(stm->pcm); - assert(stm->nfds > 0); - - stm->saved_fds = calloc(stm->nfds, sizeof(struct pollfd)); - assert(stm->saved_fds); -- r = snd_pcm_poll_descriptors(stm->pcm, stm->saved_fds, stm->nfds); -+ r = WRAP(snd_pcm_poll_descriptors)(stm->pcm, stm->saved_fds, stm->nfds); - assert((nfds_t) r == stm->nfds); - - if (alsa_register_stream(ctx, stm) != 0) { -@@ -1054,7 +1162,7 @@ alsa_stream_destroy(cubeb_stream * stm) - pthread_mutex_lock(&stm->mutex); - if (stm->pcm) { - if (stm->state == DRAINING) { -- snd_pcm_drain(stm->pcm); -+ WRAP(snd_pcm_drain)(stm->pcm); - } - alsa_locked_pcm_close(stm->pcm); - stm->pcm = NULL; -@@ -1100,12 +1208,12 @@ alsa_get_max_channel_count(cubeb * ctx, uint32_t * max_channels) - - assert(stm); - -- r = snd_pcm_hw_params_any(stm->pcm, hw_params); -+ r = WRAP(snd_pcm_hw_params_any)(stm->pcm, hw_params); - if (r < 0) { - return CUBEB_ERROR; - } - -- r = snd_pcm_hw_params_get_channels_max(hw_params, max_channels); -+ r = WRAP(snd_pcm_hw_params_get_channels_max)(hw_params, max_channels); - if (r < 0) { - return CUBEB_ERROR; - } -@@ -1126,34 +1234,34 @@ alsa_get_preferred_sample_rate(cubeb * ctx, uint32_t * rate) { - - /* get a pcm, disabling resampling, so we get a rate the - * hardware/dmix/pulse/etc. supports. */ -- r = snd_pcm_open(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK, SND_PCM_NO_AUTO_RESAMPLE); -+ r = WRAP(snd_pcm_open)(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK, SND_PCM_NO_AUTO_RESAMPLE); - if (r < 0) { - return CUBEB_ERROR; - } - -- r = snd_pcm_hw_params_any(pcm, hw_params); -+ r = WRAP(snd_pcm_hw_params_any)(pcm, hw_params); - if (r < 0) { -- snd_pcm_close(pcm); -+ WRAP(snd_pcm_close)(pcm); - return CUBEB_ERROR; - } - -- r = snd_pcm_hw_params_get_rate(hw_params, rate, &dir); -+ r = WRAP(snd_pcm_hw_params_get_rate)(hw_params, rate, &dir); - if (r >= 0) { - /* There is a default rate: use it. */ -- snd_pcm_close(pcm); -+ WRAP(snd_pcm_close)(pcm); - return CUBEB_OK; - } - - /* Use a common rate, alsa may adjust it based on hw/etc. capabilities. */ - *rate = 44100; - -- r = snd_pcm_hw_params_set_rate_near(pcm, hw_params, rate, NULL); -+ r = WRAP(snd_pcm_hw_params_set_rate_near)(pcm, hw_params, rate, NULL); - if (r < 0) { -- snd_pcm_close(pcm); -+ WRAP(snd_pcm_close)(pcm); - return CUBEB_ERROR; - } - -- snd_pcm_close(pcm); -+ WRAP(snd_pcm_close)(pcm); - - return CUBEB_OK; - } -@@ -1186,10 +1294,10 @@ alsa_stream_start(cubeb_stream * stm) - pthread_mutex_lock(&stm->mutex); - /* Capture pcm must be started after initial setup/recover */ - if (stm->stream_type == SND_PCM_STREAM_CAPTURE && -- snd_pcm_state(stm->pcm) == SND_PCM_STATE_PREPARED) { -- snd_pcm_start(stm->pcm); -+ WRAP(snd_pcm_state)(stm->pcm) == SND_PCM_STATE_PREPARED) { -+ WRAP(snd_pcm_start)(stm->pcm); - } -- snd_pcm_pause(stm->pcm, 0); -+ WRAP(snd_pcm_pause)(stm->pcm, 0); - gettimeofday(&stm->last_activity, NULL); - pthread_mutex_unlock(&stm->mutex); - -@@ -1229,7 +1337,7 @@ alsa_stream_stop(cubeb_stream * stm) - pthread_mutex_unlock(&ctx->mutex); - - pthread_mutex_lock(&stm->mutex); -- snd_pcm_pause(stm->pcm, 1); -+ WRAP(snd_pcm_pause)(stm->pcm, 1); - pthread_mutex_unlock(&stm->mutex); - - return CUBEB_OK; -@@ -1245,8 +1353,8 @@ alsa_stream_get_position(cubeb_stream * stm, uint64_t * position) - pthread_mutex_lock(&stm->mutex); - - delay = -1; -- if (snd_pcm_state(stm->pcm) != SND_PCM_STATE_RUNNING || -- snd_pcm_delay(stm->pcm, &delay) != 0) { -+ if (WRAP(snd_pcm_state)(stm->pcm) != SND_PCM_STATE_RUNNING || -+ WRAP(snd_pcm_delay)(stm->pcm, &delay) != 0) { - *position = stm->last_position; - pthread_mutex_unlock(&stm->mutex); - return CUBEB_OK; -@@ -1271,7 +1379,7 @@ alsa_stream_get_latency(cubeb_stream * stm, uint32_t * latency) - snd_pcm_sframes_t delay; - /* This function returns the delay in frames until a frame written using - snd_pcm_writei is sent to the DAC. The DAC delay should be < 1ms anyways. */ -- if (snd_pcm_delay(stm->pcm, &delay)) { -+ if (WRAP(snd_pcm_delay)(stm->pcm, &delay)) { - return CUBEB_ERROR; - } - -diff --git toolkit/library/moz.build toolkit/library/moz.build -index b0df6b98b91f..e06592daa265 100644 ---- toolkit/library/moz.build -+++ toolkit/library/moz.build -@@ -247,9 +247,6 @@ if CONFIG['MOZ_SYSTEM_LIBVPX']: - if not CONFIG['MOZ_TREE_PIXMAN']: - OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS'] - --if CONFIG['MOZ_ALSA']: -- OS_LIBS += CONFIG['MOZ_ALSA_LIBS'] -- - if CONFIG['HAVE_CLOCK_MONOTONIC']: - OS_LIBS += CONFIG['REALTIME_LIBS'] - - -commit 161bcd671217 -Author: Evgeniy Vodolazskiy -Date: Wed Sep 3 10:47:00 2014 -0700 - - Bug 1021761 - Add OSS backend to libcubeb, default but last on Linux. r=kinetik r=glandium ---- - build/moz.configure/old.configure | 1 + - dom/media/CubebUtils.cpp | 3 +- - media/libcubeb/AUTHORS | 1 + - media/libcubeb/src/cubeb.c | 10 + - media/libcubeb/src/cubeb_oss.c | 453 ++++++++++++++++++++++++++++++++++++++ - media/libcubeb/src/moz.build | 7 + - media/libcubeb/update.sh | 1 + - old-configure.in | 62 ++++++ - toolkit/library/moz.build | 3 + - 9 files changed, 540 insertions(+), 1 deletion(-) - -diff --git build/moz.configure/old.configure build/moz.configure/old.configure -index 17d0c5bf3420..3e6dbc16ca14 100644 ---- build/moz.configure/old.configure -+++ build/moz.configure/old.configure -@@ -262,6 +262,7 @@ def old_configure_options(*options): - '--with-nspr-prefix', - '--with-nss-exec-prefix', - '--with-nss-prefix', -+ '--with-oss', - '--with-pthreads', - '--with-qemu-exe', - '--with-sixgill', -diff --git dom/media/CubebUtils.cpp dom/media/CubebUtils.cpp -index 88063ed3a4d6..8613f86dbd16 100644 ---- dom/media/CubebUtils.cpp -+++ dom/media/CubebUtils.cpp -@@ -149,7 +149,8 @@ const char* AUDIOSTREAM_BACKEND_ID_STR[] = { - "sndio", - "opensl", - "audiotrack", -- "kai" -+ "kai", -+ "oss", - }; - /* Index for failures to create an audio stream the first time. */ - const int CUBEB_BACKEND_INIT_FAILURE_FIRST = -diff --git media/libcubeb/AUTHORS media/libcubeb/AUTHORS -index f0f9595227f2..e7e7048190ab 100644 ---- media/libcubeb/AUTHORS -+++ media/libcubeb/AUTHORS -@@ -4,6 +4,7 @@ Michael Wu - Paul Adenot - David Richards - Sebastien Alaiwan -+Evgeniy Vodolazskiy - KO Myung-Hun - Haakon Sporsheim - Alex Chronopoulos -diff --git media/libcubeb/src/cubeb.c media/libcubeb/src/cubeb.c -index bb35e0ce349f..e523d94108a3 100644 ---- media/libcubeb/src/cubeb.c -+++ media/libcubeb/src/cubeb.c -@@ -60,6 +60,9 @@ int audiotrack_init(cubeb ** context, char const * context_name); - #if defined(USE_KAI) - int kai_init(cubeb ** context, char const * context_name); - #endif -+#if defined(USE_OSS) -+int oss_init(cubeb ** context, char const * context_name); -+#endif - - static int - validate_stream_params(cubeb_stream_params * input_stream_params, -@@ -159,6 +162,10 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam - } else if (!strcmp(backend_name, "kai")) { - #if defined(USE_KAI) - init_oneshot = kai_init; -+#endif -+ } else if (!strcmp(backend_name, "oss")) { -+#if defined(USE_OSS) -+ init_oneshot = oss_init; - #endif - } else { - /* Already set */ -@@ -203,6 +210,9 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam - #endif - #if defined(USE_KAI) - kai_init, -+#endif -+#if defined(USE_OSS) -+ oss_init, - #endif - }; - int i; -diff --git media/libcubeb/src/cubeb_oss.c media/libcubeb/src/cubeb_oss.c -new file mode 100644 -index 000000000000..7d96168b9ea6 ---- /dev/null -+++ media/libcubeb/src/cubeb_oss.c -@@ -0,0 +1,454 @@ -+/* -+ * Copyright © 2014 Mozilla Foundation -+ * -+ * This program is made available under an ISC-style license. See the -+ * accompanying file LICENSE for details. -+ */ -+#if defined(HAVE_SYS_SOUNDCARD_H) -+#include -+#else -+#include -+#endif -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "cubeb/cubeb.h" -+#include "cubeb-internal.h" -+ -+#ifndef CUBEB_OSS_DEFAULT_OUTPUT -+#define CUBEB_OSS_DEFAULT_OUTPUT "/dev/dsp" -+#endif -+ -+#define OSS_BUFFER_SIZE 1024 -+ -+struct cubeb { -+ struct cubeb_ops const * ops; -+}; -+ -+struct cubeb_stream { -+ /* Note: Must match cubeb_stream layout in cubeb.c. */ -+ cubeb * context; -+ void * user_ptr; -+ /**/ -+ -+ cubeb_data_callback data_callback; -+ cubeb_state_callback state_callback; -+ float volume; -+ float panning; -+ -+ pthread_mutex_t state_mutex; -+ pthread_cond_t state_cond; -+ -+ int running; -+ int stopped; -+ int floating; -+ -+ /* These two vars are needed to support old versions of OSS */ -+ unsigned int position_bytes; -+ unsigned int last_position_bytes; -+ -+ uint64_t written_frags; /* The number of fragments written to /dev/dsp */ -+ uint64_t missed_frags; /* fragments output with stopped stream */ -+ -+ cubeb_stream_params params; -+ int fd; -+ pthread_t th; -+}; -+ -+static struct cubeb_ops const oss_ops; -+ -+int oss_init(cubeb ** context, char const * context_name) -+{ -+ cubeb* ctx = (cubeb*)malloc(sizeof(cubeb)); -+ ctx->ops = &oss_ops; -+ *context = ctx; -+ return CUBEB_OK; -+} -+ -+static void oss_destroy(cubeb *ctx) -+{ -+ free(ctx); -+} -+ -+static char const * oss_get_backend_id(cubeb * context) -+{ -+ static char oss_name[] = "oss"; -+ return oss_name; -+} -+ -+static int oss_get_max_channel_count(cubeb * ctx, uint32_t * max_channels) -+{ -+ *max_channels = 2; /* Let's support only stereo for now */ -+ return CUBEB_OK; -+} -+ -+static int oss_get_min_latency(cubeb * context, cubeb_stream_params params, -+ uint32_t * latency_frames) -+{ -+ (void)context; -+ /* 40ms is a big enough number to work ok */ -+ *latency_frames = 40 * params.rate / 1000; -+ return CUBEB_OK; -+} -+ -+static int oss_get_preferred_sample_rate(cubeb *context, uint32_t * rate) -+{ -+ /* 48000 seems a prefered choice for most audio devices -+ * and a good choice for OSS */ -+ *rate = 48000; -+ return CUBEB_OK; -+} -+ -+static void run_state_callback(cubeb_stream *stream, cubeb_state state) -+{ -+ if (stream->state_callback) { -+ stream->state_callback(stream, stream->user_ptr, state); -+ } -+} -+ -+static long run_data_callback(cubeb_stream *stream, void *buffer, long nframes) -+{ -+ long got = 0; -+ pthread_mutex_lock(&stream->state_mutex); -+ if (stream->data_callback && stream->running && !stream->stopped) { -+ pthread_mutex_unlock(&stream->state_mutex); -+ got = stream->data_callback(stream, stream->user_ptr, NULL, buffer, nframes); -+ } else { -+ pthread_mutex_unlock(&stream->state_mutex); -+ } -+ return got; -+} -+ -+static void apply_volume_int(int16_t* buffer, unsigned int n, -+ float volume, float panning) -+{ -+ float left = volume; -+ float right = volume; -+ unsigned int i; -+ int pan[2]; -+ if (panning<0) { -+ right *= (1+panning); -+ } else { -+ left *= (1-panning); -+ } -+ pan[0] = 128.0*left; -+ pan[1] = 128.0*right; -+ for(i=0; irunning) { -+ pthread_mutex_lock(&stream->state_mutex); -+ if (stream->stopped) { -+ pthread_mutex_unlock(&stream->state_mutex); -+ run_state_callback(stream, CUBEB_STATE_STOPPED); -+ pthread_mutex_lock(&stream->state_mutex); -+ while (stream->stopped) { -+ pthread_cond_wait(&stream->state_cond, &stream->state_mutex); -+ } -+ pthread_mutex_unlock(&stream->state_mutex); -+ run_state_callback(stream, CUBEB_STATE_STARTED); -+ continue; -+ } -+ pthread_mutex_unlock(&stream->state_mutex); -+ if (stream->floating) { -+ got = run_data_callback(stream, f_buffer, -+ OSS_BUFFER_SIZE/stream->params.channels); -+ apply_volume_float(f_buffer, got*stream->params.channels, -+ stream->volume, stream->panning); -+ for (i=0; i<((unsigned long)got)*stream->params.channels; i++) { -+ /* Clipping is prefered to overflow */ -+ if(f_buffer[i]>=1.0){ -+ f_buffer[i]=1.0; -+ } -+ if(f_buffer[i]<=-1.0){ -+ f_buffer[i]=-1.0; -+ } -+ /* One might think that multipling by 32767.0 is logical but results in clipping */ -+ buffer[i] = f_buffer[i]*32767.0; -+ } -+ } else { -+ got = run_data_callback(stream, buffer, -+ OSS_BUFFER_SIZE/stream->params.channels); -+ apply_volume_int(buffer, got*stream->params.channels, -+ stream->volume, stream->panning); -+ } -+ if (got<0) { -+ run_state_callback(stream, CUBEB_STATE_ERROR); -+ break; -+ } -+ if (!got) { -+ run_state_callback(stream, CUBEB_STATE_DRAINED); -+ } -+ if (got) { -+ size_t i = 0; -+ size_t s = got*stream->params.channels*sizeof(int16_t); -+ while (i < s) { -+ ssize_t n = write(stream->fd, ((char*)buffer) + i, s - i); -+ if (n<=0) { -+ run_state_callback(stream, CUBEB_STATE_ERROR); -+ break; -+ } -+ i+=n; -+ } -+ stream->written_frags+=got; -+ } -+ } -+ return NULL; -+} -+ -+static void oss_try_set_latency(cubeb_stream* stream, unsigned int latency) -+{ -+ unsigned int latency_bytes, n_frag; -+ int frag; -+ /* fragment size of 1024 is a good choice with good chances to be accepted */ -+ unsigned int frag_log=10; /* 2^frag_log = fragment size */ -+ latency_bytes = -+ latency*stream->params.rate*stream->params.channels*sizeof(uint16_t)/1000; -+ n_frag = latency_bytes>>frag_log; -+ frag = (n_frag<<16) | frag_log; -+ /* Even if this fails we wish to continue, not checking for errors */ -+ ioctl(stream->fd, SNDCTL_DSP_SETFRAGMENT, &frag); -+} -+ -+static int oss_stream_init(cubeb * context, cubeb_stream ** stm, -+ char const * stream_name, -+ cubeb_devid input_device, -+ cubeb_stream_params * input_stream_params, -+ cubeb_devid output_device, -+ cubeb_stream_params * output_stream_params, -+ unsigned int latency, -+ cubeb_data_callback data_callback, -+ cubeb_state_callback state_callback, void * user_ptr) -+{ -+ cubeb_stream* stream = (cubeb_stream*)malloc(sizeof(cubeb_stream)); -+ stream->context = context; -+ stream->data_callback = data_callback; -+ stream->state_callback = state_callback; -+ stream->user_ptr = user_ptr; -+ -+ assert(!input_stream_params && "not supported."); -+ if (input_device || output_device) { -+ /* Device selection not yet implemented. */ -+ return CUBEB_ERROR_DEVICE_UNAVAILABLE; -+ } -+ -+ if ((input_stream_params && input_stream_params->prefs & CUBEB_STREAM_PREF_LOOPBACK) || -+ (output_stream_params && output_stream_params->prefs & CUBEB_STREAM_PREF_LOOPBACK)) { -+ return CUBEB_ERROR_NOT_SUPPORTED; -+ } -+ -+ if ((stream->fd = open(CUBEB_OSS_DEFAULT_OUTPUT, O_WRONLY)) == -1) { -+ free(stream); -+ return CUBEB_ERROR; -+ } -+#define SET(what, to) do { unsigned int i = to; \ -+ int j = ioctl(stream->fd, what, &i); \ -+ if (j == -1 || i != to) { \ -+ close(stream->fd); \ -+ free(stream); \ -+ return CUBEB_ERROR_INVALID_FORMAT; } } while (0) -+ -+ stream->params = *output_stream_params; -+ stream->volume = 1.0; -+ stream->panning = 0.0; -+ -+ oss_try_set_latency(stream, latency); -+ -+ stream->floating = 0; -+ SET(SNDCTL_DSP_CHANNELS, stream->params.channels); -+ SET(SNDCTL_DSP_SPEED, stream->params.rate); -+ switch (stream->params.format) { -+ case CUBEB_SAMPLE_S16LE: -+ SET(SNDCTL_DSP_SETFMT, AFMT_S16_LE); -+ break; -+ case CUBEB_SAMPLE_S16BE: -+ SET(SNDCTL_DSP_SETFMT, AFMT_S16_BE); -+ break; -+ case CUBEB_SAMPLE_FLOAT32LE: -+ SET(SNDCTL_DSP_SETFMT, AFMT_S16_NE); -+ stream->floating = 1; -+ break; -+ default: -+ close(stream->fd); -+ free(stream); -+ return CUBEB_ERROR; -+ } -+ -+ -+ pthread_mutex_init(&stream->state_mutex, NULL); -+ pthread_cond_init(&stream->state_cond, NULL); -+ -+ stream->running = 1; -+ stream->stopped = 1; -+ stream->position_bytes = 0; -+ stream->last_position_bytes = 0; -+ stream->written_frags = 0; -+ stream->missed_frags = 0; -+ -+ pthread_create(&stream->th, NULL, writer, (void*)stream); -+ -+ *stm = stream; -+ -+ return CUBEB_OK; -+} -+ -+static void oss_stream_destroy(cubeb_stream * stream) -+{ -+ pthread_mutex_lock(&stream->state_mutex); -+ -+ stream->running = 0; -+ stream->stopped = 0; -+ pthread_cond_signal(&stream->state_cond); -+ -+ pthread_mutex_unlock(&stream->state_mutex); -+ -+ pthread_join(stream->th, NULL); -+ -+ pthread_mutex_destroy(&stream->state_mutex); -+ pthread_cond_destroy(&stream->state_cond); -+ close(stream->fd); -+ free(stream); -+} -+ -+static int oss_stream_get_latency(cubeb_stream * stream, uint32_t * latency) -+{ -+ if (ioctl(stream->fd, SNDCTL_DSP_GETODELAY, latency)==-1) { -+ return CUBEB_ERROR; -+ } -+ /* Convert latency from bytes to frames */ -+ *latency /= stream->params.channels*sizeof(int16_t); -+ return CUBEB_OK; -+} -+ -+ -+static int oss_stream_current_optr(cubeb_stream * stream, uint64_t * position) -+{ -+ count_info ci; -+ /* Unfortunately, this ioctl is only available in OSS 4.x */ -+#ifdef SNDCTL_DSP_CURRENT_OPTR -+ oss_count_t count; -+ if (ioctl(stream->fd, SNDCTL_DSP_CURRENT_OPTR, &count) != -1) { -+ *position = count.samples;// + count.fifo_samples; -+ return CUBEB_OK; -+ } -+#endif -+ /* Fall back to this ioctl in case the previous one fails */ -+ if (ioctl(stream->fd, SNDCTL_DSP_GETOPTR, &ci) == -1) { -+ return CUBEB_ERROR; -+ } -+ /* ci.bytes is only 32 bit and will start to wrap after arithmetic overflow */ -+ stream->position_bytes += ci.bytes - stream->last_position_bytes; -+ stream->last_position_bytes = ci.bytes; -+ *position = stream->position_bytes/stream->params.channels/sizeof(int16_t); -+ return CUBEB_OK; -+} -+ -+static int oss_stream_get_position(cubeb_stream * stream, uint64_t * position) -+{ -+ if ( oss_stream_current_optr(stream, position) == CUBEB_OK ){ -+ *position -= stream->missed_frags; -+ return CUBEB_OK; -+ } -+ /* If no correct method to get position works we resort to this */ -+ *position = stream->written_frags; -+ return CUBEB_OK; -+} -+ -+ -+static int oss_stream_start(cubeb_stream * stream) -+{ -+ pthread_mutex_lock(&stream->state_mutex); -+ if (stream->stopped) { -+ uint64_t ptr; -+ oss_stream_current_optr(stream, &ptr); -+ stream->missed_frags = ptr - stream->written_frags; -+ stream->stopped = 0; -+ pthread_cond_signal(&stream->state_cond); -+ } -+ pthread_mutex_unlock(&stream->state_mutex); -+ return CUBEB_OK; -+} -+ -+static int oss_stream_stop(cubeb_stream * stream) -+{ -+ pthread_mutex_lock(&stream->state_mutex); -+ stream->stopped = 1; -+ pthread_mutex_unlock(&stream->state_mutex); -+ return CUBEB_OK; -+} -+ -+int oss_stream_set_panning(cubeb_stream * stream, float panning) -+{ -+ if (stream->params.channels == 2) { -+ stream->panning=panning; -+ } -+ return CUBEB_OK; -+} -+ -+int oss_stream_set_volume(cubeb_stream * stream, float volume) -+{ -+ stream->volume=volume; -+ return CUBEB_OK; -+} -+ -+static struct cubeb_ops const oss_ops = { -+ .init = oss_init, -+ .get_backend_id = oss_get_backend_id, -+ .get_max_channel_count = oss_get_max_channel_count, -+ .get_min_latency = oss_get_min_latency, -+ .get_preferred_sample_rate = oss_get_preferred_sample_rate, -+ .get_preferred_channel_layout = NULL, -+ .enumerate_devices = NULL, -+ .device_collection_destroy = NULL, -+ .destroy = oss_destroy, -+ .stream_init = oss_stream_init, -+ .stream_destroy = oss_stream_destroy, -+ .stream_start = oss_stream_start, -+ .stream_stop = oss_stream_stop, -+ .stream_reset_default_device = NULL, -+ .stream_get_position = oss_stream_get_position, -+ .stream_get_latency = oss_stream_get_latency, -+ .stream_set_volume = oss_stream_set_volume, -+ .stream_set_panning = oss_stream_set_panning, -+ .stream_get_current_device = NULL, -+ .stream_device_destroy = NULL, -+ .stream_register_device_changed_callback = NULL, -+ .register_device_collection_changed = NULL -+}; -diff --git media/libcubeb/src/moz.build media/libcubeb/src/moz.build -index e1fea30ca417..a5b1100f1014 100644 ---- media/libcubeb/src/moz.build -+++ media/libcubeb/src/moz.build -@@ -23,6 +23,12 @@ if CONFIG['MOZ_ALSA']: - ] - DEFINES['USE_ALSA'] = True - -+if CONFIG['MOZ_OSS']: -+ SOURCES += [ -+ 'cubeb_oss.c', -+ ] -+ DEFINES['USE_OSS'] = True -+ - if CONFIG['MOZ_PULSEAUDIO'] or CONFIG['MOZ_JACK']: - SOURCES += [ - 'cubeb_resampler.cpp', -@@ -88,6 +94,7 @@ if CONFIG['OS_TARGET'] == 'Android': - FINAL_LIBRARY = 'gkmedias' - - CFLAGS += CONFIG['MOZ_ALSA_CFLAGS'] -+CFLAGS += CONFIG['MOZ_OSS_CFLAGS'] - CFLAGS += CONFIG['MOZ_PULSEAUDIO_CFLAGS'] - - # We allow warnings for third-party code that can be updated from upstream. -diff --git media/libcubeb/update.sh media/libcubeb/update.sh -index 0bb6345c9fa9..78a102dc47cb 100755 ---- media/libcubeb/update.sh -+++ media/libcubeb/update.sh -@@ -20,6 +20,7 @@ cp $1/src/cubeb_log.h src - cp $1/src/cubeb_mixer.cpp src - cp $1/src/cubeb_mixer.h src - cp $1/src/cubeb_opensl.c src -+cp $1/src/cubeb_oss.c src - cp $1/src/cubeb-jni.cpp src - cp $1/src/cubeb-jni.h src - cp $1/src/android/cubeb-output-latency.h src/android -diff --git old-configure.in old-configure.in -index 28e1a9e48d61..edacedcf6e5d 100644 ---- old-configure.in -+++ old-configure.in -@@ -2598,6 +2598,67 @@ MOZ_WEBM_ENCODER=1 - AC_DEFINE(MOZ_WEBM_ENCODER) - AC_SUBST(MOZ_WEBM_ENCODER) - -+dnl ================================== -+dnl = Check OSS availability -+dnl ================================== -+ -+dnl If using Linux, Solaris or BSDs, ensure that OSS is available -+case "$OS_TARGET" in -+Linux|SunOS|DragonFly|FreeBSD|NetBSD|GNU/kFreeBSD) -+ MOZ_OSS=1 -+ ;; -+esac -+ -+MOZ_ARG_WITH_STRING(oss, -+[ --with-oss[=PFX] Enable OpenSoundSystem support [installed at prefix PFX]], -+ OSSPREFIX=$withval) -+ -+if test -n "$OSSPREFIX"; then -+ if test "$OSSPREFIX" != "no"; then -+ MOZ_OSS=1 -+ else -+ MOZ_OSS= -+ fi -+fi -+ -+_SAVE_CFLAGS=$CFLAGS -+_SAVE_LIBS=$LIBS -+if test -n "$MOZ_OSS"; then -+ dnl Prefer 4Front implementation -+ AC_MSG_CHECKING([MOZ_OSS_CFLAGS]) -+ if test "$OSSPREFIX" != "yes"; then -+ oss_conf=${OSSPREFIX%/usr}/etc/oss.conf -+ if test -f "$oss_conf"; then -+ . "$oss_conf" -+ else -+ OSSLIBDIR=$OSSPREFIX/lib/oss -+ fi -+ if test -d "$OSSLIBDIR"; then -+ MOZ_OSS_CFLAGS="$MOZ_OSS_CFLAGS -I$OSSLIBDIR/include" -+ fi -+ fi -+ AC_MSG_RESULT([$MOZ_OSS_CFLAGS]) -+ -+ CFLAGS="$CFLAGS $MOZ_OSS_CFLAGS" -+ MOZ_CHECK_HEADERS(sys/soundcard.h soundcard.h) -+ -+ if test "$ac_cv_header_sys_soundcard_h" != "yes" -a \ -+ "$ac_cv_header_soundcard_h" != "yes"; then -+ AC_MSG_ERROR([Need OSS for Ogg, Wave or WebM decoding on $OS_TARGET. Disable with --without-oss.]) -+ fi -+ -+ dnl Assume NetBSD implementation over SunAudio -+ AC_CHECK_LIB(ossaudio, _oss_ioctl, -+ [AC_DEFINE_UNQUOTED(CUBEB_OSS_DEFAULT_OUTPUT, "/dev/sound") -+ MOZ_OSS_LIBS="$MOZ_OSS_LIBS -lossaudio"]) -+fi -+CFLAGS=$_SAVE_CFLAGS -+LIBS=$_SAVE_LIBS -+ -+AC_SUBST(MOZ_OSS) -+AC_SUBST_LIST(MOZ_OSS_CFLAGS) -+AC_SUBST_LIST(MOZ_OSS_LIBS) -+ - dnl ================================== - dnl = Check alsa availability on Linux - dnl ================================== -diff --git toolkit/library/moz.build toolkit/library/moz.build -index e06592daa265..ce016b96c2bc 100644 ---- toolkit/library/moz.build -+++ toolkit/library/moz.build -@@ -247,6 +247,9 @@ if CONFIG['MOZ_SYSTEM_LIBVPX']: - if not CONFIG['MOZ_TREE_PIXMAN']: - OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS'] - -+if CONFIG['MOZ_OSS']: -+ OS_LIBS += CONFIG['MOZ_OSS_LIBS'] -+ - if CONFIG['HAVE_CLOCK_MONOTONIC']: - OS_LIBS += CONFIG['REALTIME_LIBS'] - diff --git a/mail/thunderbird/files/patch-ijg-libjpeg b/mail/thunderbird/files/patch-ijg-libjpeg deleted file mode 100644 index b6788adc0f8..00000000000 --- a/mail/thunderbird/files/patch-ijg-libjpeg +++ /dev/null @@ -1,383 +0,0 @@ -# Partially revert bug 791305 to allow building with system IJG jpeg library - -diff --git old-configure.in configure.in -index f0aeb5d..1c01010 100644 ---- old-configure.in -+++ old-configure.in -@@ -4027,11 +4027,7 @@ if test "$MOZ_SYSTEM_JPEG" = 1; then - #include ], - [ #if JPEG_LIB_VERSION < $MOZJPEG - #error "Insufficient JPEG library version ($MOZJPEG required)." -- #endif -- #ifndef JCS_EXTENSIONS -- #error "libjpeg-turbo JCS_EXTENSIONS required" -- #endif -- ], -+ #endif ], - MOZ_SYSTEM_JPEG=1, - AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg])) - fi -diff --git image/decoders/nsJPEGDecoder.cpp image/decoders/nsJPEGDecoder.cpp -index 8fa8200..1d2a259 100644 ---- image/decoders/nsJPEGDecoder.cpp -+++ image/decoders/nsJPEGDecoder.cpp -@@ -21,13 +21,28 @@ - - extern "C" { - #include "iccjpeg.h" --} - -+#ifdef JCS_EXTENSIONS - #if MOZ_BIG_ENDIAN - #define MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB JCS_EXT_XRGB - #else - #define MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB JCS_EXT_BGRX - #endif -+#else -+/* Colorspace conversion (copied from jpegint.h) */ -+struct jpeg_color_deconverter { -+ JMETHOD(void, start_pass, (j_decompress_ptr cinfo)); -+ JMETHOD(void, color_convert, (j_decompress_ptr cinfo, -+ JSAMPIMAGE input_buf, JDIMENSION input_row, -+ JSAMPARRAY output_buf, int num_rows)); -+}; -+ -+METHODDEF(void) -+ycc_rgb_convert_argb (j_decompress_ptr cinfo, -+ JSAMPIMAGE input_buf, JDIMENSION input_row, -+ JSAMPARRAY output_buf, int num_rows); -+#endif -+} - - static void cmyk_convert_rgb(JSAMPROW row, JDIMENSION width); - -@@ -367,6 +382,7 @@ nsJPEGDecoder::WriteInternal(const char* - case JCS_GRAYSCALE: - case JCS_RGB: - case JCS_YCbCr: -+#ifdef JCS_EXTENSIONS - // if we're not color managing we can decode directly to - // MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB - if (mCMSMode != eCMSMode_All) { -@@ -375,6 +391,9 @@ nsJPEGDecoder::WriteInternal(const char* - } else { - mInfo.out_color_space = JCS_RGB; - } -+#else -+ mInfo.out_color_space = JCS_RGB; -+#endif - break; - case JCS_CMYK: - case JCS_YCCK: -@@ -448,6 +467,16 @@ nsJPEGDecoder::WriteInternal(const char* - return; // I/O suspension - } - -+#ifndef JCS_EXTENSIONS -+ /* Force to use our YCbCr to Packed RGB converter when possible */ -+ if (!mTransform && (mCMSMode != eCMSMode_All) && -+ mInfo.jpeg_color_space == JCS_YCbCr && mInfo.out_color_space == JCS_RGB) { -+ /* Special case for the most common case: transform from YCbCr direct into packed ARGB */ -+ mInfo.out_color_components = 4; /* Packed ARGB pixels are always 4 bytes...*/ -+ mInfo.cconvert->color_convert = ycc_rgb_convert_argb; -+ } -+#endif -+ - // If this is a progressive JPEG ... - mState = mInfo.buffered_image ? - JPEG_DECOMPRESS_PROGRESSIVE : JPEG_DECOMPRESS_SEQUENTIAL; -@@ -605,7 +633,11 @@ nsJPEGDecoder::OutputScanlines(bool* sus - uint32_t* imageRow = ((uint32_t*)mImageData) + - (mInfo.output_scanline * mInfo.output_width); - -+#ifdef JCS_EXTENSIONS - if (mInfo.out_color_space == MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB) { -+#else -+ if (mInfo.cconvert->color_convert == ycc_rgb_convert_argb) { -+#endif - // Special case: scanline will be directly converted into packed ARGB - if (jpeg_read_scanlines(&mInfo, (JSAMPARRAY)&imageRow, 1) != 1) { - *suspend = true; // suspend -@@ -920,6 +952,282 @@ term_source (j_decompress_ptr jd) - } // namespace mozilla - - -+#ifndef JCS_EXTENSIONS -+/**************** YCbCr -> Cairo's RGB24/ARGB32 conversion: most common case **************/ -+ -+/* -+ * YCbCr is defined per CCIR 601-1, except that Cb and Cr are -+ * normalized to the range 0..MAXJSAMPLE rather than -0.5 .. 0.5. -+ * The conversion equations to be implemented are therefore -+ * R = Y + 1.40200 * Cr -+ * G = Y - 0.34414 * Cb - 0.71414 * Cr -+ * B = Y + 1.77200 * Cb -+ * where Cb and Cr represent the incoming values less CENTERJSAMPLE. -+ * (These numbers are derived from TIFF 6.0 section 21, dated 3-June-92.) -+ * -+ * To avoid floating-point arithmetic, we represent the fractional constants -+ * as integers scaled up by 2^16 (about 4 digits precision); we have to divide -+ * the products by 2^16, with appropriate rounding, to get the correct answer. -+ * Notice that Y, being an integral input, does not contribute any fraction -+ * so it need not participate in the rounding. -+ * -+ * For even more speed, we avoid doing any multiplications in the inner loop -+ * by precalculating the constants times Cb and Cr for all possible values. -+ * For 8-bit JSAMPLEs this is very reasonable (only 256 entries per table); -+ * for 12-bit samples it is still acceptable. It's not very reasonable for -+ * 16-bit samples, but if you want lossless storage you shouldn't be changing -+ * colorspace anyway. -+ * The Cr=>R and Cb=>B values can be rounded to integers in advance; the -+ * values for the G calculation are left scaled up, since we must add them -+ * together before rounding. -+ */ -+ -+#define SCALEBITS 16 /* speediest right-shift on some machines */ -+ -+/* Use static tables for color processing. */ -+/* Four tables, each 256 entries of 4 bytes totals 4K which is not bad... */ -+ -+const int Cr_r_tab[(MAXJSAMPLE+1) * sizeof(int)] ={ -+ -0xb3, -0xb2, -0xb1, -0xaf, -0xae, -0xac, -+ -0xab, -0xaa, -0xa8, -0xa7, -0xa5, -0xa4, -+ -0xa3, -0xa1, -0xa0, -0x9e, -0x9d, -0x9c, -+ -0x9a, -0x99, -0x97, -0x96, -0x95, -0x93, -+ -0x92, -0x90, -0x8f, -0x8e, -0x8c, -0x8b, -+ -0x89, -0x88, -0x87, -0x85, -0x84, -0x82, -+ -0x81, -0x80, -0x7e, -0x7d, -0x7b, -0x7a, -+ -0x79, -0x77, -0x76, -0x74, -0x73, -0x72, -+ -0x70, -0x6f, -0x6d, -0x6c, -0x6b, -0x69, -+ -0x68, -0x66, -0x65, -0x64, -0x62, -0x61, -+ -0x5f, -0x5e, -0x5d, -0x5b, -0x5a, -0x58, -+ -0x57, -0x56, -0x54, -0x53, -0x51, -0x50, -+ -0x4f, -0x4d, -0x4c, -0x4a, -0x49, -0x48, -+ -0x46, -0x45, -0x43, -0x42, -0x40, -0x3f, -+ -0x3e, -0x3c, -0x3b, -0x39, -0x38, -0x37, -+ -0x35, -0x34, -0x32, -0x31, -0x30, -0x2e, -+ -0x2d, -0x2b, -0x2a, -0x29, -0x27, -0x26, -+ -0x24, -0x23, -0x22, -0x20, -0x1f, -0x1d, -+ -0x1c, -0x1b, -0x19, -0x18, -0x16, -0x15, -+ -0x14, -0x12, -0x11, -0x0f, -0x0e, -0x0d, -+ -0x0b, -0x0a, -0x08, -0x07, -0x06, -0x04, -+ -0x03, -0x01, 0x00, 0x01, 0x03, 0x04, -+ 0x06, 0x07, 0x08, 0x0a, 0x0b, 0x0d, -+ 0x0e, 0x0f, 0x11, 0x12, 0x14, 0x15, -+ 0x16, 0x18, 0x19, 0x1b, 0x1c, 0x1d, -+ 0x1f, 0x20, 0x22, 0x23, 0x24, 0x26, -+ 0x27, 0x29, 0x2a, 0x2b, 0x2d, 0x2e, -+ 0x30, 0x31, 0x32, 0x34, 0x35, 0x37, -+ 0x38, 0x39, 0x3b, 0x3c, 0x3e, 0x3f, -+ 0x40, 0x42, 0x43, 0x45, 0x46, 0x48, -+ 0x49, 0x4a, 0x4c, 0x4d, 0x4f, 0x50, -+ 0x51, 0x53, 0x54, 0x56, 0x57, 0x58, -+ 0x5a, 0x5b, 0x5d, 0x5e, 0x5f, 0x61, -+ 0x62, 0x64, 0x65, 0x66, 0x68, 0x69, -+ 0x6b, 0x6c, 0x6d, 0x6f, 0x70, 0x72, -+ 0x73, 0x74, 0x76, 0x77, 0x79, 0x7a, -+ 0x7b, 0x7d, 0x7e, 0x80, 0x81, 0x82, -+ 0x84, 0x85, 0x87, 0x88, 0x89, 0x8b, -+ 0x8c, 0x8e, 0x8f, 0x90, 0x92, 0x93, -+ 0x95, 0x96, 0x97, 0x99, 0x9a, 0x9c, -+ 0x9d, 0x9e, 0xa0, 0xa1, 0xa3, 0xa4, -+ 0xa5, 0xa7, 0xa8, 0xaa, 0xab, 0xac, -+ 0xae, 0xaf, 0xb1, 0xb2, -+ }; -+ -+const int Cb_b_tab[(MAXJSAMPLE+1) * sizeof(int)] ={ -+ -0xe3, -0xe1, -0xdf, -0xde, -0xdc, -0xda, -+ -0xd8, -0xd6, -0xd5, -0xd3, -0xd1, -0xcf, -+ -0xce, -0xcc, -0xca, -0xc8, -0xc6, -0xc5, -+ -0xc3, -0xc1, -0xbf, -0xbe, -0xbc, -0xba, -+ -0xb8, -0xb7, -0xb5, -0xb3, -0xb1, -0xaf, -+ -0xae, -0xac, -0xaa, -0xa8, -0xa7, -0xa5, -+ -0xa3, -0xa1, -0x9f, -0x9e, -0x9c, -0x9a, -+ -0x98, -0x97, -0x95, -0x93, -0x91, -0x90, -+ -0x8e, -0x8c, -0x8a, -0x88, -0x87, -0x85, -+ -0x83, -0x81, -0x80, -0x7e, -0x7c, -0x7a, -+ -0x78, -0x77, -0x75, -0x73, -0x71, -0x70, -+ -0x6e, -0x6c, -0x6a, -0x69, -0x67, -0x65, -+ -0x63, -0x61, -0x60, -0x5e, -0x5c, -0x5a, -+ -0x59, -0x57, -0x55, -0x53, -0x52, -0x50, -+ -0x4e, -0x4c, -0x4a, -0x49, -0x47, -0x45, -+ -0x43, -0x42, -0x40, -0x3e, -0x3c, -0x3a, -+ -0x39, -0x37, -0x35, -0x33, -0x32, -0x30, -+ -0x2e, -0x2c, -0x2b, -0x29, -0x27, -0x25, -+ -0x23, -0x22, -0x20, -0x1e, -0x1c, -0x1b, -+ -0x19, -0x17, -0x15, -0x13, -0x12, -0x10, -+ -0x0e, -0x0c, -0x0b, -0x09, -0x07, -0x05, -+ -0x04, -0x02, 0x00, 0x02, 0x04, 0x05, -+ 0x07, 0x09, 0x0b, 0x0c, 0x0e, 0x10, -+ 0x12, 0x13, 0x15, 0x17, 0x19, 0x1b, -+ 0x1c, 0x1e, 0x20, 0x22, 0x23, 0x25, -+ 0x27, 0x29, 0x2b, 0x2c, 0x2e, 0x30, -+ 0x32, 0x33, 0x35, 0x37, 0x39, 0x3a, -+ 0x3c, 0x3e, 0x40, 0x42, 0x43, 0x45, -+ 0x47, 0x49, 0x4a, 0x4c, 0x4e, 0x50, -+ 0x52, 0x53, 0x55, 0x57, 0x59, 0x5a, -+ 0x5c, 0x5e, 0x60, 0x61, 0x63, 0x65, -+ 0x67, 0x69, 0x6a, 0x6c, 0x6e, 0x70, -+ 0x71, 0x73, 0x75, 0x77, 0x78, 0x7a, -+ 0x7c, 0x7e, 0x80, 0x81, 0x83, 0x85, -+ 0x87, 0x88, 0x8a, 0x8c, 0x8e, 0x90, -+ 0x91, 0x93, 0x95, 0x97, 0x98, 0x9a, -+ 0x9c, 0x9e, 0x9f, 0xa1, 0xa3, 0xa5, -+ 0xa7, 0xa8, 0xaa, 0xac, 0xae, 0xaf, -+ 0xb1, 0xb3, 0xb5, 0xb7, 0xb8, 0xba, -+ 0xbc, 0xbe, 0xbf, 0xc1, 0xc3, 0xc5, -+ 0xc6, 0xc8, 0xca, 0xcc, 0xce, 0xcf, -+ 0xd1, 0xd3, 0xd5, 0xd6, 0xd8, 0xda, -+ 0xdc, 0xde, 0xdf, 0xe1, -+ }; -+ -+const int Cr_g_tab[(MAXJSAMPLE+1) * sizeof(int)] ={ -+ 0x5b6900, 0x5ab22e, 0x59fb5c, 0x59448a, 0x588db8, 0x57d6e6, -+ 0x572014, 0x566942, 0x55b270, 0x54fb9e, 0x5444cc, 0x538dfa, -+ 0x52d728, 0x522056, 0x516984, 0x50b2b2, 0x4ffbe0, 0x4f450e, -+ 0x4e8e3c, 0x4dd76a, 0x4d2098, 0x4c69c6, 0x4bb2f4, 0x4afc22, -+ 0x4a4550, 0x498e7e, 0x48d7ac, 0x4820da, 0x476a08, 0x46b336, -+ 0x45fc64, 0x454592, 0x448ec0, 0x43d7ee, 0x43211c, 0x426a4a, -+ 0x41b378, 0x40fca6, 0x4045d4, 0x3f8f02, 0x3ed830, 0x3e215e, -+ 0x3d6a8c, 0x3cb3ba, 0x3bfce8, 0x3b4616, 0x3a8f44, 0x39d872, -+ 0x3921a0, 0x386ace, 0x37b3fc, 0x36fd2a, 0x364658, 0x358f86, -+ 0x34d8b4, 0x3421e2, 0x336b10, 0x32b43e, 0x31fd6c, 0x31469a, -+ 0x308fc8, 0x2fd8f6, 0x2f2224, 0x2e6b52, 0x2db480, 0x2cfdae, -+ 0x2c46dc, 0x2b900a, 0x2ad938, 0x2a2266, 0x296b94, 0x28b4c2, -+ 0x27fdf0, 0x27471e, 0x26904c, 0x25d97a, 0x2522a8, 0x246bd6, -+ 0x23b504, 0x22fe32, 0x224760, 0x21908e, 0x20d9bc, 0x2022ea, -+ 0x1f6c18, 0x1eb546, 0x1dfe74, 0x1d47a2, 0x1c90d0, 0x1bd9fe, -+ 0x1b232c, 0x1a6c5a, 0x19b588, 0x18feb6, 0x1847e4, 0x179112, -+ 0x16da40, 0x16236e, 0x156c9c, 0x14b5ca, 0x13fef8, 0x134826, -+ 0x129154, 0x11da82, 0x1123b0, 0x106cde, 0x0fb60c, 0x0eff3a, -+ 0x0e4868, 0x0d9196, 0x0cdac4, 0x0c23f2, 0x0b6d20, 0x0ab64e, -+ 0x09ff7c, 0x0948aa, 0x0891d8, 0x07db06, 0x072434, 0x066d62, -+ 0x05b690, 0x04ffbe, 0x0448ec, 0x03921a, 0x02db48, 0x022476, -+ 0x016da4, 0x00b6d2, 0x000000, -0x00b6d2, -0x016da4, -0x022476, -+ -0x02db48, -0x03921a, -0x0448ec, -0x04ffbe, -0x05b690, -0x066d62, -+ -0x072434, -0x07db06, -0x0891d8, -0x0948aa, -0x09ff7c, -0x0ab64e, -+ -0x0b6d20, -0x0c23f2, -0x0cdac4, -0x0d9196, -0x0e4868, -0x0eff3a, -+ -0x0fb60c, -0x106cde, -0x1123b0, -0x11da82, -0x129154, -0x134826, -+ -0x13fef8, -0x14b5ca, -0x156c9c, -0x16236e, -0x16da40, -0x179112, -+ -0x1847e4, -0x18feb6, -0x19b588, -0x1a6c5a, -0x1b232c, -0x1bd9fe, -+ -0x1c90d0, -0x1d47a2, -0x1dfe74, -0x1eb546, -0x1f6c18, -0x2022ea, -+ -0x20d9bc, -0x21908e, -0x224760, -0x22fe32, -0x23b504, -0x246bd6, -+ -0x2522a8, -0x25d97a, -0x26904c, -0x27471e, -0x27fdf0, -0x28b4c2, -+ -0x296b94, -0x2a2266, -0x2ad938, -0x2b900a, -0x2c46dc, -0x2cfdae, -+ -0x2db480, -0x2e6b52, -0x2f2224, -0x2fd8f6, -0x308fc8, -0x31469a, -+ -0x31fd6c, -0x32b43e, -0x336b10, -0x3421e2, -0x34d8b4, -0x358f86, -+ -0x364658, -0x36fd2a, -0x37b3fc, -0x386ace, -0x3921a0, -0x39d872, -+ -0x3a8f44, -0x3b4616, -0x3bfce8, -0x3cb3ba, -0x3d6a8c, -0x3e215e, -+ -0x3ed830, -0x3f8f02, -0x4045d4, -0x40fca6, -0x41b378, -0x426a4a, -+ -0x43211c, -0x43d7ee, -0x448ec0, -0x454592, -0x45fc64, -0x46b336, -+ -0x476a08, -0x4820da, -0x48d7ac, -0x498e7e, -0x4a4550, -0x4afc22, -+ -0x4bb2f4, -0x4c69c6, -0x4d2098, -0x4dd76a, -0x4e8e3c, -0x4f450e, -+ -0x4ffbe0, -0x50b2b2, -0x516984, -0x522056, -0x52d728, -0x538dfa, -+ -0x5444cc, -0x54fb9e, -0x55b270, -0x566942, -0x572014, -0x57d6e6, -+ -0x588db8, -0x59448a, -0x59fb5c, -0x5ab22e, -+ }; -+ -+const int Cb_g_tab[(MAXJSAMPLE+1) * sizeof(int)] ={ -+ 0x2c8d00, 0x2c34e6, 0x2bdccc, 0x2b84b2, 0x2b2c98, 0x2ad47e, -+ 0x2a7c64, 0x2a244a, 0x29cc30, 0x297416, 0x291bfc, 0x28c3e2, -+ 0x286bc8, 0x2813ae, 0x27bb94, 0x27637a, 0x270b60, 0x26b346, -+ 0x265b2c, 0x260312, 0x25aaf8, 0x2552de, 0x24fac4, 0x24a2aa, -+ 0x244a90, 0x23f276, 0x239a5c, 0x234242, 0x22ea28, 0x22920e, -+ 0x2239f4, 0x21e1da, 0x2189c0, 0x2131a6, 0x20d98c, 0x208172, -+ 0x202958, 0x1fd13e, 0x1f7924, 0x1f210a, 0x1ec8f0, 0x1e70d6, -+ 0x1e18bc, 0x1dc0a2, 0x1d6888, 0x1d106e, 0x1cb854, 0x1c603a, -+ 0x1c0820, 0x1bb006, 0x1b57ec, 0x1affd2, 0x1aa7b8, 0x1a4f9e, -+ 0x19f784, 0x199f6a, 0x194750, 0x18ef36, 0x18971c, 0x183f02, -+ 0x17e6e8, 0x178ece, 0x1736b4, 0x16de9a, 0x168680, 0x162e66, -+ 0x15d64c, 0x157e32, 0x152618, 0x14cdfe, 0x1475e4, 0x141dca, -+ 0x13c5b0, 0x136d96, 0x13157c, 0x12bd62, 0x126548, 0x120d2e, -+ 0x11b514, 0x115cfa, 0x1104e0, 0x10acc6, 0x1054ac, 0x0ffc92, -+ 0x0fa478, 0x0f4c5e, 0x0ef444, 0x0e9c2a, 0x0e4410, 0x0debf6, -+ 0x0d93dc, 0x0d3bc2, 0x0ce3a8, 0x0c8b8e, 0x0c3374, 0x0bdb5a, -+ 0x0b8340, 0x0b2b26, 0x0ad30c, 0x0a7af2, 0x0a22d8, 0x09cabe, -+ 0x0972a4, 0x091a8a, 0x08c270, 0x086a56, 0x08123c, 0x07ba22, -+ 0x076208, 0x0709ee, 0x06b1d4, 0x0659ba, 0x0601a0, 0x05a986, -+ 0x05516c, 0x04f952, 0x04a138, 0x04491e, 0x03f104, 0x0398ea, -+ 0x0340d0, 0x02e8b6, 0x02909c, 0x023882, 0x01e068, 0x01884e, -+ 0x013034, 0x00d81a, 0x008000, 0x0027e6, -0x003034, -0x00884e, -+ -0x00e068, -0x013882, -0x01909c, -0x01e8b6, -0x0240d0, -0x0298ea, -+ -0x02f104, -0x03491e, -0x03a138, -0x03f952, -0x04516c, -0x04a986, -+ -0x0501a0, -0x0559ba, -0x05b1d4, -0x0609ee, -0x066208, -0x06ba22, -+ -0x07123c, -0x076a56, -0x07c270, -0x081a8a, -0x0872a4, -0x08cabe, -+ -0x0922d8, -0x097af2, -0x09d30c, -0x0a2b26, -0x0a8340, -0x0adb5a, -+ -0x0b3374, -0x0b8b8e, -0x0be3a8, -0x0c3bc2, -0x0c93dc, -0x0cebf6, -+ -0x0d4410, -0x0d9c2a, -0x0df444, -0x0e4c5e, -0x0ea478, -0x0efc92, -+ -0x0f54ac, -0x0facc6, -0x1004e0, -0x105cfa, -0x10b514, -0x110d2e, -+ -0x116548, -0x11bd62, -0x12157c, -0x126d96, -0x12c5b0, -0x131dca, -+ -0x1375e4, -0x13cdfe, -0x142618, -0x147e32, -0x14d64c, -0x152e66, -+ -0x158680, -0x15de9a, -0x1636b4, -0x168ece, -0x16e6e8, -0x173f02, -+ -0x17971c, -0x17ef36, -0x184750, -0x189f6a, -0x18f784, -0x194f9e, -+ -0x19a7b8, -0x19ffd2, -0x1a57ec, -0x1ab006, -0x1b0820, -0x1b603a, -+ -0x1bb854, -0x1c106e, -0x1c6888, -0x1cc0a2, -0x1d18bc, -0x1d70d6, -+ -0x1dc8f0, -0x1e210a, -0x1e7924, -0x1ed13e, -0x1f2958, -0x1f8172, -+ -0x1fd98c, -0x2031a6, -0x2089c0, -0x20e1da, -0x2139f4, -0x21920e, -+ -0x21ea28, -0x224242, -0x229a5c, -0x22f276, -0x234a90, -0x23a2aa, -+ -0x23fac4, -0x2452de, -0x24aaf8, -0x250312, -0x255b2c, -0x25b346, -+ -0x260b60, -0x26637a, -0x26bb94, -0x2713ae, -0x276bc8, -0x27c3e2, -+ -0x281bfc, -0x287416, -0x28cc30, -0x29244a, -0x297c64, -0x29d47e, -+ -0x2a2c98, -0x2a84b2, -0x2adccc, -0x2b34e6, -+ }; -+ -+ -+/* We assume that right shift corresponds to signed division by 2 with -+ * rounding towards minus infinity. This is correct for typical "arithmetic -+ * shift" instructions that shift in copies of the sign bit. But some -+ * C compilers implement >> with an unsigned shift. For these machines you -+ * must define RIGHT_SHIFT_IS_UNSIGNED. -+ * RIGHT_SHIFT provides a proper signed right shift of an INT32 quantity. -+ * It is only applied with constant shift counts. SHIFT_TEMPS must be -+ * included in the variables of any routine using RIGHT_SHIFT. -+ */ -+ -+#ifdef RIGHT_SHIFT_IS_UNSIGNED -+#define SHIFT_TEMPS INT32 shift_temp; -+#define RIGHT_SHIFT(x,shft) \ -+ ((shift_temp = (x)) < 0 ? \ -+ (shift_temp >> (shft)) | ((~((INT32) 0)) << (32-(shft))) : \ -+ (shift_temp >> (shft))) -+#else -+#define SHIFT_TEMPS -+#define RIGHT_SHIFT(x,shft) ((x) >> (shft)) -+#endif -+ -+ -+METHODDEF(void) -+ycc_rgb_convert_argb (j_decompress_ptr cinfo, -+ JSAMPIMAGE input_buf, JDIMENSION input_row, -+ JSAMPARRAY output_buf, int num_rows) -+{ -+ JDIMENSION num_cols = cinfo->output_width; -+ JSAMPLE * range_limit = cinfo->sample_range_limit; -+ -+ SHIFT_TEMPS -+ -+ /* This is used if we don't have SSE2 */ -+ -+ while (--num_rows >= 0) { -+ JSAMPROW inptr0 = input_buf[0][input_row]; -+ JSAMPROW inptr1 = input_buf[1][input_row]; -+ JSAMPROW inptr2 = input_buf[2][input_row]; -+ input_row++; -+ uint32_t *outptr = (uint32_t *) *output_buf++; -+ for (JDIMENSION col = 0; col < num_cols; col++) { -+ int y = GETJSAMPLE(inptr0[col]); -+ int cb = GETJSAMPLE(inptr1[col]); -+ int cr = GETJSAMPLE(inptr2[col]); -+ JSAMPLE * range_limit_y = range_limit + y; -+ /* Range-limiting is essential due to noise introduced by DCT losses. */ -+ outptr[col] = 0xFF000000 | -+ ( range_limit_y[Cr_r_tab[cr]] << 16 ) | -+ ( range_limit_y[((int) RIGHT_SHIFT(Cb_g_tab[cb] + Cr_g_tab[cr], SCALEBITS))] << 8 ) | -+ ( range_limit_y[Cb_b_tab[cb]] ); -+ } -+ } -+} -+#endif -+ -+ - ///*************** Inverted CMYK -> RGB conversion ************************* - /// Input is (Inverted) CMYK stored as 4 bytes per pixel. - /// Output is RGB stored as 3 bytes per pixel. diff --git a/mail/thunderbird/files/patch-sample-type b/mail/thunderbird/files/patch-sample-type deleted file mode 100644 index cf460a0f84d..00000000000 --- a/mail/thunderbird/files/patch-sample-type +++ /dev/null @@ -1,13 +0,0 @@ -# Let ports handle default sample type - ---- old-configure.in~ -+++ old-configure.in -@@ -5144,7 +5144,7 @@ dnl Use integers over floats for audio o - dnl (regarless of the CPU architecture, because audio - dnl backends for those platforms don't support floats. We also - dnl use integers on ARM with other OS, because it's more efficient. --if test "$OS_TARGET" = "Android" -o "$CPU_ARCH" = "arm"; then -+if test -n "$MOZ_INTEGER_SAMPLES"; then - MOZ_SAMPLE_TYPE_S16=1 - AC_DEFINE(MOZ_SAMPLE_TYPE_S16) - AC_SUBST(MOZ_SAMPLE_TYPE_S16) diff --git a/mail/thunderbird/files/patch-z-bug517422 b/mail/thunderbird/files/patch-z-bug517422 deleted file mode 100644 index 9b041089be3..00000000000 --- a/mail/thunderbird/files/patch-z-bug517422 +++ /dev/null @@ -1,496 +0,0 @@ -# Allow more config/external/ libs built against system-wide version. - -diff --git build/moz.configure/old.configure build/moz.configure/old.configure -index d0fe7accffe6..c46bdd023225 100644 ---- build/moz.configure/old.configure -+++ build/moz.configure/old.configure -@@ -285,7 +285,12 @@ def old_configure_options(*options): - '--with-system-libvpx', - '--with-system-nspr', - '--with-system-nss', -+ '--with-system-ogg', - '--with-system-png', -+ '--with-system-soundtouch', -+ '--with-system-theora', -+ '--with-system-tremor', -+ '--with-system-vorbis', - '--with-system-zlib', - '--with-thumb', - '--with-thumb-interwork', -diff --git config/external/moz.build config/external/moz.build -index 029ff8504795..2c3a40caa1ba 100644 ---- config/external/moz.build -+++ config/external/moz.build -@@ -23,12 +23,21 @@ external_dirs += ['modules/woff2'] - - external_dirs += ['modules/xz-embedded'] - --if CONFIG['MOZ_VORBIS']: -+if not CONFIG['MOZ_SYSTEM_OGG']: -+ external_dirs += ['media/libogg'] -+ -+if CONFIG['MOZ_VORBIS'] and not CONFIG['MOZ_SYSTEM_VORBIS']: - external_dirs += ['media/libvorbis'] - --if CONFIG['MOZ_TREMOR']: -+if CONFIG['MOZ_TREMOR'] and not CONFIG['MOZ_SYSTEM_TREMOR']: - external_dirs += ['media/libtremor'] - -+if not CONFIG['MOZ_SYSTEM_THEORA']: -+ external_dirs += ['media/libtheora'] -+ -+if not CONFIG['MOZ_SYSTEM_SOUNDTOUCH']: -+ external_dirs += ['media/libsoundtouch'] -+ - if CONFIG['MOZ_WEBM_ENCODER']: - external_dirs += ['media/libmkv'] - -@@ -51,11 +60,8 @@ external_dirs += [ - 'media/kiss_fft', - 'media/libcubeb', - 'media/libnestegg', -- 'media/libogg', - 'media/libopus', -- 'media/libtheora', - 'media/libspeex_resampler', -- 'media/libsoundtouch', - 'media/mp4parse-rust', - 'media/psshparser' - ] -diff --git config/system-headers.mozbuild config/system-headers.mozbuild -index 09d3db5ca8c0..c6533b84c470 100644 ---- config/system-headers.mozbuild -+++ config/system-headers.mozbuild -@@ -1325,6 +1325,28 @@ if CONFIG['MOZ_SYSTEM_HARFBUZZ']: - 'harfbuzz/hb.h', - ] - -+if CONFIG['MOZ_SYSTEM_OGG']: -+ system_headers += [ -+ 'ogg/ogg.h', -+ 'ogg/os_types.h', -+ ] -+ -+if CONFIG['MOZ_SYSTEM_THEORA']: -+ system_headers += [ -+ 'theora/theoradec.h', -+ ] -+ -+if CONFIG['MOZ_SYSTEM_VORBIS']: -+ system_headers += [ -+ 'vorbis/codec.h', -+ 'vorbis/vorbisenc.h', -+ ] -+ -+if CONFIG['MOZ_SYSTEM_TREMOR']: -+ system_headers += [ -+ 'tremor/ivorbiscodec.h', -+ ] -+ - if CONFIG['MOZ_SYSTEM_LIBVPX']: - system_headers += [ - 'vpx_mem/vpx_mem.h', -diff --git dom/media/AudioStream.cpp dom/media/AudioStream.cpp -index 93ecda4319af..ff674c64ea07 100644 ---- dom/media/AudioStream.cpp -+++ dom/media/AudioStream.cpp -@@ -121,7 +121,9 @@ AudioStream::AudioStream(DataSource& aSource) - : mMonitor("AudioStream") - , mChannels(0) - , mOutChannels(0) -+#ifndef MOZ_SYSTEM_SOUNDTOUCH - , mTimeStretcher(nullptr) -+#endif - , mDumpFile(nullptr) - , mState(INITIALIZED) - , mDataSource(aSource) -@@ -142,9 +144,11 @@ AudioStream::~AudioStream() - if (mDumpFile) { - fclose(mDumpFile); - } -+#ifndef MOZ_SYSTEM_SOUNDTOUCH - if (mTimeStretcher) { - soundtouch::destroySoundTouchObj(mTimeStretcher); - } -+#endif - #if defined(XP_WIN) - if (XRE_IsContentProcess()) { - audio::AudioNotificationReceiver::Unregister(this); -@@ -168,7 +172,11 @@ nsresult AudioStream::EnsureTimeStretcherInitializedUnlocked() - { - mMonitor.AssertCurrentThreadOwns(); - if (!mTimeStretcher) { -+#ifdef MOZ_SYSTEM_SOUNDTOUCH -+ mTimeStretcher = new soundtouch::SoundTouch(); -+#else - mTimeStretcher = soundtouch::createSoundTouchObj(); -+#endif - mTimeStretcher->setSampleRate(mAudioClock.GetInputRate()); - mTimeStretcher->setChannels(mOutChannels); - mTimeStretcher->setPitch(1.0); -diff --git dom/media/AudioStream.h dom/media/AudioStream.h -index 7dc1f60f95cc..67d402a4117f 100644 ---- dom/media/AudioStream.h -+++ dom/media/AudioStream.h -@@ -15,7 +15,11 @@ - #include "mozilla/TimeStamp.h" - #include "mozilla/UniquePtr.h" - #include "CubebUtils.h" -+#ifdef MOZ_SYSTEM_SOUNDTOUCH -+#include "soundtouch/SoundTouch.h" -+#else - #include "soundtouch/SoundTouchFactory.h" -+#endif - - #if defined(XP_WIN) - #include "mozilla/audio/AudioNotificationReceiver.h" -@@ -297,7 +301,11 @@ private: - uint32_t mChannels; - uint32_t mOutChannels; - AudioClock mAudioClock; -+#ifdef MOZ_SYSTEM_SOUNDTOUCH -+ nsAutoPtr mTimeStretcher; -+#else - soundtouch::SoundTouch* mTimeStretcher; -+#endif - - // Output file for dumping audio - FILE* mDumpFile; -diff --git dom/media/moz.build dom/media/moz.build -index 86b051c58d33..fb6186dce78b 100644 ---- dom/media/moz.build -+++ dom/media/moz.build -@@ -326,6 +326,21 @@ if CONFIG['MOZ_WEBRTC']: - - DEFINES['MOZILLA_INTERNAL_API'] = True - -+if CONFIG['MOZ_SYSTEM_OGG']: -+ CXXFLAGS += CONFIG['MOZ_OGG_CFLAGS'] -+ -+if CONFIG['MOZ_SYSTEM_THEORA']: -+ CXXFLAGS += CONFIG['MOZ_THEORA_CFLAGS'] -+ -+if CONFIG['MOZ_SYSTEM_VORBIS']: -+ CXXFLAGS += CONFIG['MOZ_VORBIS_CFLAGS'] -+ -+if CONFIG['MOZ_SYSTEM_TREMOR']: -+ CXXFLAGS += CONFIG['MOZ_TREMOR_CFLAGS'] -+ -+if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']: -+ CXXFLAGS += CONFIG['MOZ_SOUNDTOUCH_CFLAGS'] -+ - if CONFIG['MOZ_ANDROID_HLS_SUPPORT']: - DEFINES['MOZ_ANDROID_HLS_SUPPORT'] = True - -diff --git dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp -index 078f6ea5ef60..c600db067539 100644 ---- dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp -+++ dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp -@@ -15,9 +15,13 @@ - #include - #endif - -+#ifdef MOZ_SYSTEM_SOUNDTOUCH -+#include "nsXPCOMPrivate.h" // for XUL_DLL -+#else - // We use a known symbol located in lgpllibs to determine its location. - // soundtouch happens to be always included in lgpllibs - #include "soundtouch/SoundTouch.h" -+#endif - - namespace mozilla { - -@@ -64,6 +68,12 @@ FFVPXRuntimeLinker::Init() - - sLinkStatus = LinkStatus_FAILED; - -+#ifdef MOZ_SYSTEM_SOUNDTOUCH -+ // We retrieve the path of the XUL library as this is where mozavcodec and -+ // mozavutil libs are located. -+ char* path = -+ PR_GetLibraryFilePathname(XUL_DLL, (PRFuncPtr)&FFVPXRuntimeLinker::Init); -+#else - // We retrieve the path of the lgpllibs library as this is where mozavcodec - // and mozavutil libs are located. - PathString lgpllibsname = GetLibraryName(nullptr, "lgpllibs"); -@@ -73,6 +83,7 @@ FFVPXRuntimeLinker::Init() - PathString path = - GetLibraryFilePathname(lgpllibsname.get(), - (PRFuncPtr)&soundtouch::SoundTouch::getVersionId); -+#endif - if (path.IsEmpty()) { - return false; - } -diff --git media/libogg/README_MOZILLA media/libogg/README_MOZILLA -index 6213fdc7770c..ada799916a17 100644 ---- media/libogg/README_MOZILLA -+++ media/libogg/README_MOZILLA -@@ -6,3 +6,6 @@ package downloaded from xiph.org and copied using the update.sh script. - The int-types.patch address a bug that config_types.h generated from - Linux platform can't be used on OpenSolaris directly see Mozilla bug - 449754 -+ -+The in-tree copy may be omitted during build by --with-system-ogg. -+Keep version in old-configure.in in sync on updates. -diff --git media/libsoundtouch/README_MOZILLA media/libsoundtouch/README_MOZILLA -index dc0dbe8f6886..ea73b55e3e39 100644 ---- media/libsoundtouch/README_MOZILLA -+++ media/libsoundtouch/README_MOZILLA -@@ -6,3 +6,5 @@ The whole library is not used, only the relevant files are imported in the tree, - using the script `update.sh`. Some changes have been made to the files, using - the patch `moz-libsoundtouch.patch`. We also use a custom soundtouch_config.h. - -+The in-tree copy may be omitted during build by --with-system-soundtouch. -+Keep version in old-configure.in in sync on updates. -diff --git media/libsoundtouch/src/soundtouch_perms.h media/libsoundtouch/src/soundtouch_perms.h -index 0af2fe618311..10973564e7a4 100644 ---- media/libsoundtouch/src/soundtouch_perms.h -+++ media/libsoundtouch/src/soundtouch_perms.h -@@ -12,7 +12,9 @@ - - #pragma GCC visibility push(default) - #include "SoundTouch.h" -+#ifndef MOZ_SYSTEM_SOUNDTOUCH - #include "SoundTouchFactory.h" -+#endif - #pragma GCC visibility pop - - #endif // MOZILLA_SOUNDTOUCH_PERMS_H -diff --git media/libtheora/README_MOZILLA media/libtheora/README_MOZILLA -index d48dbfa6f63d..6f30f250220e 100644 ---- media/libtheora/README_MOZILLA -+++ media/libtheora/README_MOZILLA -@@ -3,3 +3,6 @@ using the update.sh script. The changes made were those applied by update.sh, - the addition/update of Makefile.in files for the Mozilla build system. - - The subversion revision used was r17578. -+ -+The in-tree copy may be omitted during build by --with-system-theora. -+Keep version in old-configure.in in sync on updates. -diff --git media/libtheora/moz.build media/libtheora/moz.build -index c7f85eebff95..aae7b814adb5 100644 ---- media/libtheora/moz.build -+++ media/libtheora/moz.build -@@ -21,6 +21,9 @@ FINAL_LIBRARY = 'gkmedias' - # The encoder is currently not included. - DEFINES['THEORA_DISABLE_ENCODE'] = True - -+if CONFIG['MOZ_SYSTEM_OGG']: -+ CFLAGS += CONFIG['MOZ_OGG_CFLAGS'] -+ - # Suppress warnings in third-party code. - if CONFIG['CC_TYPE'] in ('clang', 'clang-cl', 'gcc'): - CFLAGS += ['-Wno-type-limits'] -diff --git media/libtremor/README_MOZILLA media/libtremor/README_MOZILLA -index ee67b53a05c5..81c971773d55 100644 ---- media/libtremor/README_MOZILLA -+++ media/libtremor/README_MOZILLA -@@ -5,3 +5,6 @@ Makefile.in files for the Mozilla build system. - - The upstream release used was http://svn.xiph.org/trunk/Tremor/ - The subversion revision used was r17547. -+ -+The in-tree copy may be omitted during build by --with-system-tremor. -+Keep version in old-configure.in in sync on updates. -diff --git media/libtremor/moz.build media/libtremor/moz.build -index 83afc8e37c64..71ef159da3d7 100644 ---- media/libtremor/moz.build -+++ media/libtremor/moz.build -@@ -9,3 +9,5 @@ with Files('*'): - - DIRS += ['include/tremor', 'lib'] - -+if CONFIG['MOZ_SYSTEM_OGG']: -+ CFLAGS += CONFIG['MOZ_OGG_CFLAGS'] -diff --git media/libvorbis/README_MOZILLA media/libvorbis/README_MOZILLA -index 1211ac074b33..eb31084aed25 100644 ---- media/libvorbis/README_MOZILLA -+++ media/libvorbis/README_MOZILLA -@@ -8,3 +8,6 @@ from https://git.xiph.org/vorbis.git - - Some files are renamed during the copy to prevent clashes with object - file names with other Mozilla libraries. -+ -+The in-tree copy may be omitted during build by --with-system-vorbis. -+Keep version in old-configure.in in sync on updates. -diff --git media/libvorbis/moz.build media/libvorbis/moz.build -index adf393782cc9..923b76231107 100644 ---- media/libvorbis/moz.build -+++ media/libvorbis/moz.build -@@ -56,3 +56,6 @@ FINAL_LIBRARY = 'gkmedias' - # Suppress warnings in third-party code. - if CONFIG['CC_TYPE'] in ('clang', 'gcc'): - CFLAGS += ['-Wno-uninitialized'] -+ -+if CONFIG['MOZ_SYSTEM_OGG']: -+ CFLAGS += CONFIG['MOZ_OGG_CFLAGS'] -diff --git old-configure.in old-configure.in -index b614eef85c89..85f9099dba4d 100644 ---- old-configure.in -+++ old-configure.in -@@ -2627,6 +2627,111 @@ if test -n "$MOZ_APPLEMEDIA"; then - fi - fi # COMPILE_ENVIRONMENT - -+dnl ======================================================== -+dnl Check for libogg -+dnl ======================================================== -+ -+MOZ_ARG_WITH_BOOL(system-ogg, -+[ --with-system-ogg Use system libogg (located with pkgconfig)], -+MOZ_SYSTEM_OGG=1, -+MOZ_SYSTEM_OGG=) -+ -+if test -n "$MOZ_SYSTEM_OGG"; then -+ PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.3.3) -+ -+ _SAVE_LIBS=$LIBS -+ LIBS="$LIBS $MOZ_OGG_LIBS" -+ AC_CHECK_FUNC(ogg_set_mem_functions, [], -+ [AC_DEFINE(MOZ_OGG_NO_MEM_REPORTING)]) -+ LIBS=$_SAVE_LIBS -+fi -+ -+AC_SUBST(MOZ_SYSTEM_OGG) -+ -+dnl ======================================================== -+dnl Check for libvorbis -+dnl ======================================================== -+ -+MOZ_ARG_WITH_BOOL(system-vorbis, -+[ --with-system-vorbis Use system libvorbis (located with pkgconfig)], -+MOZ_SYSTEM_VORBIS=1, -+MOZ_SYSTEM_VORBIS=) -+ -+if test -n "$MOZ_SYSTEM_VORBIS"; then -+ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.6) -+fi -+ -+AC_SUBST(MOZ_SYSTEM_VORBIS) -+ -+dnl ======================================================== -+dnl Check for integer-only libvorbis aka tremor -+dnl ======================================================== -+ -+MOZ_ARG_WITH_BOOL(system-tremor, -+[ --with-system-tremor Use system libtremor (located with pkgconfig)], -+MOZ_SYSTEM_TREMOR=1, -+MOZ_SYSTEM_TREMOR=) -+ -+if test -n "$MOZ_SYSTEM_TREMOR"; then -+ PKG_CHECK_MODULES(MOZ_TREMOR, vorbisidec >= 1.2.1) -+fi -+ -+AC_SUBST(MOZ_SYSTEM_TREMOR) -+ -+dnl ======================================================== -+dnl Check for libtheora -+dnl ======================================================== -+ -+MOZ_ARG_WITH_BOOL(system-theora, -+[ --with-system-theora Use system libtheora (located with pkgconfig)], -+MOZ_SYSTEM_THEORA=1, -+MOZ_SYSTEM_THEORA=) -+ -+if test -n "$MOZ_SYSTEM_THEORA"; then -+ PKG_CHECK_MODULES(MOZ_THEORA, theora >= 1.2) -+fi -+ -+AC_SUBST(MOZ_SYSTEM_THEORA) -+ -+dnl ======================================================== -+dnl Check for libSoundTouch -+dnl ======================================================== -+ -+MOZ_ARG_WITH_BOOL(system-soundtouch, -+[ --with-system-soundtouch Use system libSoundTouch (located with pkgconfig)], -+MOZ_SYSTEM_SOUNDTOUCH=1, -+MOZ_SYSTEM_SOUNDTOUCH=) -+ -+if test -n "$MOZ_SYSTEM_SOUNDTOUCH"; then -+ PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.9.0) -+ -+ AC_LANG_SAVE -+ AC_LANG_CPLUSPLUS -+ _SAVE_CXXFLAGS=$CXXFLAGS -+ CXXFLAGS="$CXXFLAGS $MOZ_SOUNDTOUCH_CFLAGS" -+ AC_CACHE_CHECK(for soundtouch sample type, -+ ac_cv_soundtouch_sample_type, -+ [AC_TRY_COMPILE([#include -+ #ifndef SOUNDTOUCH_INTEGER_SAMPLES -+ #error soundtouch expects float samples -+ #endif], -+ [], -+ [ac_cv_soundtouch_sample_type=short], -+ [ac_cv_soundtouch_sample_type=float])]) -+ CXXFLAGS=$_SAVE_CXXFLAGS -+ AC_LANG_RESTORE -+ -+ if test \( -n "$MOZ_SAMPLE_TYPE_S16" -a "$ac_cv_soundtouch_sample_type" != short \) \ -+ -o \( -n "$MOZ_SAMPLE_TYPE_FLOAT32" -a "$ac_cv_soundtouch_sample_type" != float \) ; then -+ AC_MSG_ERROR([SoundTouch library is built with incompatible sample type. Either rebuild the library with/without --enable-integer-samples, chase default Mozilla sample type or remove --with-system-soundtouch.]) -+ fi -+fi -+ -+if test -n "$MOZ_SYSTEM_SOUNDTOUCH"; then -+ AC_DEFINE(MOZ_SYSTEM_SOUNDTOUCH) -+fi -+AC_SUBST(MOZ_SYSTEM_SOUNDTOUCH) -+ - dnl system libvpx Support - dnl ======================================================== - MOZ_ARG_WITH_BOOL(system-libvpx, -diff --git toolkit/library/moz.build toolkit/library/moz.build -index 079a575adec3..514d901195de 100644 ---- toolkit/library/moz.build -+++ toolkit/library/moz.build -@@ -240,6 +240,21 @@ if CONFIG['MOZ_SYSTEM_HARFBUZZ']: - if CONFIG['MOZ_SYSTEM_HUNSPELL']: - OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS'] - -+if CONFIG['MOZ_SYSTEM_OGG']: -+ OS_LIBS += CONFIG['MOZ_OGG_LIBS'] -+ -+if CONFIG['MOZ_SYSTEM_THEORA']: -+ OS_LIBS += CONFIG['MOZ_THEORA_LIBS'] -+ -+if CONFIG['MOZ_SYSTEM_VORBIS']: -+ OS_LIBS += CONFIG['MOZ_VORBIS_LIBS'] -+ -+if CONFIG['MOZ_SYSTEM_TREMOR']: -+ OS_LIBS += CONFIG['MOZ_TREMOR_LIBS'] -+ -+if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']: -+ OS_LIBS += CONFIG['MOZ_SOUNDTOUCH_LIBS'] -+ - if CONFIG['MOZ_SYSTEM_LIBEVENT']: - OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS'] - -diff --git xpcom/build/XPCOMInit.cpp xpcom/build/XPCOMInit.cpp -index c083ab4bc4f3..62b917043a2c 100644 ---- xpcom/build/XPCOMInit.cpp -+++ xpcom/build/XPCOMInit.cpp -@@ -132,7 +132,9 @@ extern nsresult nsStringInputStreamConstructor(nsISupports*, REFNSIID, void**); - - #include "mozilla/ipc/GeckoChildProcessHost.h" - -+#ifndef MOZ_OGG_NO_MEM_REPORTING - #include "ogg/ogg.h" -+#endif - #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING) - #if defined(HAVE_STDINT_H) - // mozilla-config.h defines HAVE_STDINT_H, and then it's defined *again* in -@@ -639,11 +641,13 @@ NS_InitXPCOM2(nsIServiceManager** aResult, - // this oddness. - mozilla::SetICUMemoryFunctions(); - -+#ifndef MOZ_OGG_NO_MEM_REPORTING - // Do the same for libogg. - ogg_set_mem_functions(OggReporter::CountingMalloc, - OggReporter::CountingCalloc, - OggReporter::CountingRealloc, - OggReporter::CountingFree); -+#endif - - #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING) - // And for VPX. diff --git a/math/ignition-math/Makefile b/math/ignition-math/Makefile index 745500f0ddb..3818e6656fa 100644 --- a/math/ignition-math/Makefile +++ b/math/ignition-math/Makefile @@ -16,12 +16,20 @@ BUILD_DEPENDS= ignition-cmake==2:devel/ignition-cmake USES= cmake:outsource eigen:3 USE_LDCONFIG= yes +CMAKE_OFF= BUILD_TESTING + BB_ACCOUNT= ignitionrobotics BB_PROJECT= ign-math BB_COMMIT= 46f3dd24499c WRKSRC= ${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT} -PLIST_SUB+= IGN_VER=${DISTVERSION:R:R} +PLIST_SUB+= MATH_IGN_VER=math${DISTVERSION:R:R} + +do-test: # one test is known to fail: https://bitbucket.org/ignitionrobotics/ign-math/issues/98 + @cd ${BUILD_WRKSRC} && \ + ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING=ON ${CMAKE_SOURCE_PATH} && \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test .include diff --git a/math/ignition-math/pkg-plist b/math/ignition-math/pkg-plist index 5f19f4ddc94..be48061494d 100644 --- a/math/ignition-math/pkg-plist +++ b/math/ignition-math/pkg-plist @@ -1,66 +1,66 @@ -include/ignition/math%%IGN_VER%%/ignition/math.hh -include/ignition/math%%IGN_VER%%/ignition/math/Angle.hh -include/ignition/math%%IGN_VER%%/ignition/math/AxisAlignedBox.hh -include/ignition/math%%IGN_VER%%/ignition/math/Box.hh -include/ignition/math%%IGN_VER%%/ignition/math/Color.hh -include/ignition/math%%IGN_VER%%/ignition/math/Cylinder.hh -include/ignition/math%%IGN_VER%%/ignition/math/Export.hh -include/ignition/math%%IGN_VER%%/ignition/math/Filter.hh -include/ignition/math%%IGN_VER%%/ignition/math/Frustum.hh -include/ignition/math%%IGN_VER%%/ignition/math/Helpers.hh -include/ignition/math%%IGN_VER%%/ignition/math/Inertial.hh -include/ignition/math%%IGN_VER%%/ignition/math/Kmeans.hh -include/ignition/math%%IGN_VER%%/ignition/math/Line2.hh -include/ignition/math%%IGN_VER%%/ignition/math/Line3.hh -include/ignition/math%%IGN_VER%%/ignition/math/MassMatrix3.hh -include/ignition/math%%IGN_VER%%/ignition/math/Material.hh -include/ignition/math%%IGN_VER%%/ignition/math/MaterialType.hh -include/ignition/math%%IGN_VER%%/ignition/math/Matrix3.hh -include/ignition/math%%IGN_VER%%/ignition/math/Matrix4.hh -include/ignition/math%%IGN_VER%%/ignition/math/MovingWindowFilter.hh -include/ignition/math%%IGN_VER%%/ignition/math/OrientedBox.hh -include/ignition/math%%IGN_VER%%/ignition/math/PID.hh -include/ignition/math%%IGN_VER%%/ignition/math/Plane.hh -include/ignition/math%%IGN_VER%%/ignition/math/Pose3.hh -include/ignition/math%%IGN_VER%%/ignition/math/Quaternion.hh -include/ignition/math%%IGN_VER%%/ignition/math/Rand.hh -include/ignition/math%%IGN_VER%%/ignition/math/RotationSpline.hh -include/ignition/math%%IGN_VER%%/ignition/math/SemanticVersion.hh -include/ignition/math%%IGN_VER%%/ignition/math/SignalStats.hh -include/ignition/math%%IGN_VER%%/ignition/math/Sphere.hh -include/ignition/math%%IGN_VER%%/ignition/math/SphericalCoordinates.hh -include/ignition/math%%IGN_VER%%/ignition/math/Spline.hh -include/ignition/math%%IGN_VER%%/ignition/math/Stopwatch.hh -include/ignition/math%%IGN_VER%%/ignition/math/Temperature.hh -include/ignition/math%%IGN_VER%%/ignition/math/Triangle.hh -include/ignition/math%%IGN_VER%%/ignition/math/Triangle3.hh -include/ignition/math%%IGN_VER%%/ignition/math/Vector2.hh -include/ignition/math%%IGN_VER%%/ignition/math/Vector3.hh -include/ignition/math%%IGN_VER%%/ignition/math/Vector3Stats.hh -include/ignition/math%%IGN_VER%%/ignition/math/Vector4.hh -include/ignition/math%%IGN_VER%%/ignition/math/config.hh -include/ignition/math%%IGN_VER%%/ignition/math/detail/Box.hh -include/ignition/math%%IGN_VER%%/ignition/math/detail/Cylinder.hh -include/ignition/math%%IGN_VER%%/ignition/math/detail/Export.hh -include/ignition/math%%IGN_VER%%/ignition/math/detail/Sphere.hh -include/ignition/math%%IGN_VER%%/ignition/math/eigen3.hh -include/ignition/math%%IGN_VER%%/ignition/math/eigen3/Conversions.hh -include/ignition/math%%IGN_VER%%/ignition/math/graph/Edge.hh -include/ignition/math%%IGN_VER%%/ignition/math/graph/Graph.hh -include/ignition/math%%IGN_VER%%/ignition/math/graph/GraphAlgorithms.hh -include/ignition/math%%IGN_VER%%/ignition/math/graph/Vertex.hh -lib/cmake/ignition-math%%IGN_VER%%-all/ignition-math%%IGN_VER%%-all-config-version.cmake -lib/cmake/ignition-math%%IGN_VER%%-all/ignition-math%%IGN_VER%%-all-config.cmake -lib/cmake/ignition-math%%IGN_VER%%-all/ignition-math%%IGN_VER%%-all-targets.cmake -lib/cmake/ignition-math%%IGN_VER%%-eigen3/ignition-math%%IGN_VER%%-eigen3-config-version.cmake -lib/cmake/ignition-math%%IGN_VER%%-eigen3/ignition-math%%IGN_VER%%-eigen3-config.cmake -lib/cmake/ignition-math%%IGN_VER%%-eigen3/ignition-math%%IGN_VER%%-eigen3-targets.cmake -lib/cmake/ignition-math%%IGN_VER%%/ignition-math%%IGN_VER%%-config-version.cmake -lib/cmake/ignition-math%%IGN_VER%%/ignition-math%%IGN_VER%%-config.cmake -lib/cmake/ignition-math%%IGN_VER%%/ignition-math%%IGN_VER%%-targets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/ignition-math%%IGN_VER%%/ignition-math%%IGN_VER%%-targets.cmake -lib/libignition-math%%IGN_VER%%.so -lib/libignition-math%%IGN_VER%%.so.6 -lib/libignition-math%%IGN_VER%%.so.6.0.0~pre4 -libdata/pkgconfig/ignition-math%%IGN_VER%%-eigen3.pc -libdata/pkgconfig/ignition-math%%IGN_VER%%.pc +include/ignition/%%MATH_IGN_VER%%/ignition/math.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/Angle.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/AxisAlignedBox.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/Box.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/Color.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/Cylinder.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/Export.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/Filter.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/Frustum.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/Helpers.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/Inertial.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/Kmeans.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/Line2.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/Line3.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/MassMatrix3.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/Material.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/MaterialType.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/Matrix3.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/Matrix4.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/MovingWindowFilter.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/OrientedBox.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/PID.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/Plane.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/Pose3.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/Quaternion.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/Rand.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/RotationSpline.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/SemanticVersion.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/SignalStats.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/Sphere.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/SphericalCoordinates.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/Spline.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/Stopwatch.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/Temperature.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/Triangle.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/Triangle3.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/Vector2.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/Vector3.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/Vector3Stats.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/Vector4.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/config.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/detail/Box.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/detail/Cylinder.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/detail/Export.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/detail/Sphere.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/eigen3.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/eigen3/Conversions.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/graph/Edge.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/graph/Graph.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/graph/GraphAlgorithms.hh +include/ignition/%%MATH_IGN_VER%%/ignition/math/graph/Vertex.hh +lib/cmake/ignition-%%MATH_IGN_VER%%-all/ignition-%%MATH_IGN_VER%%-all-config-version.cmake +lib/cmake/ignition-%%MATH_IGN_VER%%-all/ignition-%%MATH_IGN_VER%%-all-config.cmake +lib/cmake/ignition-%%MATH_IGN_VER%%-all/ignition-%%MATH_IGN_VER%%-all-targets.cmake +lib/cmake/ignition-%%MATH_IGN_VER%%-eigen3/ignition-%%MATH_IGN_VER%%-eigen3-config-version.cmake +lib/cmake/ignition-%%MATH_IGN_VER%%-eigen3/ignition-%%MATH_IGN_VER%%-eigen3-config.cmake +lib/cmake/ignition-%%MATH_IGN_VER%%-eigen3/ignition-%%MATH_IGN_VER%%-eigen3-targets.cmake +lib/cmake/ignition-%%MATH_IGN_VER%%/ignition-%%MATH_IGN_VER%%-config-version.cmake +lib/cmake/ignition-%%MATH_IGN_VER%%/ignition-%%MATH_IGN_VER%%-config.cmake +lib/cmake/ignition-%%MATH_IGN_VER%%/ignition-%%MATH_IGN_VER%%-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/ignition-%%MATH_IGN_VER%%/ignition-%%MATH_IGN_VER%%-targets.cmake +lib/libignition-%%MATH_IGN_VER%%.so +lib/libignition-%%MATH_IGN_VER%%.so.6 +lib/libignition-%%MATH_IGN_VER%%.so.6.0.0~pre4 +libdata/pkgconfig/ignition-%%MATH_IGN_VER%%-eigen3.pc +libdata/pkgconfig/ignition-%%MATH_IGN_VER%%.pc diff --git a/math/ipopt/Makefile b/math/ipopt/Makefile index c090c22221a..396beed5ac7 100644 --- a/math/ipopt/Makefile +++ b/math/ipopt/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Ipopt -DISTVERSION= 3.12.11 +DISTVERSION= 3.12.12 CATEGORIES= math MASTER_SITES= http://www.coin-or.org/download/source/Ipopt/ \ http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/OLD/:metis \ diff --git a/math/ipopt/distinfo b/math/ipopt/distinfo index fd9bcb20083..27dc6252be8 100644 --- a/math/ipopt/distinfo +++ b/math/ipopt/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1542591902 -SHA256 (Ipopt-3.12.11.tgz) = cbfc8a37978fdbaeed73b5b2d93b92b7c8b5b615ece02d4646e1556b0a7b382a -SIZE (Ipopt-3.12.11.tgz) = 4525616 +TIMESTAMP = 1542749999 +SHA256 (Ipopt-3.12.12.tgz) = 7baeb713ef8d1999bed397b938e9654b38ad536406634384455372dd7e4ed61f +SIZE (Ipopt-3.12.12.tgz) = 4530034 SHA256 (metis-4.0.3.tar.gz) = 5efa35de80703c1b2c4d0de080fafbcf4e0d363a21149a1ad2f96e0144841a55 SIZE (metis-4.0.3.tar.gz) = 522624 SHA256 (MUMPS_4.10.0.tar.gz) = d0f86f91a74c51a17a2ff1be9c9cee2338976f13a6d00896ba5b43a5ca05d933 diff --git a/math/ipopt/pkg-plist b/math/ipopt/pkg-plist index a5f23123ce5..1898920f402 100644 --- a/math/ipopt/pkg-plist +++ b/math/ipopt/pkg-plist @@ -78,13 +78,13 @@ include/coin/ThirdParty/rename.h include/coin/ThirdParty/struct.h lib/libcoinmetis.so lib/libcoinmetis.so.1 -lib/libcoinmetis.so.1.3.5 +lib/libcoinmetis.so.1.3.6 lib/libcoinmumps.so lib/libcoinmumps.so.1 -lib/libcoinmumps.so.1.6.0 +lib/libcoinmumps.so.1.6.1 lib/libipopt.so lib/libipopt.so.1 -lib/libipopt.so.1.10.11 +lib/libipopt.so.1.10.12 libdata/pkgconfig/coinmetis.pc libdata/pkgconfig/coinmumps.pc libdata/pkgconfig/ipopt.pc diff --git a/math/mkl-dnn/Makefile b/math/mkl-dnn/Makefile index ec9de701e61..659146abd71 100644 --- a/math/mkl-dnn/Makefile +++ b/math/mkl-dnn/Makefile @@ -2,7 +2,7 @@ PORTNAME= mkl-dnn DISTVERSIONPREFIX= v -DISTVERSION= 0.16 +DISTVERSION= 0.17 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org @@ -26,9 +26,20 @@ PLIST_FILES= include/mkldnn.h \ include/mkldnn_types.h \ lib/libmkldnn.so \ lib/libmkldnn.so.0 \ - lib/libmkldnn.so.0.16.0 + lib/libmkldnn.so.${DISTVERSION}.0 -do-test: +OPTIONS_DEFINE= OPENMP + +OPENMP_CMAKE_BOOL= USE_OPENMP +OPENMP_LIB_DEPENDS= libomp.so:devel/openmp + +# use clang from ports because cmake can't find OpenMP with base clang, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=223678 +BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} +CPP= clang-cpp${LLVM_DEFAULT} +CC= clang${LLVM_DEFAULT} +CXX= clang++${LLVM_DEFAULT} + +do-test: # some tests are known to fail: https://github.com/intel/mkl-dnn/issues/350 @${REINPLACE_CMD} 's| /bin/bash | ${LOCALBASE}/bin/bash |' ${WRKSRC}/tests/CMakeLists.txt @cd ${BUILD_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTS=ON ${CMAKE_SOURCE_PATH} && \ diff --git a/math/mkl-dnn/distinfo b/math/mkl-dnn/distinfo index 658c2ebd68f..9100765f57b 100644 --- a/math/mkl-dnn/distinfo +++ b/math/mkl-dnn/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1536106132 -SHA256 (intel-mkl-dnn-v0.16_GH0.tar.gz) = 7557f820d6801dbe7741627199c0165fe9e651245b9c1c744d615f576da1098a -SIZE (intel-mkl-dnn-v0.16_GH0.tar.gz) = 1339496 +TIMESTAMP = 1542731420 +SHA256 (intel-mkl-dnn-v0.17_GH0.tar.gz) = 3473da3b486934da169895a7efd6421482d274601c0aed3505b127971f233a07 +SIZE (intel-mkl-dnn-v0.17_GH0.tar.gz) = 1413454 diff --git a/math/mkl-dnn/files/patch-CMakeLists.txt b/math/mkl-dnn/files/patch-CMakeLists.txt index e8b65171c6d..b766518115c 100644 --- a/math/mkl-dnn/files/patch-CMakeLists.txt +++ b/math/mkl-dnn/files/patch-CMakeLists.txt @@ -1,6 +1,17 @@ ---- CMakeLists.txt.orig 2018-09-05 00:11:53 UTC +--- CMakeLists.txt.orig 2018-11-17 00:02:10 UTC +++ CMakeLists.txt -@@ -69,7 +69,10 @@ enable_testing() +@@ -66,7 +66,9 @@ set(CMAKE_TEST_CCXX_FLAGS) # TESTS + + include("cmake/utils.cmake") + include("cmake/options.cmake") +-include("cmake/OpenMP.cmake") ++if (USE_OPENMP) ++ include("cmake/OpenMP.cmake") ++endif() + include("cmake/TBB.cmake") + include("cmake/platform.cmake") + include("cmake/SDL.cmake") +@@ -79,7 +81,10 @@ enable_testing() include_directories(include) add_subdirectory(src) diff --git a/math/octave/Makefile b/math/octave/Makefile index b17d3ce82b1..a56f42a371b 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -3,7 +3,7 @@ PORTNAME= octave PORTVERSION= ${OCTAVE_VERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= math java MASTER_SITES= GNU diff --git a/math/octomap/Makefile b/math/octomap/Makefile index 195abf39474..0c65fd59481 100644 --- a/math/octomap/Makefile +++ b/math/octomap/Makefile @@ -2,8 +2,7 @@ PORTNAME= octomap DISTVERSIONPREFIX= v -DISTVERSION= v1.6.5-158 -DISTVERSIONSUFFIX= -g23cb13f +DISTVERSION= 1.9.0 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org diff --git a/math/octomap/distinfo b/math/octomap/distinfo index a5b37a93a86..5ff98f2db94 100644 --- a/math/octomap/distinfo +++ b/math/octomap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1542694534 -SHA256 (OctoMap-octomap-vv1.6.5-158-g23cb13f_GH0.tar.gz) = ff6f654b492b672b1a7ec39ccba4e29e1bdf215c318e388a22a3c78ab2fa34c7 -SIZE (OctoMap-octomap-vv1.6.5-158-g23cb13f_GH0.tar.gz) = 1682523 +TIMESTAMP = 1542791562 +SHA256 (OctoMap-octomap-v1.9.0_GH0.tar.gz) = 5f81c9a8cbc9526b2e725251cd3a829e5222a28201b394314002146d8b9214dd +SIZE (OctoMap-octomap-v1.9.0_GH0.tar.gz) = 1682421 diff --git a/math/octomap/files/patch-octomap_src_CMakeLists.txt b/math/octomap/files/patch-octomap_src_CMakeLists.txt index c28fe82274d..96d382dd341 100644 --- a/math/octomap/files/patch-octomap_src_CMakeLists.txt +++ b/math/octomap/files/patch-octomap_src_CMakeLists.txt @@ -1,19 +1,17 @@ ---- octomap/src/CMakeLists.txt.orig 2018-11-20 06:33:58 UTC +--- octomap/src/CMakeLists.txt.orig 2017-04-28 19:49:53 UTC +++ octomap/src/CMakeLists.txt -@@ -16,9 +16,9 @@ set_target_properties( octomap PROPERTIE +@@ -16,8 +16,8 @@ set_target_properties( octomap PROPERTIE VERSION ${OCTOMAP_VERSION} SOVERSION ${OCTOMAP_SOVERSION} ) -ADD_LIBRARY( octomap-static STATIC ${octomap_SRCS}) -SET_TARGET_PROPERTIES(octomap-static PROPERTIES OUTPUT_NAME "octomap") --add_dependencies(octomap-static octomath-static) +#ADD_LIBRARY( octomap-static STATIC ${octomap_SRCS}) +#SET_TARGET_PROPERTIES(octomap-static PROPERTIES OUTPUT_NAME "octomap") -+#add_dependencies(octomap-static octomath-static) TARGET_LINK_LIBRARIES(octomap octomath) -@@ -26,7 +26,7 @@ if(NOT EXISTS "${CMAKE_LIBRARY_OUTPUT_DI +@@ -25,7 +25,7 @@ if(NOT EXISTS "${CMAKE_LIBRARY_OUTPUT_DI file(MAKE_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap") endif() @@ -22,7 +20,7 @@ APPEND FILE "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap/octomap-targets.cmake") ADD_SUBDIRECTORY( testing ) -@@ -67,7 +67,7 @@ TARGET_LINK_LIBRARIES(intersection_examp +@@ -66,7 +66,7 @@ TARGET_LINK_LIBRARIES(intersection_examp ADD_EXECUTABLE(octree2pointcloud octree2pointcloud.cpp) TARGET_LINK_LIBRARIES(octree2pointcloud octomap) diff --git a/math/py-pyFFTW/Makefile b/math/py-pyFFTW/Makefile index caf1e634fa8..8b6e3b7ae34 100644 --- a/math/py-pyFFTW/Makefile +++ b/math/py-pyFFTW/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pyFFTW -DISTVERSION= 0.10.4 +DISTVERSION= 0.11.1 CATEGORIES= math python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/math/py-pyFFTW/distinfo b/math/py-pyFFTW/distinfo index a6a8c146f11..db133430eb6 100644 --- a/math/py-pyFFTW/distinfo +++ b/math/py-pyFFTW/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1529290455 -SHA256 (pyFFTW-0.10.4.tar.gz) = 739b436b7c0aeddf99a48749380260364d2dc027cf1d5f63dafb5f50068ede1a -SIZE (pyFFTW-0.10.4.tar.gz) = 365496 +TIMESTAMP = 1542734537 +SHA256 (pyFFTW-0.11.1.tar.gz) = 05ea28dede4c3aaaf5c66f56eb0f71849d0d50f5bc0f53ca0ffa69534af14926 +SIZE (pyFFTW-0.11.1.tar.gz) = 131992 diff --git a/math/py-pyFFTW/files/patch-setup.py b/math/py-pyFFTW/files/patch-setup.py deleted file mode 100644 index af46cfc1618..00000000000 --- a/math/py-pyFFTW/files/patch-setup.py +++ /dev/null @@ -1,13 +0,0 @@ ---- setup.py.orig 2016-06-06 16:40:50 UTC -+++ setup.py -@@ -121,8 +121,8 @@ def get_libraries(): - libraries = ['libfftw3-3', 'libfftw3f-3', 'libfftw3l-3'] - - else: -- libraries = ['fftw3', 'fftw3f', 'fftw3l', 'fftw3_threads', -- 'fftw3f_threads', 'fftw3l_threads'] -+ libraries = ['fftw3', 'fftw3f', 'fftw3_threads', -+ 'fftw3f_threads'] - - return libraries - diff --git a/misc/Makefile b/misc/Makefile index 9faa710386f..3383cc95bfc 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -182,6 +182,7 @@ SUBDIR += histring SUBDIR += hotkeys SUBDIR += hulgalugha + SUBDIR += ignition-fuel-tools SUBDIR += imerge SUBDIR += img2xterm SUBDIR += ini_file_manager @@ -493,6 +494,7 @@ SUBDIR += rubygem-vpim SUBDIR += rump SUBDIR += saaghar + SUBDIR += sdformat SUBDIR += seabios SUBDIR += sent SUBDIR += seq2 diff --git a/misc/ignition-fuel-tools/Makefile b/misc/ignition-fuel-tools/Makefile new file mode 100644 index 00000000000..f9d3630f621 --- /dev/null +++ b/misc/ignition-fuel-tools/Makefile @@ -0,0 +1,41 @@ +# $FreeBSD$ + +PORTNAME= ignition-fuel-tools +DISTVERSION= 1.2.0 +CATEGORIES= misc +MASTER_SITES= https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/ + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Classes and tools for interacting with Ignition Fuel + +LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/COPYING + +BUILD_DEPENDS= ignition-cmake==2:devel/ignition-cmake +LIB_DEPENDS= libcurl.so:ftp/curl \ + libignition-common3.so:devel/ignition-common \ + libjsoncpp.so:devel/jsoncpp \ + libuuid.so:misc/e2fsprogs-libuuid \ + libyaml.so:textproc/libyaml \ + libzip.so:archivers/libzip + +USES= cmake:outsource compiler:c++17-lang pkgconfig +USE_LDCONFIG= yes + +CMAKE_OFF= BUILD_TESTING + +BB_ACCOUNT= ignitionrobotics +BB_PROJECT= ign-fuel-tools +BB_COMMIT= 0ffbf3a2c836 + +WRKSRC= ${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT} + +PLIST_SUB+= FUEL_TOOLS_IGN_VER=fuel_tools${DISTVERSION:R:R} + +do-test: # 4 tests are known to fail: https://bitbucket.org/ignitionrobotics/ign-fuel-tools/issues/48/4-unit-tests-fail-unit_fuelclient_test + @cd ${BUILD_WRKSRC} && \ + ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING=ON ${CMAKE_SOURCE_PATH} && \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test + +.include diff --git a/misc/ignition-fuel-tools/distinfo b/misc/ignition-fuel-tools/distinfo new file mode 100644 index 00000000000..35010c100c1 --- /dev/null +++ b/misc/ignition-fuel-tools/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1542743820 +SHA256 (ignition-fuel-tools-1.2.0.tar.gz) = 9b423a23112c4f7014830fdedb8060b6ca7417f5f230c9bdec534cb173b8ee49 +SIZE (ignition-fuel-tools-1.2.0.tar.gz) = 401253 diff --git a/misc/ignition-fuel-tools/files/patch-CMakeLists.txt b/misc/ignition-fuel-tools/files/patch-CMakeLists.txt new file mode 100644 index 00000000000..9014a5fa120 --- /dev/null +++ b/misc/ignition-fuel-tools/files/patch-CMakeLists.txt @@ -0,0 +1,22 @@ +--- CMakeLists.txt.orig 2018-05-30 22:18:39 UTC ++++ CMakeLists.txt +@@ -9,7 +9,7 @@ project(ignition-fuel_tools1 VERSION 1.2 + # Find ignition-cmake + #============================================================================ + # If you get an error at this line, you need to install ignition-cmake +-find_package(ignition-cmake0 REQUIRED) ++find_package(ignition-cmake2 REQUIRED) + + #============================================================================ + # Configure the project +@@ -44,8 +44,8 @@ ign_find_package(ZIP REQUIRED PRIVATE) + + #-------------------------------------- + # Find ignition-common +-set(IGN_COMMON_MAJOR_VER 1) +-ign_find_package(ignition-common${IGN_COMMON_MAJOR_VER} VERSION 1.1.0 REQUIRED PRIVATE) ++set(IGN_COMMON_MAJOR_VER 3) ++ign_find_package(ignition-common${IGN_COMMON_MAJOR_VER} REQUIRED PRIVATE) + + #-------------------------------------- + # Find ignition-tools diff --git a/misc/ignition-fuel-tools/files/patch-src_CMakeLists.txt b/misc/ignition-fuel-tools/files/patch-src_CMakeLists.txt new file mode 100644 index 00000000000..bb88454abe5 --- /dev/null +++ b/misc/ignition-fuel-tools/files/patch-src_CMakeLists.txt @@ -0,0 +1,11 @@ +--- src/CMakeLists.txt.orig 2018-11-20 20:11:32 UTC ++++ src/CMakeLists.txt +@@ -61,7 +61,7 @@ ign_install_library() + # Build the unit tests. + ign_build_tests(TYPE UNIT + SOURCES ${gtest_sources} +- LIB_DEPS ignition-common1::ignition-common1 ++ LIB_DEPS ignition-common3::ignition-common3 + ) + + # Command line support. diff --git a/misc/ignition-fuel-tools/files/patch-test_integration_CMakeLists.txt b/misc/ignition-fuel-tools/files/patch-test_integration_CMakeLists.txt new file mode 100644 index 00000000000..b3803808a8f --- /dev/null +++ b/misc/ignition-fuel-tools/files/patch-test_integration_CMakeLists.txt @@ -0,0 +1,9 @@ +--- test/integration/CMakeLists.txt.orig 2018-11-20 20:12:00 UTC ++++ test/integration/CMakeLists.txt +@@ -9,5 +9,5 @@ link_directories(${PROJECT_BINARY_DIR}/t + + ign_build_tests(TYPE INTEGRATION + SOURCES ${tests} +- LIB_DEPS ignition-common1::ignition-common1 ++ LIB_DEPS ignition-common3::ignition-common3 + ) diff --git a/misc/ignition-fuel-tools/pkg-descr b/misc/ignition-fuel-tools/pkg-descr new file mode 100644 index 00000000000..fb8090d790f --- /dev/null +++ b/misc/ignition-fuel-tools/pkg-descr @@ -0,0 +1,4 @@ +Ignition Fuel Tools is composed by a client library and command line tools for +interacting with Ignition Fuel servers. + +WWW: https://ignitionrobotics.org/home diff --git a/misc/ignition-fuel-tools/pkg-plist b/misc/ignition-fuel-tools/pkg-plist new file mode 100644 index 00000000000..9b3186736d2 --- /dev/null +++ b/misc/ignition-fuel-tools/pkg-plist @@ -0,0 +1,33 @@ +include/ignition/%%FUEL_TOOLS_IGN_VER%%/ignition/fuel_tools.hh +include/ignition/%%FUEL_TOOLS_IGN_VER%%/ignition/fuel_tools/ClientConfig.hh +include/ignition/%%FUEL_TOOLS_IGN_VER%%/ignition/fuel_tools/Export.hh +include/ignition/%%FUEL_TOOLS_IGN_VER%%/ignition/fuel_tools/FuelClient.hh +include/ignition/%%FUEL_TOOLS_IGN_VER%%/ignition/fuel_tools/Helpers.hh +include/ignition/%%FUEL_TOOLS_IGN_VER%%/ignition/fuel_tools/JSONParser.hh +include/ignition/%%FUEL_TOOLS_IGN_VER%%/ignition/fuel_tools/LocalCache.hh +include/ignition/%%FUEL_TOOLS_IGN_VER%%/ignition/fuel_tools/Model.hh +include/ignition/%%FUEL_TOOLS_IGN_VER%%/ignition/fuel_tools/ModelIdentifier.hh +include/ignition/%%FUEL_TOOLS_IGN_VER%%/ignition/fuel_tools/ModelIter.hh +include/ignition/%%FUEL_TOOLS_IGN_VER%%/ignition/fuel_tools/ModelIterPrivate.hh +include/ignition/%%FUEL_TOOLS_IGN_VER%%/ignition/fuel_tools/ModelPrivate.hh +include/ignition/%%FUEL_TOOLS_IGN_VER%%/ignition/fuel_tools/REST.hh +include/ignition/%%FUEL_TOOLS_IGN_VER%%/ignition/fuel_tools/Result.hh +include/ignition/%%FUEL_TOOLS_IGN_VER%%/ignition/fuel_tools/Zip.hh +include/ignition/%%FUEL_TOOLS_IGN_VER%%/ignition/fuel_tools/config.hh +include/ignition/%%FUEL_TOOLS_IGN_VER%%/ignition/fuel_tools/detail/Export.hh +include/ignition/%%FUEL_TOOLS_IGN_VER%%/ignition/fuel_tools/ign.hh +lib/cmake/ignition-%%FUEL_TOOLS_IGN_VER%%-all/ignition-%%FUEL_TOOLS_IGN_VER%%-all-config-version.cmake +lib/cmake/ignition-%%FUEL_TOOLS_IGN_VER%%-all/ignition-%%FUEL_TOOLS_IGN_VER%%-all-config.cmake +lib/cmake/ignition-%%FUEL_TOOLS_IGN_VER%%-all/ignition-%%FUEL_TOOLS_IGN_VER%%-all-targets.cmake +lib/cmake/ignition-%%FUEL_TOOLS_IGN_VER%%/ignition-%%FUEL_TOOLS_IGN_VER%%-config-version.cmake +lib/cmake/ignition-%%FUEL_TOOLS_IGN_VER%%/ignition-%%FUEL_TOOLS_IGN_VER%%-config.cmake +lib/cmake/ignition-%%FUEL_TOOLS_IGN_VER%%/ignition-%%FUEL_TOOLS_IGN_VER%%-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/ignition-%%FUEL_TOOLS_IGN_VER%%/ignition-%%FUEL_TOOLS_IGN_VER%%-targets.cmake +lib/libignition-%%FUEL_TOOLS_IGN_VER%%.so +lib/libignition-%%FUEL_TOOLS_IGN_VER%%.so.1 +lib/libignition-%%FUEL_TOOLS_IGN_VER%%.so.1.2.0 +lib/ruby/ignition/cmdfuel1.rb +libdata/pkgconfig/ignition-%%FUEL_TOOLS_IGN_VER%%.pc +share/ignition/fuel1.yaml +share/ignition/fuel_tools/config.yaml +share/ignition/%%FUEL_TOOLS_IGN_VER%%/config.yaml diff --git a/misc/sdformat/Makefile b/misc/sdformat/Makefile new file mode 100644 index 00000000000..336c9e54ab8 --- /dev/null +++ b/misc/sdformat/Makefile @@ -0,0 +1,40 @@ +# $FreeBSD$ + +PORTNAME= sdformat +DISTVERSION= 8.0.0 +CATEGORIES= misc +MASTER_SITES= https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/ + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Simulation Description Format (SDF) parser and description files + +LICENSE= APACHE20 + +BUILD_DEPENDS= ignition-cmake==2:devel/ignition-cmake \ + ignition-tools>0:devel/ignition-tools +LIB_DEPENDS= libignition-math6.so:math/ignition-math \ + libconsole_bridge.so:misc/console-bridge \ + libtinyxml2.so:textproc/tinyxml2 \ + liburdfdom_world.so:misc/urdfdom +RUN_DEPENDS= ignition-tools>0:devel/ignition-tools + +USES= cmake:outsource compiler:c++17-lang pkgconfig +USE_LDCONFIG= yes + +CMAKE_OFF= BUILD_TESTING + +BB_ACCOUNT= osrf +BB_PROJECT= ${PORTNAME} +BB_COMMIT= f555f9a69f8f + +WRKSRC= ${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT} + +PLIST_SUB+= INCSUBDIR=${PORTNAME}-${DISTVERSION:R} + +do-test: + @cd ${BUILD_WRKSRC} && \ + ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON ${CMAKE_SOURCE_PATH} && \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test + +.include diff --git a/misc/sdformat/distinfo b/misc/sdformat/distinfo new file mode 100644 index 00000000000..878b3cd9201 --- /dev/null +++ b/misc/sdformat/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1542759199 +SHA256 (sdformat-8.0.0.tar.gz) = 0d06d7da98bcfd33797affcae6407f507216903d4f6623eae16e0d241c84b53b +SIZE (sdformat-8.0.0.tar.gz) = 687727 diff --git a/misc/sdformat/files/patch-CMakeLists.txt b/misc/sdformat/files/patch-CMakeLists.txt new file mode 100644 index 00000000000..bd104cff46d --- /dev/null +++ b/misc/sdformat/files/patch-CMakeLists.txt @@ -0,0 +1,24 @@ +--- CMakeLists.txt.orig 2018-11-21 00:21:52 UTC ++++ CMakeLists.txt +@@ -4,7 +4,9 @@ if(COMMAND CMAKE_POLICY) + CMAKE_POLICY(SET CMP0003 NEW) + CMAKE_POLICY(SET CMP0004 NEW) + endif(COMMAND CMAKE_POLICY) +-enable_testing() ++if (BUILD_TESTING) ++ enable_testing() ++endif() + + # with -fPIC + if(UNIX AND NOT WIN32) +@@ -256,7 +258,9 @@ else (build_errors) + + link_directories(${PROJECT_BINARY_DIR}/src) + +- add_subdirectory(test) ++ if (BUILD_TESTING) ++ add_subdirectory(test) ++ endif() + add_subdirectory(src) + add_subdirectory(include/sdf) + add_subdirectory(sdf) diff --git a/misc/sdformat/files/patch-cmake_SDFUtils.cmake b/misc/sdformat/files/patch-cmake_SDFUtils.cmake new file mode 100644 index 00000000000..87a044438f4 --- /dev/null +++ b/misc/sdformat/files/patch-cmake_SDFUtils.cmake @@ -0,0 +1,17 @@ +--- cmake/SDFUtils.cmake.orig 2018-11-21 00:24:14 UTC ++++ cmake/SDFUtils.cmake +@@ -148,9 +148,11 @@ macro (sdf_build_tests) + message(FATAL_ERROR "Unsupported platform") + endif() + +- add_dependencies(${BINARY_NAME} +- gtest gtest_main ${sdf_target} +- ) ++ if (BUILD_TESTING) ++ add_dependencies(${BINARY_NAME} ++ gtest gtest_main ${sdf_target} ++ ) ++ endif() + + link_directories(${IGNITION-MATH_LIBRARY_DIRS}) + diff --git a/misc/sdformat/files/patch-cmake_SearchForStuff.cmake b/misc/sdformat/files/patch-cmake_SearchForStuff.cmake new file mode 100644 index 00000000000..f302a1ebac6 --- /dev/null +++ b/misc/sdformat/files/patch-cmake_SearchForStuff.cmake @@ -0,0 +1,34 @@ +--- cmake/SearchForStuff.cmake.orig 2018-11-21 00:19:13 UTC ++++ cmake/SearchForStuff.cmake +@@ -9,24 +9,24 @@ if (USE_EXTERNAL_TINYXML) + ################################################# + # Find tinyxml. Only debian distributions package tinyxml with a pkg-config + # Use pkg_check_modules and fallback to manual detection (needed, at least, for MacOS) +- pkg_check_modules(tinyxml tinyxml) ++ pkg_check_modules(tinyxml tinyxml2) + if (NOT tinyxml_FOUND) +- find_path (tinyxml_include_dirs tinyxml.h ${tinyxml_include_dirs} ENV CPATH) +- find_library(tinyxml_LIBRARIES NAMES tinyxml) ++ find_path (tinyxml_include_dirs tinyxml2.h ${tinyxml_include_dirs} ENV CPATH) ++ find_library(tinyxml_LIBRARIES NAMES tinyxml2) + set (tinyxml_FAIL False) + if (NOT tinyxml_include_dirs) +- message (STATUS "Looking for tinyxml headers - not found") ++ message (STATUS "Looking for tinyxml2 headers - not found") + set (tinyxml_FAIL True) + endif() + if (NOT tinyxml_LIBRARIES) +- message (STATUS "Looking for tinyxml library - not found") ++ message (STATUS "Looking for tinyxml2 library - not found") + set (tinyxml_FAIL True) + endif() + endif() + + if (tinyxml_FAIL) +- message (STATUS "Looking for tinyxml.h - not found") +- BUILD_ERROR("Missing: tinyxml") ++ message (STATUS "Looking for tinyxml2.h - not found") ++ BUILD_ERROR("Missing: tinyxml2") + endif() + else() + # Needed in WIN32 since in UNIX the flag is added in the code installed diff --git a/misc/sdformat/files/patch-src_CMakeLists.txt b/misc/sdformat/files/patch-src_CMakeLists.txt new file mode 100644 index 00000000000..5e123631594 --- /dev/null +++ b/misc/sdformat/files/patch-src_CMakeLists.txt @@ -0,0 +1,13 @@ +--- src/CMakeLists.txt.orig 2018-11-21 00:25:29 UTC ++++ src/CMakeLists.txt +@@ -116,7 +116,9 @@ if (IGNITION-TOOLS_BINARY_DIRS) + ) + endif() + +-sdf_build_tests(${gtest_sources}) ++if (BUILD_TESTING) ++ sdf_build_tests(${gtest_sources}) ++endif() + + sdf_add_library(${sdf_target} ${sources}) + target_link_libraries(${sdf_target} PUBLIC ${IGNITION-MATH_LIBRARIES}) diff --git a/misc/sdformat/pkg-descr b/misc/sdformat/pkg-descr new file mode 100644 index 00000000000..b815873f1e0 --- /dev/null +++ b/misc/sdformat/pkg-descr @@ -0,0 +1,9 @@ +SDF is an XML file format that describes environments, objects, and robots in +a manner suitable for robotic applications. SDF is capable of representing and +describing different physic engines, lighting properties, terrain, static or +dynamic objects, and articulated robots with various sensors, and acutators. The +format of SDF is also described by XML, which facilitates updates and allows +conversion from previous versions. A parser is also contained within this +package that reads SDF files and returns a C++ interface. + +WWW: https://bitbucket.org/osrf/sdformat/src/default/ diff --git a/misc/sdformat/pkg-plist b/misc/sdformat/pkg-plist new file mode 100644 index 00000000000..865d4f41b59 --- /dev/null +++ b/misc/sdformat/pkg-plist @@ -0,0 +1,387 @@ +include/%%INCSUBDIR%%/sdf/Assert.hh +include/%%INCSUBDIR%%/sdf/Atmosphere.hh +include/%%INCSUBDIR%%/sdf/Box.hh +include/%%INCSUBDIR%%/sdf/Collision.hh +include/%%INCSUBDIR%%/sdf/Console.hh +include/%%INCSUBDIR%%/sdf/Cylinder.hh +include/%%INCSUBDIR%%/sdf/Element.hh +include/%%INCSUBDIR%%/sdf/Error.hh +include/%%INCSUBDIR%%/sdf/Exception.hh +include/%%INCSUBDIR%%/sdf/Filesystem.hh +include/%%INCSUBDIR%%/sdf/Geometry.hh +include/%%INCSUBDIR%%/sdf/Gui.hh +include/%%INCSUBDIR%%/sdf/Joint.hh +include/%%INCSUBDIR%%/sdf/JointAxis.hh +include/%%INCSUBDIR%%/sdf/Light.hh +include/%%INCSUBDIR%%/sdf/Link.hh +include/%%INCSUBDIR%%/sdf/Material.hh +include/%%INCSUBDIR%%/sdf/Mesh.hh +include/%%INCSUBDIR%%/sdf/Model.hh +include/%%INCSUBDIR%%/sdf/Param.hh +include/%%INCSUBDIR%%/sdf/Physics.hh +include/%%INCSUBDIR%%/sdf/Plane.hh +include/%%INCSUBDIR%%/sdf/Root.hh +include/%%INCSUBDIR%%/sdf/SDFImpl.hh +include/%%INCSUBDIR%%/sdf/Sphere.hh +include/%%INCSUBDIR%%/sdf/Types.hh +include/%%INCSUBDIR%%/sdf/Visual.hh +include/%%INCSUBDIR%%/sdf/World.hh +include/%%INCSUBDIR%%/sdf/parser.hh +include/%%INCSUBDIR%%/sdf/parser_urdf.hh +include/%%INCSUBDIR%%/sdf/sdf.hh +include/%%INCSUBDIR%%/sdf/sdf_config.h +include/%%INCSUBDIR%%/sdf/system_util.hh +lib/cmake/sdformat8/sdformat8-config-version.cmake +lib/cmake/sdformat8/sdformat8-config.cmake +lib/cmake/sdformat8/sdformat8-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/sdformat8/sdformat8-targets.cmake +lib/libsdformat8.so +lib/libsdformat8.so.8 +lib/libsdformat8.so.8.0.0~pre3 +lib/ruby/ignition/cmdsdformat8.rb +libdata/pkgconfig/sdformat8.pc +share/ignition/sdformat8.yaml +%%DATADIR%%/1.0/actor.sdf +%%DATADIR%%/1.0/camera.sdf +%%DATADIR%%/1.0/collision.sdf +%%DATADIR%%/1.0/contact.sdf +%%DATADIR%%/1.0/gazebo.sdf +%%DATADIR%%/1.0/geometry.sdf +%%DATADIR%%/1.0/gripper.sdf +%%DATADIR%%/1.0/gui.sdf +%%DATADIR%%/1.0/inertial.sdf +%%DATADIR%%/1.0/joint.sdf +%%DATADIR%%/1.0/light.sdf +%%DATADIR%%/1.0/link.sdf +%%DATADIR%%/1.0/model.sdf +%%DATADIR%%/1.0/physics.sdf +%%DATADIR%%/1.0/plugin.sdf +%%DATADIR%%/1.0/projector.sdf +%%DATADIR%%/1.0/ray.sdf +%%DATADIR%%/1.0/rfid.sdf +%%DATADIR%%/1.0/rfidtag.sdf +%%DATADIR%%/1.0/road.sdf +%%DATADIR%%/1.0/scene.sdf +%%DATADIR%%/1.0/sensor.sdf +%%DATADIR%%/1.0/state.sdf +%%DATADIR%%/1.0/surface.sdf +%%DATADIR%%/1.0/visual.sdf +%%DATADIR%%/1.0/world.sdf +%%DATADIR%%/1.2/1_0.convert +%%DATADIR%%/1.2/actor.sdf +%%DATADIR%%/1.2/camera.sdf +%%DATADIR%%/1.2/collision.sdf +%%DATADIR%%/1.2/contact.sdf +%%DATADIR%%/1.2/gazebo.sdf +%%DATADIR%%/1.2/geometry.sdf +%%DATADIR%%/1.2/gripper.sdf +%%DATADIR%%/1.2/gui.sdf +%%DATADIR%%/1.2/inertial.sdf +%%DATADIR%%/1.2/joint.sdf +%%DATADIR%%/1.2/light.sdf +%%DATADIR%%/1.2/link.sdf +%%DATADIR%%/1.2/model.sdf +%%DATADIR%%/1.2/physics.sdf +%%DATADIR%%/1.2/plugin.sdf +%%DATADIR%%/1.2/projector.sdf +%%DATADIR%%/1.2/ray.sdf +%%DATADIR%%/1.2/rfid.sdf +%%DATADIR%%/1.2/rfidtag.sdf +%%DATADIR%%/1.2/road.sdf +%%DATADIR%%/1.2/scene.sdf +%%DATADIR%%/1.2/sensor.sdf +%%DATADIR%%/1.2/state.sdf +%%DATADIR%%/1.2/surface.sdf +%%DATADIR%%/1.2/visual.sdf +%%DATADIR%%/1.2/world.sdf +%%DATADIR%%/1.3/1_2.convert +%%DATADIR%%/1.3/actor.sdf +%%DATADIR%%/1.3/camera.sdf +%%DATADIR%%/1.3/collision.sdf +%%DATADIR%%/1.3/contact.sdf +%%DATADIR%%/1.3/geometry.sdf +%%DATADIR%%/1.3/gripper.sdf +%%DATADIR%%/1.3/gui.sdf +%%DATADIR%%/1.3/imu.sdf +%%DATADIR%%/1.3/inertial.sdf +%%DATADIR%%/1.3/joint.sdf +%%DATADIR%%/1.3/light.sdf +%%DATADIR%%/1.3/link.sdf +%%DATADIR%%/1.3/model.sdf +%%DATADIR%%/1.3/physics.sdf +%%DATADIR%%/1.3/plugin.sdf +%%DATADIR%%/1.3/projector.sdf +%%DATADIR%%/1.3/ray.sdf +%%DATADIR%%/1.3/rfid.sdf +%%DATADIR%%/1.3/rfidtag.sdf +%%DATADIR%%/1.3/road.sdf +%%DATADIR%%/1.3/root.sdf +%%DATADIR%%/1.3/scene.sdf +%%DATADIR%%/1.3/sensor.sdf +%%DATADIR%%/1.3/state.sdf +%%DATADIR%%/1.3/surface.sdf +%%DATADIR%%/1.3/visual.sdf +%%DATADIR%%/1.3/world.sdf +%%DATADIR%%/1.4/1_3.convert +%%DATADIR%%/1.4/actor.sdf +%%DATADIR%%/1.4/audio_sink.sdf +%%DATADIR%%/1.4/audio_source.sdf +%%DATADIR%%/1.4/box_shape.sdf +%%DATADIR%%/1.4/camera.sdf +%%DATADIR%%/1.4/collision.sdf +%%DATADIR%%/1.4/contact.sdf +%%DATADIR%%/1.4/cylinder_shape.sdf +%%DATADIR%%/1.4/forcetorque.sdf +%%DATADIR%%/1.4/geometry.sdf +%%DATADIR%%/1.4/gps.sdf +%%DATADIR%%/1.4/gripper.sdf +%%DATADIR%%/1.4/gui.sdf +%%DATADIR%%/1.4/heightmap_shape.sdf +%%DATADIR%%/1.4/image_shape.sdf +%%DATADIR%%/1.4/imu.sdf +%%DATADIR%%/1.4/inertial.sdf +%%DATADIR%%/1.4/joint.sdf +%%DATADIR%%/1.4/light.sdf +%%DATADIR%%/1.4/link.sdf +%%DATADIR%%/1.4/mesh_shape.sdf +%%DATADIR%%/1.4/model.sdf +%%DATADIR%%/1.4/noise.sdf +%%DATADIR%%/1.4/physics.sdf +%%DATADIR%%/1.4/plane_shape.sdf +%%DATADIR%%/1.4/plugin.sdf +%%DATADIR%%/1.4/projector.sdf +%%DATADIR%%/1.4/ray.sdf +%%DATADIR%%/1.4/rfid.sdf +%%DATADIR%%/1.4/rfidtag.sdf +%%DATADIR%%/1.4/road.sdf +%%DATADIR%%/1.4/root.sdf +%%DATADIR%%/1.4/scene.sdf +%%DATADIR%%/1.4/sensor.sdf +%%DATADIR%%/1.4/sonar.sdf +%%DATADIR%%/1.4/sphere_shape.sdf +%%DATADIR%%/1.4/spherical_coordinates.sdf +%%DATADIR%%/1.4/state.sdf +%%DATADIR%%/1.4/surface.sdf +%%DATADIR%%/1.4/transceiver.sdf +%%DATADIR%%/1.4/visual.sdf +%%DATADIR%%/1.4/world.sdf +%%DATADIR%%/1.5/1_4.convert +%%DATADIR%%/1.5/actor.sdf +%%DATADIR%%/1.5/actor.xsd +%%DATADIR%%/1.5/altimeter.sdf +%%DATADIR%%/1.5/altimeter.xsd +%%DATADIR%%/1.5/audio_sink.sdf +%%DATADIR%%/1.5/audio_sink.xsd +%%DATADIR%%/1.5/audio_source.sdf +%%DATADIR%%/1.5/audio_source.xsd +%%DATADIR%%/1.5/battery.sdf +%%DATADIR%%/1.5/battery.xsd +%%DATADIR%%/1.5/box_shape.sdf +%%DATADIR%%/1.5/box_shape.xsd +%%DATADIR%%/1.5/camera.sdf +%%DATADIR%%/1.5/camera.xsd +%%DATADIR%%/1.5/collision.sdf +%%DATADIR%%/1.5/collision.xsd +%%DATADIR%%/1.5/contact.sdf +%%DATADIR%%/1.5/contact.xsd +%%DATADIR%%/1.5/cylinder_shape.sdf +%%DATADIR%%/1.5/cylinder_shape.xsd +%%DATADIR%%/1.5/forcetorque.sdf +%%DATADIR%%/1.5/forcetorque.xsd +%%DATADIR%%/1.5/frame.sdf +%%DATADIR%%/1.5/frame.xsd +%%DATADIR%%/1.5/geometry.sdf +%%DATADIR%%/1.5/geometry.xsd +%%DATADIR%%/1.5/gps.sdf +%%DATADIR%%/1.5/gps.xsd +%%DATADIR%%/1.5/gripper.sdf +%%DATADIR%%/1.5/gripper.xsd +%%DATADIR%%/1.5/gui.sdf +%%DATADIR%%/1.5/gui.xsd +%%DATADIR%%/1.5/heightmap_shape.sdf +%%DATADIR%%/1.5/heightmap_shape.xsd +%%DATADIR%%/1.5/image_shape.sdf +%%DATADIR%%/1.5/image_shape.xsd +%%DATADIR%%/1.5/imu.sdf +%%DATADIR%%/1.5/imu.xsd +%%DATADIR%%/1.5/inertial.sdf +%%DATADIR%%/1.5/inertial.xsd +%%DATADIR%%/1.5/joint.sdf +%%DATADIR%%/1.5/joint.xsd +%%DATADIR%%/1.5/light.sdf +%%DATADIR%%/1.5/light.xsd +%%DATADIR%%/1.5/light_state.sdf +%%DATADIR%%/1.5/light_state.xsd +%%DATADIR%%/1.5/link.sdf +%%DATADIR%%/1.5/link.xsd +%%DATADIR%%/1.5/link_state.sdf +%%DATADIR%%/1.5/link_state.xsd +%%DATADIR%%/1.5/logical_camera.sdf +%%DATADIR%%/1.5/logical_camera.xsd +%%DATADIR%%/1.5/magnetometer.sdf +%%DATADIR%%/1.5/magnetometer.xsd +%%DATADIR%%/1.5/material.sdf +%%DATADIR%%/1.5/material.xsd +%%DATADIR%%/1.5/mesh_shape.sdf +%%DATADIR%%/1.5/mesh_shape.xsd +%%DATADIR%%/1.5/model.sdf +%%DATADIR%%/1.5/model.xsd +%%DATADIR%%/1.5/model_state.sdf +%%DATADIR%%/1.5/model_state.xsd +%%DATADIR%%/1.5/noise.sdf +%%DATADIR%%/1.5/noise.xsd +%%DATADIR%%/1.5/physics.sdf +%%DATADIR%%/1.5/physics.xsd +%%DATADIR%%/1.5/plane_shape.sdf +%%DATADIR%%/1.5/plane_shape.xsd +%%DATADIR%%/1.5/plugin.sdf +%%DATADIR%%/1.5/plugin.xsd +%%DATADIR%%/1.5/polyline_shape.sdf +%%DATADIR%%/1.5/polyline_shape.xsd +%%DATADIR%%/1.5/population.sdf +%%DATADIR%%/1.5/population.xsd +%%DATADIR%%/1.5/pose.sdf +%%DATADIR%%/1.5/pose.xsd +%%DATADIR%%/1.5/projector.sdf +%%DATADIR%%/1.5/projector.xsd +%%DATADIR%%/1.5/ray.sdf +%%DATADIR%%/1.5/ray.xsd +%%DATADIR%%/1.5/rfid.sdf +%%DATADIR%%/1.5/rfid.xsd +%%DATADIR%%/1.5/rfidtag.sdf +%%DATADIR%%/1.5/rfidtag.xsd +%%DATADIR%%/1.5/road.sdf +%%DATADIR%%/1.5/road.xsd +%%DATADIR%%/1.5/root.sdf +%%DATADIR%%/1.5/root.xsd +%%DATADIR%%/1.5/scene.sdf +%%DATADIR%%/1.5/scene.xsd +%%DATADIR%%/1.5/sensor.sdf +%%DATADIR%%/1.5/sensor.xsd +%%DATADIR%%/1.5/sonar.sdf +%%DATADIR%%/1.5/sonar.xsd +%%DATADIR%%/1.5/sphere_shape.sdf +%%DATADIR%%/1.5/sphere_shape.xsd +%%DATADIR%%/1.5/spherical_coordinates.sdf +%%DATADIR%%/1.5/spherical_coordinates.xsd +%%DATADIR%%/1.5/state.sdf +%%DATADIR%%/1.5/state.xsd +%%DATADIR%%/1.5/surface.sdf +%%DATADIR%%/1.5/surface.xsd +%%DATADIR%%/1.5/transceiver.sdf +%%DATADIR%%/1.5/transceiver.xsd +%%DATADIR%%/1.5/visual.sdf +%%DATADIR%%/1.5/visual.xsd +%%DATADIR%%/1.5/world.sdf +%%DATADIR%%/1.5/world.xsd +%%DATADIR%%/1.6/1_5.convert +%%DATADIR%%/1.6/actor.sdf +%%DATADIR%%/1.6/actor.xsd +%%DATADIR%%/1.6/altimeter.sdf +%%DATADIR%%/1.6/altimeter.xsd +%%DATADIR%%/1.6/atmosphere.sdf +%%DATADIR%%/1.6/atmosphere.xsd +%%DATADIR%%/1.6/audio_sink.sdf +%%DATADIR%%/1.6/audio_sink.xsd +%%DATADIR%%/1.6/audio_source.sdf +%%DATADIR%%/1.6/audio_source.xsd +%%DATADIR%%/1.6/battery.sdf +%%DATADIR%%/1.6/battery.xsd +%%DATADIR%%/1.6/box_shape.sdf +%%DATADIR%%/1.6/box_shape.xsd +%%DATADIR%%/1.6/camera.sdf +%%DATADIR%%/1.6/camera.xsd +%%DATADIR%%/1.6/collision.sdf +%%DATADIR%%/1.6/collision.xsd +%%DATADIR%%/1.6/contact.sdf +%%DATADIR%%/1.6/contact.xsd +%%DATADIR%%/1.6/cylinder_shape.sdf +%%DATADIR%%/1.6/cylinder_shape.xsd +%%DATADIR%%/1.6/forcetorque.sdf +%%DATADIR%%/1.6/forcetorque.xsd +%%DATADIR%%/1.6/frame.sdf +%%DATADIR%%/1.6/frame.xsd +%%DATADIR%%/1.6/geometry.sdf +%%DATADIR%%/1.6/geometry.xsd +%%DATADIR%%/1.6/gps.sdf +%%DATADIR%%/1.6/gps.xsd +%%DATADIR%%/1.6/gripper.sdf +%%DATADIR%%/1.6/gripper.xsd +%%DATADIR%%/1.6/gui.sdf +%%DATADIR%%/1.6/gui.xsd +%%DATADIR%%/1.6/heightmap_shape.sdf +%%DATADIR%%/1.6/heightmap_shape.xsd +%%DATADIR%%/1.6/image_shape.sdf +%%DATADIR%%/1.6/image_shape.xsd +%%DATADIR%%/1.6/imu.sdf +%%DATADIR%%/1.6/imu.xsd +%%DATADIR%%/1.6/inertial.sdf +%%DATADIR%%/1.6/inertial.xsd +%%DATADIR%%/1.6/joint.sdf +%%DATADIR%%/1.6/joint.xsd +%%DATADIR%%/1.6/light.sdf +%%DATADIR%%/1.6/light.xsd +%%DATADIR%%/1.6/light_state.sdf +%%DATADIR%%/1.6/light_state.xsd +%%DATADIR%%/1.6/link.sdf +%%DATADIR%%/1.6/link.xsd +%%DATADIR%%/1.6/link_state.sdf +%%DATADIR%%/1.6/link_state.xsd +%%DATADIR%%/1.6/logical_camera.sdf +%%DATADIR%%/1.6/logical_camera.xsd +%%DATADIR%%/1.6/magnetometer.sdf +%%DATADIR%%/1.6/magnetometer.xsd +%%DATADIR%%/1.6/material.sdf +%%DATADIR%%/1.6/material.xsd +%%DATADIR%%/1.6/mesh_shape.sdf +%%DATADIR%%/1.6/mesh_shape.xsd +%%DATADIR%%/1.6/model.sdf +%%DATADIR%%/1.6/model.xsd +%%DATADIR%%/1.6/model_state.sdf +%%DATADIR%%/1.6/model_state.xsd +%%DATADIR%%/1.6/noise.sdf +%%DATADIR%%/1.6/noise.xsd +%%DATADIR%%/1.6/physics.sdf +%%DATADIR%%/1.6/physics.xsd +%%DATADIR%%/1.6/plane_shape.sdf +%%DATADIR%%/1.6/plane_shape.xsd +%%DATADIR%%/1.6/plugin.sdf +%%DATADIR%%/1.6/plugin.xsd +%%DATADIR%%/1.6/polyline_shape.sdf +%%DATADIR%%/1.6/polyline_shape.xsd +%%DATADIR%%/1.6/population.sdf +%%DATADIR%%/1.6/population.xsd +%%DATADIR%%/1.6/pose.sdf +%%DATADIR%%/1.6/pose.xsd +%%DATADIR%%/1.6/projector.sdf +%%DATADIR%%/1.6/projector.xsd +%%DATADIR%%/1.6/ray.sdf +%%DATADIR%%/1.6/ray.xsd +%%DATADIR%%/1.6/rfid.sdf +%%DATADIR%%/1.6/rfid.xsd +%%DATADIR%%/1.6/rfidtag.sdf +%%DATADIR%%/1.6/rfidtag.xsd +%%DATADIR%%/1.6/road.sdf +%%DATADIR%%/1.6/road.xsd +%%DATADIR%%/1.6/root.sdf +%%DATADIR%%/1.6/root.xsd +%%DATADIR%%/1.6/scene.sdf +%%DATADIR%%/1.6/scene.xsd +%%DATADIR%%/1.6/sensor.sdf +%%DATADIR%%/1.6/sensor.xsd +%%DATADIR%%/1.6/sonar.sdf +%%DATADIR%%/1.6/sonar.xsd +%%DATADIR%%/1.6/sphere_shape.sdf +%%DATADIR%%/1.6/sphere_shape.xsd +%%DATADIR%%/1.6/spherical_coordinates.sdf +%%DATADIR%%/1.6/spherical_coordinates.xsd +%%DATADIR%%/1.6/state.sdf +%%DATADIR%%/1.6/state.xsd +%%DATADIR%%/1.6/surface.sdf +%%DATADIR%%/1.6/surface.xsd +%%DATADIR%%/1.6/transceiver.sdf +%%DATADIR%%/1.6/transceiver.xsd +%%DATADIR%%/1.6/visual.sdf +%%DATADIR%%/1.6/visual.xsd +%%DATADIR%%/1.6/world.sdf +%%DATADIR%%/1.6/world.xsd diff --git a/multimedia/bitstream/Makefile b/multimedia/bitstream/Makefile index 4d33c8dc738..97766691f13 100644 --- a/multimedia/bitstream/Makefile +++ b/multimedia/bitstream/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= bitstream -PORTVERSION= 1.4 +PORTVERSION= 1.5 CATEGORIES= multimedia MASTER_SITES= https://get.videolan.org/bitstream/${PORTVERSION}/ \ http://get.videolan.org/bitstream/${PORTVERSION}/ diff --git a/multimedia/bitstream/distinfo b/multimedia/bitstream/distinfo index 9fad97534cc..c623ebcedab 100644 --- a/multimedia/bitstream/distinfo +++ b/multimedia/bitstream/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1530550220 -SHA256 (bitstream-1.4.tar.bz2) = b2484940d3b8733bec9dd1ec1731de428261dff31c9f95874264be9dc9ce786b -SIZE (bitstream-1.4.tar.bz2) = 119836 +TIMESTAMP = 1542644608 +SHA256 (bitstream-1.5.tar.bz2) = 45fc5a5a6e4537a69fa8440821e87b76252135180a3070c631b0b36ce0a3b90a +SIZE (bitstream-1.5.tar.bz2) = 120108 diff --git a/multimedia/bitstream/pkg-plist b/multimedia/bitstream/pkg-plist index 6811c776011..8aff2bf8b5d 100644 --- a/multimedia/bitstream/pkg-plist +++ b/multimedia/bitstream/pkg-plist @@ -89,6 +89,7 @@ include/bitstream/ietf/rtcp.h include/bitstream/ietf/rtcp3611.h include/bitstream/ietf/rtcp_fb.h include/bitstream/ietf/rtcp_rr.h +include/bitstream/ietf/rtcp_sdes.h include/bitstream/ietf/rtcp_sr.h include/bitstream/ietf/rtp.h include/bitstream/ietf/rtp2250.h diff --git a/net-im/ktp-approver/Makefile b/net-im/ktp-approver/Makefile index f12d261b4c7..b0f0e5a3614 100644 --- a/net-im/ktp-approver/Makefile +++ b/net-im/ktp-approver/Makefile @@ -7,6 +7,9 @@ CATEGORIES= net-im kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= KDE instant messaging notifier +LICENSE= LGPL21+ +LICENSE_FILE= ${WRKSRC}/COPYING + LIB_DEPENDS= libtelepathy-qt5.so:net-im/telepathy-qt@qt5 \ libKTpCommonInternals.so:net-im/ktp-common-internals RUN_DEPENDS= ${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list diff --git a/net-im/ktp-approver/pkg-descr b/net-im/ktp-approver/pkg-descr index 555936f35c9..32c0f37f188 100644 --- a/net-im/ktp-approver/pkg-descr +++ b/net-im/ktp-approver/pkg-descr @@ -6,4 +6,4 @@ This module notifies you when an incoming message or a file transfer request arrives and hangs in the system tray until you're ready to check it. -WWW: http://community.kde.org/KTp +WWW: https://community.kde.org/KTp diff --git a/net-mgmt/Makefile b/net-mgmt/Makefile index b3ae35fa60a..9bf3db12dd9 100644 --- a/net-mgmt/Makefile +++ b/net-mgmt/Makefile @@ -229,8 +229,6 @@ SUBDIR += p5-Cisco-Reconfig SUBDIR += p5-Data-Validate-IP SUBDIR += p5-FusionInventory-Agent - SUBDIR += p5-FusionInventory-Agent-Task-NetDiscovery - SUBDIR += p5-FusionInventory-Agent-Task-SNMPQuery SUBDIR += p5-GRNOC-Config SUBDIR += p5-GRNOC-TL1 SUBDIR += p5-MRTG-Parse diff --git a/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/Makefile b/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/Makefile deleted file mode 100644 index 3a5523d02a8..00000000000 --- a/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# Created by: Emil Smolenski -# $FreeBSD$ - -PORTNAME= FusionInventory-Agent-Task-NetDiscovery -PORTVERSION= 2.1 -PORTREVISION= 1 -CATEGORIES= net-mgmt -MASTER_SITES= CPAN -MASTER_SITE_SUBDIR= CPAN:FUSINV -PKGNAMEPREFIX= p5- - -MAINTAINER= bofh@FreeBSD.org -COMMENT= Network discovery support for FusionInventory Agent - -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/LICENSE - -DEPRECATED= No longer needed -EXPIRATION_DATE=2018-11-19 - -BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= p5-FusionInventory-Agent>=2.2.0:net-mgmt/p5-FusionInventory-Agent \ - p5-Net-IP>=0:net-mgmt/p5-Net-IP \ - p5-Net-NBName>=0:net/p5-Net-NBName \ - p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \ - p5-XML-TreePP>=0.26:textproc/p5-XML-TreePP - -USES= perl5 -USE_PERL5= configure - -post-patch: - @${REINPLACE_CMD} -e '40,$$ d' ${WRKSRC}/Makefile.PL - -.include diff --git a/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/distinfo b/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/distinfo deleted file mode 100644 index 52273dfbeb0..00000000000 --- a/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (FusionInventory-Agent-Task-NetDiscovery-2.1.tar.gz) = 868ed07ef563bda7d1d6cb7bfb27239c8a6215f256a3a2f572668068e3a51c9a -SIZE (FusionInventory-Agent-Task-NetDiscovery-2.1.tar.gz) = 47603 diff --git a/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/pkg-descr b/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/pkg-descr deleted file mode 100644 index 05197dc3d8e..00000000000 --- a/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/pkg-descr +++ /dev/null @@ -1,13 +0,0 @@ -This module scans your networks to get informations from devices with SNMP -protocol: - - networking devices discovery within an IP range - - network switch, printer and router analyse - - relation between computer / printer / switch port - - identify unknown MAC addresses - - report printer cartridge and ounter status - - support management of SNMP versions v1, v2, v3 - -The plugin depends on FusionInventory for GLPI. OCS Inventory can't use this -plugin. - -WWW: https://metacpan.org/release/FUSINV/FusionInventory-Agent-Task-NetDiscovery-2.1 diff --git a/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/pkg-plist b/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/pkg-plist deleted file mode 100644 index 29897516d2c..00000000000 --- a/net-mgmt/p5-FusionInventory-Agent-Task-NetDiscovery/pkg-plist +++ /dev/null @@ -1,17 +0,0 @@ -%%SITE_PERL%%/FusionInventory/Agent/SNMP.pm -%%SITE_PERL%%/FusionInventory/Agent/Task/NetDiscovery.pm -%%SITE_PERL%%/FusionInventory/Agent/Task/NetDiscovery/Dictionary.pm -%%SITE_PERL%%/FusionInventory/Agent/Task/NetDiscovery/Manufacturer/Alcatel.pm -%%SITE_PERL%%/FusionInventory/Agent/Task/NetDiscovery/Manufacturer/Axis.pm -%%SITE_PERL%%/FusionInventory/Agent/Task/NetDiscovery/Manufacturer/Ddwrt.pm -%%SITE_PERL%%/FusionInventory/Agent/Task/NetDiscovery/Manufacturer/Dell.pm -%%SITE_PERL%%/FusionInventory/Agent/Task/NetDiscovery/Manufacturer/Epson.pm -%%SITE_PERL%%/FusionInventory/Agent/Task/NetDiscovery/Manufacturer/HewlettPackard.pm -%%SITE_PERL%%/FusionInventory/Agent/Task/NetDiscovery/Manufacturer/Kyocera.pm -%%SITE_PERL%%/FusionInventory/Agent/Task/NetDiscovery/Manufacturer/Ricoh.pm -%%SITE_PERL%%/FusionInventory/Agent/Task/NetDiscovery/Manufacturer/Samsung.pm -%%SITE_PERL%%/FusionInventory/Agent/Task/NetDiscovery/Manufacturer/Wyse.pm -%%SITE_PERL%%/FusionInventory/Agent/Task/NetDiscovery/Manufacturer/Zebranet.pm -%%PERL5_MAN3%%/FusionInventory::Agent::SNMP.3.gz -%%PERL5_MAN3%%/FusionInventory::Agent::Task::NetDiscovery.3.gz -%%PERL5_MAN3%%/FusionInventory::Agent::Task::NetDiscovery::Dictionary.3.gz diff --git a/net-mgmt/p5-FusionInventory-Agent-Task-SNMPQuery/Makefile b/net-mgmt/p5-FusionInventory-Agent-Task-SNMPQuery/Makefile deleted file mode 100644 index 75d614d300e..00000000000 --- a/net-mgmt/p5-FusionInventory-Agent-Task-SNMPQuery/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# Created by: Emil Smolenski -# $FreeBSD$ - -PORTNAME= FusionInventory-Agent-Task-SNMPQuery -PORTVERSION= 1.3 -PORTREVISION= 1 -CATEGORIES= net-mgmt -MASTER_SITES= CPAN -MASTER_SITE_SUBDIR= CPAN:FUSINV -PKGNAMEPREFIX= p5- - -MAINTAINER= perl@FreeBSD.org -COMMENT= SNMP support for FusionInventory Agent - -LICENSE= GPLv2+ -LICENSE_FILE= ${WRKSRC}/LICENSE - -BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= p5-FusionInventory-Agent>=0:net-mgmt/p5-FusionInventory-Agent \ - p5-Net-IP>=0:net-mgmt/p5-Net-IP \ - p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \ - p5-Parallel-ForkManager>=0:devel/p5-Parallel-ForkManager \ - p5-XML-Simple>=0:textproc/p5-XML-Simple - -USES= perl5 -USE_PERL5= configure - -.include diff --git a/net-mgmt/p5-FusionInventory-Agent-Task-SNMPQuery/distinfo b/net-mgmt/p5-FusionInventory-Agent-Task-SNMPQuery/distinfo deleted file mode 100644 index 447c512c5b3..00000000000 --- a/net-mgmt/p5-FusionInventory-Agent-Task-SNMPQuery/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (FusionInventory-Agent-Task-SNMPQuery-1.3.tar.gz) = b6ddaa221e82a4023ee6236cc6cf80c5f82aa5361d7cf9cf31f4e98c074325c4 -SIZE (FusionInventory-Agent-Task-SNMPQuery-1.3.tar.gz) = 41687 diff --git a/net-mgmt/p5-FusionInventory-Agent-Task-SNMPQuery/pkg-descr b/net-mgmt/p5-FusionInventory-Agent-Task-SNMPQuery/pkg-descr deleted file mode 100644 index b68f1d21c09..00000000000 --- a/net-mgmt/p5-FusionInventory-Agent-Task-SNMPQuery/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -Network discovery support for FusionInventory Agent - -WWW: https://metacpan.org/release/FUSINV/FusionInventory-Agent-Task-SNMPQuery-1.3 diff --git a/net-mgmt/p5-FusionInventory-Agent-Task-SNMPQuery/pkg-plist b/net-mgmt/p5-FusionInventory-Agent-Task-SNMPQuery/pkg-plist deleted file mode 100644 index d0d3cf47ccd..00000000000 --- a/net-mgmt/p5-FusionInventory-Agent-Task-SNMPQuery/pkg-plist +++ /dev/null @@ -1,5 +0,0 @@ -%%SITE_PERL%%/FusionInventory/Agent/Task/SNMPQuery.pm -%%SITE_PERL%%/FusionInventory/Agent/Task/SNMPQuery/Cisco.pm -%%SITE_PERL%%/FusionInventory/Agent/Task/SNMPQuery/Nortel.pm -%%SITE_PERL%%/FusionInventory/Agent/Task/SNMPQuery/Procurve.pm -%%SITE_PERL%%/FusionInventory/Agent/Task/SNMPQuery/ThreeCom.pm diff --git a/net/torsocks/Makefile b/net/torsocks/Makefile index d36174f16c6..8600475b4a5 100644 --- a/net/torsocks/Makefile +++ b/net/torsocks/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= torsocks -PORTVERSION= 2.2.0 -PORTREVISION= 1 +DISTVERSION= 2.3.0 CATEGORIES= net security MASTER_SITES= https://people.torproject.org/~dgoulet/${PORTNAME}/ diff --git a/net/torsocks/distinfo b/net/torsocks/distinfo index fde6654c9d7..74ecafe2304 100644 --- a/net/torsocks/distinfo +++ b/net/torsocks/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1530802906 -SHA256 (torsocks-2.2.0.tar.xz) = 29e8c8cefa677dfb493ea6f2449576a7a9abebd221547037f9381d9ed44bd92f -SIZE (torsocks-2.2.0.tar.xz) = 309916 +TIMESTAMP = 1542734899 +SHA256 (torsocks-2.3.0.tar.xz) = b9f1b981d6b3fd4e1820de1eee325f8a7038c84765d5a6cd9af12571d5cc3622 +SIZE (torsocks-2.3.0.tar.xz) = 313072 diff --git a/net/torsocks/files/patch-src_common_compat.h b/net/torsocks/files/patch-src_common_compat.h index b34ab054e0b..8e832b9ce58 100644 --- a/net/torsocks/files/patch-src_common_compat.h +++ b/net/torsocks/files/patch-src_common_compat.h @@ -1,6 +1,6 @@ ---- src/common/compat.h.orig 2015-05-27 18:54:22 UTC +--- src/common/compat.h.orig 2018-04-20 15:41:42 UTC +++ src/common/compat.h -@@ -187,6 +187,10 @@ void tsocks_once(tsocks_once_t *o, void +@@ -214,6 +214,10 @@ void tsocks_once(tsocks_once_t *o, void #define TSOCKS_NR_GETPEERNAME SYS_getpeername #define TSOCKS_NR_LISTEN SYS_listen #define TSOCKS_NR_RECVMSG SYS_recvmsg diff --git a/net/torsocks/files/patch-src_lib_syscall.c b/net/torsocks/files/patch-src_lib_syscall.c deleted file mode 100644 index 60546a70920..00000000000 --- a/net/torsocks/files/patch-src_lib_syscall.c +++ /dev/null @@ -1,50 +0,0 @@ ---- src/lib/syscall.c.orig 2015-05-27 18:54:22 UTC -+++ src/lib/syscall.c -@@ -84,7 +84,7 @@ static LIBC_ACCEPT_RET_TYPE handle_accep - return tsocks_accept(sockfd, addr, &addrlen); - } - --#if (defined(__linux__) || defined(__darwin__) || (defined(__FreeBSD_kernel__) && defined(__i386__)) || defined(__NetBSD__)) -+#if defined(__FreeBSD__) - /* - * Handle mmap(2) syscall. - */ -@@ -372,7 +372,7 @@ LIBC_SYSCALL_RET_TYPE tsocks_syscall(lon - ret = handle_close(args); - break; - case TSOCKS_NR_MMAP: --#if (defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && defined(__x86_64) -+#if defined(badbadbad) - /* - * On an 64 bit *BSD system, __syscall(2) should be used for mmap(). - * This is NOT suppose to happen but for protection we deny that call. -@@ -456,6 +456,14 @@ LIBC_SYSCALL_RET_TYPE tsocks_syscall(lon - ret = handle_inotify_rm_watch(args); - break; - #endif /* __linux__ */ -+#if defined(__FreeBSD__) -+ case TSOCKS_NR_FORK: -+ ret = tsocks_libc_syscall(TSOCKS_NR_FORK); -+ break; -+ case TSOCKS_NR_GETPID: -+ ret = tsocks_libc_syscall(TSOCKS_NR_GETPID); -+ break; -+#endif - default: - /* - * Because of the design of syscall(), we can't pass a va_list to it so -@@ -530,6 +538,14 @@ LIBC___SYSCALL_RET_TYPE tsocks___syscall - */ - ret = handle_bsd_mmap(args); - break; -+#if defined(__FreeBSD__) -+ case TSOCKS_NR_FORK: -+ ret = tsocks_libc_syscall(TSOCKS_NR_FORK); -+ break; -+ case TSOCKS_NR_GETPID: -+ ret = tsocks_libc_syscall(TSOCKS_NR_GETPID); -+ break; -+#endif - default: - /* - * Because of the design of syscall(), we can't pass a va_list to it so diff --git a/net/torsocks/files/patch-src_lib_torsocks.c b/net/torsocks/files/patch-src_lib_torsocks.c new file mode 100644 index 00000000000..de0fb31b6eb --- /dev/null +++ b/net/torsocks/files/patch-src_lib_torsocks.c @@ -0,0 +1,14 @@ +--- src/lib/torsocks.c.orig 2018-11-20 17:48:42 UTC ++++ src/lib/torsocks.c +@@ -234,9 +234,9 @@ static void init_libc_symbols(void) + tsocks_libc_socket = dlsym(libc_ptr, LIBC_SOCKET_NAME_STR); + tsocks_libc_syscall = dlsym(libc_ptr, LIBC_SYSCALL_NAME_STR); + tsocks_libc_execve = dlsym(libc_ptr, LIBC_EXECVE_NAME_STR); +- tsocks_libc_accept4 = dlsym(libc_ptr, LIBC_ACCEPT4_NAME_STR); ++ tsocks_libc_accept = dlsym(libc_ptr, LIBC_ACCEPT_NAME_STR); + if (!tsocks_libc_connect || !tsocks_libc_close || !tsocks_libc_socket || +- !tsocks_libc_syscall || !tsocks_libc_execve || ! tsocks_libc_accept4) { ++ !tsocks_libc_syscall || !tsocks_libc_execve || ! tsocks_libc_accept) { + ERR("Unable to lookup symbols in " LIBC_NAME "(%s)", dlerror()); + goto error; + } diff --git a/science/gpaw-setups/Makefile b/science/gpaw-setups/Makefile index 7e3246ccef2..bfb62c2371f 100644 --- a/science/gpaw-setups/Makefile +++ b/science/gpaw-setups/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= gpaw-setups -DISTVERSION= 0.9.11271 +DISTVERSION= 0.9.20000 CATEGORIES= science MASTER_SITES= https://wiki.fysik.dtu.dk/gpaw-files/ diff --git a/science/gpaw-setups/distinfo b/science/gpaw-setups/distinfo index 3d65e99d9d5..da788c47d2b 100644 --- a/science/gpaw-setups/distinfo +++ b/science/gpaw-setups/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1540854184 -SHA256 (gpaw-setups-0.9.11271.tar.gz) = 71083327cee250fc61e9a5f5b3907e55b457857b54629563509464cb54b02a97 -SIZE (gpaw-setups-0.9.11271.tar.gz) = 52601589 +TIMESTAMP = 1542779917 +SHA256 (gpaw-setups-0.9.20000.tar.gz) = 6c71682be12a41e17909f65fd7c1a2e4a6a7becb63fbeed2f0f3a1616d6fd41f +SIZE (gpaw-setups-0.9.20000.tar.gz) = 52648851 diff --git a/science/py-spglib/Makefile b/science/py-spglib/Makefile index f9e41d0bd72..99d3de69095 100644 --- a/science/py-spglib/Makefile +++ b/science/py-spglib/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ PORTNAME= spglib -DISTVERSION= 1.10.4.11 +DISTVERSION= 1.11.1 +DISTVERSIONSUFFIX= .post3 CATEGORIES= science python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/science/py-spglib/distinfo b/science/py-spglib/distinfo index a78d5e7794d..49a28e1991a 100644 --- a/science/py-spglib/distinfo +++ b/science/py-spglib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1537381992 -SHA256 (spglib-1.10.4.11.tar.gz) = 13b0a227d2dc4079fe36d5bcce4e672400c7c5dfc5d3cd25ccb9521ef592d93e -SIZE (spglib-1.10.4.11.tar.gz) = 672426 +TIMESTAMP = 1542738586 +SHA256 (spglib-1.11.1.post3.tar.gz) = 8acbf3360cacd63585df09c8b5db7ea2b664cec8451cac160275e69fd5a28ce5 +SIZE (spglib-1.11.1.post3.tar.gz) = 676075 diff --git a/science/spglib/Makefile b/science/spglib/Makefile index a6ee3478fcb..a7ecb9e970e 100644 --- a/science/spglib/Makefile +++ b/science/spglib/Makefile @@ -2,7 +2,7 @@ PORTNAME= spglib DISTVERSIONPREFIX= v -DISTVERSION= 1.11.1 +DISTVERSION= 1.11.1.2 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org diff --git a/science/spglib/distinfo b/science/spglib/distinfo index b50fd1887bc..f0e8842e416 100644 --- a/science/spglib/distinfo +++ b/science/spglib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1542014073 -SHA256 (atztogo-spglib-v1.11.1_GH0.tar.gz) = 3b5a859f3fe2c9b096fc0754ffbd9341c568bc8003d2eeb74c958c1cacb480f5 -SIZE (atztogo-spglib-v1.11.1_GH0.tar.gz) = 1957921 +TIMESTAMP = 1542738353 +SHA256 (atztogo-spglib-v1.11.1.2_GH0.tar.gz) = d99dab24accd269df65c01febd05cb5dd1094a89d7279f8390871f0432df2b56 +SIZE (atztogo-spglib-v1.11.1.2_GH0.tar.gz) = 1957886 diff --git a/sysutils/bareos-client-static/Makefile b/sysutils/bareos-client-static/Makefile index ab1967762b3..4d16a398afc 100644 --- a/sysutils/bareos-client-static/Makefile +++ b/sysutils/bareos-client-static/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= bareos -PORTREVISION= 1 PKGNAMESUFFIX= -client-static COMMENT= Backup archiving recovery open sourced (static client) diff --git a/sysutils/bareos-client/Makefile b/sysutils/bareos-client/Makefile index cff41eaa0ee..dc76ee31d2f 100644 --- a/sysutils/bareos-client/Makefile +++ b/sysutils/bareos-client/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= bareos -PORTREVISION= 1 PKGNAMESUFFIX= -client COMMENT= Backup archiving recovery open sourced (client) diff --git a/sysutils/bareos-docs/distinfo b/sysutils/bareos-docs/distinfo index ed9beb84f95..29518cad1d8 100644 --- a/sysutils/bareos-docs/distinfo +++ b/sysutils/bareos-docs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1526747394 -SHA256 (bareos-manual-main-reference.pdf) = 417d19e150a1f5f0852b3c98c96b9678b63493bd9a5d75c0895a3f072f4b314f -SIZE (bareos-manual-main-reference.pdf) = 4138277 +TIMESTAMP = 1542749547 +SHA256 (bareos-manual-main-reference.pdf) = 5e23682cae0fa2d3f8d5c6f67d2bc340f5a60b22c48e12b027554ca2df73902a +SIZE (bareos-manual-main-reference.pdf) = 3937438 diff --git a/sysutils/bareos-server/Makefile b/sysutils/bareos-server/Makefile index 57152b0d8d9..6b3ba531177 100644 --- a/sysutils/bareos-server/Makefile +++ b/sysutils/bareos-server/Makefile @@ -2,8 +2,8 @@ PORTNAME= bareos DISTVERSIONPREFIX= Release/ -DISTVERSION= 17.2.5 -PORTREVISION?= 1 +DISTVERSION= 17.2.7 +PORTREVISION?= 0 CATEGORIES?= sysutils PKGNAMEPREFIX?= # PKGNAMESUFFIX?= -server @@ -14,15 +14,14 @@ COMMENT?= Backup archiving recovery open sourced (server) LICENSE= AGPLv3 LGPL3 LICENSE_COMB= multi -USE_GITHUB= yes - -USES+= libtool:keepla pkgconfig readline:port shebangfix - CONFLICTS?= bacula*-server-* bareos16-server-* LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \ libjansson.so:devel/jansson +USES+= libtool:keepla pkgconfig readline:port shebangfix +USE_GITHUB= yes + USERS= bareos GROUPS= ${USERS} diff --git a/sysutils/bareos-server/distinfo b/sysutils/bareos-server/distinfo index 996ada41d2d..8186063097c 100644 --- a/sysutils/bareos-server/distinfo +++ b/sysutils/bareos-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1524284411 -SHA256 (bareos-bareos-Release-17.2.5_GH0.tar.gz) = 720bcfbbb26d2e773088b3044b728b48fea2340b3fb0f622a0e07a88bec35bac -SIZE (bareos-bareos-Release-17.2.5_GH0.tar.gz) = 4181384 +TIMESTAMP = 1535610174 +SHA256 (bareos-bareos-Release-17.2.7_GH0.tar.gz) = 99a5f907e3422532c783ee254dcf5c737d2b1b53522c00924d3e1009289d2fd2 +SIZE (bareos-bareos-Release-17.2.7_GH0.tar.gz) = 4184028 diff --git a/sysutils/bareos-server/files/bareos-dir.in b/sysutils/bareos-server/files/bareos-dir.in index 38a209345d4..1d92025ae9a 100644 --- a/sysutils/bareos-server/files/bareos-dir.in +++ b/sysutils/bareos-server/files/bareos-dir.in @@ -24,16 +24,34 @@ load_rc_config $name : ${bareos_dir_enable="NO"} : ${bareos_dir_flags="-u bareos -g bareos -v"} -: ${bareos_dir_config="%%PREFIX%%/etc/bareos/bareos-dir.conf"} +: ${bareos_dir_config="%%PREFIX%%/etc/bareos/"} : ${bareos_dir_pidfile="/var/run/bareos/bareos-dir.9101.pid"} command=%%PREFIX%%/sbin/bareos-dir command_args="-c ${bareos_dir_config}" pidfile="${bareos_dir_pidfile}" +bconsole_command=/usr/local/bin/bconsole start_precmd="bareos_start_precmd" +restart_precmd="bareos_dir_configtest" +reload_precmd="bareos_dir_configtest" +reload_cmd="bareos_dir_reload" +configtest_cmd="bareos_dir_configtest" bareos_start_precmd() { [ -d "${pidfile%/*}" ] || install -d -o bareos -g bareos ${pidfile%/*} + bareos_dir_configtest } +bareos_dir_configtest() { + echo "Performing sanity check on ${bareos_dir_config} configuration:" + eval ${command} -t +} + +bareos_dir_reload() { + echo "Performing a graceful reload" + # bconsole always exits with 0, so we can't check the return status for success. + echo "reload" | ${bconsole_command} +} + +extra_commands="reload configtest" run_rc_command "$1" diff --git a/sysutils/bareos-server/files/bareos-fd.in b/sysutils/bareos-server/files/bareos-fd.in index f979cbf2dac..2a45ee7dfb4 100644 --- a/sysutils/bareos-server/files/bareos-fd.in +++ b/sysutils/bareos-server/files/bareos-fd.in @@ -24,7 +24,7 @@ load_rc_config $name : ${bareos_fd_enable="NO"} : ${bareos_fd_flags="-u root -g wheel -v"} -: ${bareos_fd_config="%%PREFIX%%/etc/bareos/bareos-fd.conf"} +: ${bareos_fd_config="%%PREFIX%%/etc/bareos/"} : ${bareos_fd_pidfile="/var/run/bareos/bareos-fd.9102.pid"} command=%%PREFIX%%/sbin/bareos-fd diff --git a/sysutils/bareos-server/files/bareos-sd.in b/sysutils/bareos-server/files/bareos-sd.in index 4793e46fc6f..9c9df6de204 100644 --- a/sysutils/bareos-server/files/bareos-sd.in +++ b/sysutils/bareos-server/files/bareos-sd.in @@ -24,7 +24,7 @@ load_rc_config $name : ${bareos_sd_enable="NO"} : ${bareos_sd_flags="-u bareos -g bareos -v"} -: ${bareos_sd_config="%%PREFIX%%/etc/bareos/bareos-sd.conf"} +: ${bareos_sd_config="%%PREFIX%%/etc/bareos/"} : ${bareos_sd_pidfile="/var/run/bareos/bareos-sd.9103.pid"} command=%%PREFIX%%/sbin/bareos-sd diff --git a/sysutils/bareos-traymonitor/Makefile b/sysutils/bareos-traymonitor/Makefile index c8bd2369ace..25df7276730 100644 --- a/sysutils/bareos-traymonitor/Makefile +++ b/sysutils/bareos-traymonitor/Makefile @@ -3,7 +3,6 @@ PORTNAME= bareos PKGNAMESUFFIX= -traymonitor -PORTREVISION= 1 COMMENT= Backup archiving recovery open sourced (traymonitor) diff --git a/textproc/elasticsearch6/Makefile b/textproc/elasticsearch6/Makefile index 84b950d184f..070ca02f5c2 100644 --- a/textproc/elasticsearch6/Makefile +++ b/textproc/elasticsearch6/Makefile @@ -3,7 +3,7 @@ PORTNAME= elasticsearch PORTVERSION= 6.4.2 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= textproc java devel MASTER_SITES= https://artifacts.elastic.co/downloads/${PORTNAME}/ \ http://mirrors.rit.edu/zi/ @@ -27,6 +27,7 @@ NO_BUILD= yes JAVA_VERSION= 1.8+ USE_RC_SUBR= ${PORTNAME} SHEBANG_FILES= bin/elasticsearch \ + bin/elasticsearch-cli \ bin/elasticsearch-env \ bin/elasticsearch-plugin @@ -36,6 +37,7 @@ OPTIONS_DEFINE= DOCS CONFIG_FILES= elasticsearch.yml log4j2.properties jvm.options BINS= elasticsearch \ + elasticsearch-cli \ elasticsearch-env \ elasticsearch-plugin diff --git a/www/Makefile b/www/Makefile index 744723e84b0..a43a4bd9257 100644 --- a/www/Makefile +++ b/www/Makefile @@ -87,6 +87,7 @@ SUBDIR += claroline SUBDIR += clearsilver SUBDIR += clearsilver-python + SUBDIR += cliqz SUBDIR += closure-compiler SUBDIR += cmsmadesimple SUBDIR += cntlm diff --git a/www/cliqz/Makefile b/www/cliqz/Makefile new file mode 100644 index 00000000000..93ba8c11f88 --- /dev/null +++ b/www/cliqz/Makefile @@ -0,0 +1,110 @@ +# $FreeBSD$ + +PORTNAME= cliqz +DISTVERSION= 1.22.3 +CATEGORIES= www +MASTER_SITES= https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/:amazon \ + http://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${DISTVERSION}/${CLIQZ_LAST_BUILD_ID}/:cliqz +DISTFILES= adult-domains.bin:amazon \ + cliqz@cliqz.com.xpi:cliqz \ + https-everywhere@cliqz.com.xpi:cliqz \ + gdprtool@cliqz.com.xpi:cliqz +EXTRACT_ONLY= ${DISTNAME}${_GITHUB_EXTRACT_SUFX} + +MAINTAINER= santhosh.raju@gmail.com +COMMENT= Secure browser (Mozilla based) with built-in quick search + +LICENSE= MPL20 +LICENSE_FILE= ${WRKSRC}/LICENSE + +FETCH_DEPENDS= ca_root_nss>=0:security/ca_root_nss +LIB_DEPENDS= libdbus-1.so:devel/dbus \ + libdbus-glib-1.so:devel/dbus-glib \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 \ + libnspr4.so:devel/nspr \ + libplc4.so:devel/nspr \ + libplds4.so:devel/nspr \ + libnssutil3.so:security/nss + +BUILD_DEPENDS= autoconf-2.13:devel/autoconf213 \ + bash:shells/bash \ + graphite2>=1.3.12:graphics/graphite2 \ + harfbuzz>=1.8.8:print/harfbuzz \ + icu>=59.1,1:devel/icu \ + libevent>=2.1.8:devel/libevent \ + libvorbis>=1.3.6,3:audio/libvorbis \ + libvpx>=1.5.0:multimedia/libvpx \ + ${LOCALBASE}/libdata/pkgconfig/xt.pc:x11-toolkits/libXt \ + llvm${LLVM_DEFAULT}>=0:devel/llvm${LLVM_DEFAULT} \ + nspr>=4.19:devel/nspr \ + nss>=3.39:security/nss \ + png>=1.6.34:graphics/png \ + ${LOCALBASE}/include/pulse/pulseaudio.h:audio/pulseaudio \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ + rust>=1.28:lang/rust \ + rust-cbindgen>=0.6.2:devel/rust-cbindgen \ + sqlite3>=3.24.0:databases/sqlite3 \ + v4l_compat>0:multimedia/v4l_compat \ + yasm:devel/yasm \ + zip:archivers/zip + +USES= tar:xz gmake pkgconfig gnome python desktop-file-utils + +USE_GNOME= gconf2 gtk20 gtk30 cairo gdkpixbuf2 + +USE_XORG= x11 xcb xcomposite xcursor xdamage xext xfixes xi xrender \ + xcb xt + +LLVM_DEFAULT?= 70 + +USE_GITHUB= yes +GH_ACCOUNT= cliqz-oss +GH_PROJECT= browser-f + +USE_LDCONFIG= yes + +CLIQZ_CHANNEL= release +# If the DISTVERSION is updated, make sure to update the last build id from +# fetch -qo - https://s3.amazonaws.com/dist/${CLIQZ_CHANNEL}/${DISTVERSION}/lastbuildid +CLIQZ_LAST_BUILD_ID= 20181005182933 +CLIQZ_ICON= ${PORTNAME}.png +CLIQZ_ICON_SRC= ${WRKSRC}/mozilla-release/browser/branding/${PORTNAME}/default48.png +MOZ_DESKTOP= ${WRKSRC}/mozilla-release/toolkit/mozapps/installer/linux/rpm/mozilla.desktop +CLIQZ_DESKTOP= ${WRKSRC}/mozilla-release/toolkit/mozapps/installer/linux/rpm/cliqz.desktop + +MAKE_ENV+= LLVM_CONFIG=llvm-config${LLVM_DEFAULT} +MAKE_ENV+= CQZ_RELEASE_CHANNEL=${CLIQZ_CHANNEL} +MAKE_ENV+= CQZ_BUILD_ID=${CLIQZ_LAST_BUILD_ID} + +post-extract: + ${CP} ${DISTDIR}/${DIST_SUBDIR}/adult-domains.bin ${WRKSRC} + ${MKDIR} ${WRKSRC}/obj/dist/bin/browser/features + ${CP} ${DISTDIR}/${DIST_SUBDIR}/cliqz@cliqz.com.xpi \ + ${DISTDIR}/${DIST_SUBDIR}/https-everywhere@cliqz.com.xpi \ + ${DISTDIR}/${DIST_SUBDIR}/gdprtool@cliqz.com.xpi \ + ${WRKSRC}/obj/dist/bin/browser/features +post-patch: + @${CP} ${MOZ_DESKTOP} ${CLIQZ_DESKTOP} + @${REINPLACE_CMD} -e 's/@MOZ_APP_DISPLAYNAME@/Cliqz Internet/g' \ + -e 's/@MOZ_APP_NAME@/${PORTNAME}/g' \ + -e '/Icon=${PORTNAME}/ s/${PORTNAME}/${CLIQZ_ICON}/' \ + -e '/StartupWMClass/d' \ + ${CLIQZ_DESKTOP} +do-build: + (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./magic_build_and_package.sh) + +do-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME} + (cd ${WRKSRC}/obj/dist/${PORTNAME} && \ + ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/${PORTNAME}) + @${CHMOD} 755 ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${PORTNAME}-bin + @${CHMOD} 755 ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${PORTNAME} + +post-install: + ${LN} -sf ${PREFIX}/lib/${PORTNAME}/${PORTNAME}-bin ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + ${INSTALL_DATA} ${CLIQZ_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/ + ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps + @${CP} ${CLIQZ_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${CLIQZ_ICON} + +.include diff --git a/www/cliqz/distinfo b/www/cliqz/distinfo new file mode 100644 index 00000000000..f477db3e166 --- /dev/null +++ b/www/cliqz/distinfo @@ -0,0 +1,11 @@ +TIMESTAMP = 1542458862 +SHA256 (adult-domains.bin) = ca599140fe3c0be40426d5dfba99b9e4280031d6dc7fbe287fb7a0ac44f5978e +SIZE (adult-domains.bin) = 528392 +SHA256 (cliqz@cliqz.com.xpi) = 5038729253e070d80a8a2413d9cb758498f5ea6c30bd6063a837305756fa3216 +SIZE (cliqz@cliqz.com.xpi) = 24114265 +SHA256 (https-everywhere@cliqz.com.xpi) = 231f5f18a931e1e092a233b814b8fe443adcc7d37be8c8c0ac9a8fa887c5e090 +SIZE (https-everywhere@cliqz.com.xpi) = 1991678 +SHA256 (gdprtool@cliqz.com.xpi) = 8e58c58afa60a2e30aeafb52e92bdc4ca03f5caf5594bbdf173752b715a28f40 +SIZE (gdprtool@cliqz.com.xpi) = 259585 +SHA256 (cliqz-oss-browser-f-1.22.3_GH0.tar.gz) = 09e6677fb109363a3d2fd6c676315ee831d8c5901dc420e351f10f0d797432bd +SIZE (cliqz-oss-browser-f-1.22.3_GH0.tar.gz) = 387948437 diff --git a/www/cliqz/files/patch-cliqz__env.sh b/www/cliqz/files/patch-cliqz__env.sh new file mode 100644 index 00000000000..ce6546ac349 --- /dev/null +++ b/www/cliqz/files/patch-cliqz__env.sh @@ -0,0 +1,24 @@ +--- cliqz_env.sh.orig 2018-11-16 13:55:29 UTC ++++ cliqz_env.sh +@@ -78,9 +78,9 @@ export S3_BUCKET=repository.cliqz.com + export S3_BUCKET_SERVICE=cliqz-browser-data + + # check CQZ_BUILD_ID and try to obtain, if not specified +-if [ -z $CQZ_BUILD_ID ]; then +- export CQZ_BUILD_ID="`wget -qO- https://$S3_BUCKET/dist/$CQZ_RELEASE_CHANNEL/$CQZ_VERSION/lastbuildid`" +-fi ++#if [ -z $CQZ_BUILD_ID ]; then ++# export CQZ_BUILD_ID="`wget -qO- https://$S3_BUCKET/dist/$CQZ_RELEASE_CHANNEL/$CQZ_VERSION/lastbuildid`" ++#fi + + if [ -z $CQZ_BUILD_ID ]; then + echo "CQZ_BUILD_ID not specified and can not be obtain from "$S3_BUCKET +@@ -103,7 +103,7 @@ OBJ_DIR=$MOZ_OBJDIR + SRC_BASE=mozilla-release + + # automatic forget tab - start +-wget -O adult-domains.bin https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/adult-domains.bin ++#wget -O adult-domains.bin https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/adult-domains.bin + export CQZ_AUTO_PRIVATE_TAB=1 + export CQZ_ADULT_DOMAINS_BF=../adult-domains.bin + # automatic forget tab - end diff --git a/www/cliqz/files/patch-magic__build__and__package.sh b/www/cliqz/files/patch-magic__build__and__package.sh new file mode 100644 index 00000000000..ca4b1109195 --- /dev/null +++ b/www/cliqz/files/patch-magic__build__and__package.sh @@ -0,0 +1,8 @@ +--- magic_build_and_package.sh.orig 2018-11-12 05:40:39 UTC ++++ magic_build_and_package.sh +@@ -1,4 +1,4 @@ +-#! /bin/bash ++#! /usr/local/bin/bash + + # Optional ENVs: + # CQZ_BUILD_ID - specify special build timestamp or use latest one (depend on channel) diff --git a/www/cliqz/files/patch-mozilla-release_browser_config_cliqz.mozconfig b/www/cliqz/files/patch-mozilla-release_browser_config_cliqz.mozconfig new file mode 100644 index 00000000000..3e43be1a20c --- /dev/null +++ b/www/cliqz/files/patch-mozilla-release_browser_config_cliqz.mozconfig @@ -0,0 +1,10 @@ +--- mozilla-release/browser/config/cliqz.mozconfig.orig 2018-10-05 16:27:24 UTC ++++ mozilla-release/browser/config/cliqz.mozconfig +@@ -10,6 +10,7 @@ ac_add_options --enable-official-brandin + ac_add_options --with-app-name=cliqz # name for binaries + ac_add_options --enable-crashreporter + ac_add_options --enable-js-shell ++ac_add_options --disable-crashreporter + + export MOZ_APP_PROFILE=CLIQZ + export MOZ_AUTOMATION_UPLOAD=1 diff --git a/www/cliqz/files/patch-mozilla-release_config_rules.mk b/www/cliqz/files/patch-mozilla-release_config_rules.mk new file mode 100644 index 00000000000..8a4b5775297 --- /dev/null +++ b/www/cliqz/files/patch-mozilla-release_config_rules.mk @@ -0,0 +1,26 @@ +--- mozilla-release/config/rules.mk.orig 2018-11-17 13:03:00 UTC ++++ mozilla-release/config/rules.mk +@@ -1223,20 +1223,20 @@ $(EXTENSIONS_PATH): + CLIQZ_XPI_PATH = $(EXTENSIONS_PATH)/cliqz@cliqz.com.xpi + $(CLIQZ_XPI_PATH): $(EXTENSIONS_PATH) + echo CLIQZ_XPI_PATH in `pwd` +- wget --output-document $(CLIQZ_XPI_PATH) $(CLIQZ_EXT_URL) ++# wget --output-document $(CLIQZ_XPI_PATH) $(CLIQZ_EXT_URL) + + HTTPSE_XPI_PATH = $(EXTENSIONS_PATH)/https-everywhere@cliqz.com.xpi + $(HTTPSE_XPI_PATH): $(EXTENSIONS_PATH) + ifdef HTTPSE_EXT_URL + echo HTTPSE_XPI_PATH in `pwd` +- wget --output-document $(HTTPSE_XPI_PATH) $(HTTPSE_EXT_URL) ++# wget --output-document $(HTTPSE_XPI_PATH) $(HTTPSE_EXT_URL) + endif + + CONSENTRICK_XPI_PATH = $(EXTENSIONS_PATH)/gdprtool@cliqz.com.xpi + $(CONSENTRICK_XPI_PATH): $(EXTENSIONS_PATH) + ifdef CONSENTRICK_EXT_URL + echo CONSENTRICK_XPI_PATH in `pwd` +- wget --output-document $(CONSENTRICK_XPI_PATH) $(CONSENTRICK_EXT_URL) ++# wget --output-document $(CONSENTRICK_XPI_PATH) $(CONSENTRICK_EXT_URL) + endif + + CLIQZ_ONIONMODE_XPI_PATH = $(EXTENSIONS_PATH)/onionmode@cliqz.com.xpi diff --git a/www/cliqz/files/patch-mozilla-release_ipc_chromium_src_third__party_libevent_evutil__rand.c b/www/cliqz/files/patch-mozilla-release_ipc_chromium_src_third__party_libevent_evutil__rand.c new file mode 100644 index 00000000000..ac4105a35b2 --- /dev/null +++ b/www/cliqz/files/patch-mozilla-release_ipc_chromium_src_third__party_libevent_evutil__rand.c @@ -0,0 +1,11 @@ +--- mozilla-release/ipc/chromium/src/third_party/libevent/evutil_rand.c.orig 2018-10-05 16:27:24 UTC ++++ mozilla-release/ipc/chromium/src/third_party/libevent/evutil_rand.c +@@ -192,7 +192,7 @@ evutil_secure_rng_get_bytes(void *buf, s + ev_arc4random_buf(buf, n); + } + +-#if !defined(__OpenBSD__) && !defined(ANDROID) ++#if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(ANDROID) + void + evutil_secure_rng_add_bytes(const char *buf, size_t n) + { diff --git a/www/cliqz/files/patch-mozilla-release_ipc_chromium_src_third__party_libevent_include_event2_util.h b/www/cliqz/files/patch-mozilla-release_ipc_chromium_src_third__party_libevent_include_event2_util.h new file mode 100644 index 00000000000..945b9a37bea --- /dev/null +++ b/www/cliqz/files/patch-mozilla-release_ipc_chromium_src_third__party_libevent_include_event2_util.h @@ -0,0 +1,11 @@ +--- mozilla-release/ipc/chromium/src/third_party/libevent/include/event2/util.h.orig 2018-11-12 18:39:53 UTC ++++ mozilla-release/ipc/chromium/src/third_party/libevent/include/event2/util.h +@@ -842,7 +842,7 @@ int evutil_secure_rng_init(void); + EVENT2_EXPORT_SYMBOL + int evutil_secure_rng_set_urandom_device_file(char *fname); + +-#if !defined(__OpenBSD__) && !defined(ANDROID) ++#if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(ANDROID) + /** Seed the random number generator with extra random bytes. + + You should almost never need to call this function; it should be diff --git a/www/cliqz/files/patch-mozilla-release_ipc_chromium_src_third__party_libevent_patches_noarc4random.patch b/www/cliqz/files/patch-mozilla-release_ipc_chromium_src_third__party_libevent_patches_noarc4random.patch new file mode 100644 index 00000000000..d7cea03d523 --- /dev/null +++ b/www/cliqz/files/patch-mozilla-release_ipc_chromium_src_third__party_libevent_patches_noarc4random.patch @@ -0,0 +1,68 @@ +--- mozilla-release/ipc/chromium/src/third_party/libevent/patches/openbsd-no-arc4random_addrandom.patch.orig 2018-10-05 16:27:24 UTC ++++ mozilla-release/ipc/chromium/src/third_party/libevent/patches/openbsd-no-arc4random_addrandom.patch +@@ -1,16 +1,16 @@ + diff --git a/ipc/chromium/src/third_party/libevent/evutil_rand.c b/ipc/chromium/src/third_party/libevent/evutil_rand.c + --- a/ipc/chromium/src/third_party/libevent/evutil_rand.c + +++ b/ipc/chromium/src/third_party/libevent/evutil_rand.c +-@@ -187,20 +187,22 @@ ev_arc4random_buf(void *buf, size_t n) ++@@ -187,14 +187,16 @@ ev_arc4random_buf(void *buf, size_t n) + #endif /* } !EVENT__HAVE_ARC4RANDOM */ +- ++ + void + evutil_secure_rng_get_bytes(void *buf, size_t n) + { + ev_arc4random_buf(buf, n); + } +- +-+#if !defined(__OpenBSD__) && !defined(ANDROID) ++ +++#if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(ANDROID) + void + evutil_secure_rng_add_bytes(const char *buf, size_t n) + { +@@ -18,7 +18,7 @@ diff --git a/ipc/chromium/src/third_part + n>(size_t)INT_MAX ? INT_MAX : (int)n); + } + +#endif +- ++ + void + evutil_free_secure_rng_globals_(void) + { +@@ -35,28 +35,28 @@ diff --git a/ipc/chromium/src/third_part + */ + EVENT2_EXPORT_SYMBOL + int evutil_secure_rng_set_urandom_device_file(char *fname); +- +-+#if !defined(__OpenBSD__) && !defined(ANDROID) ++ +++#if !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(ANDROID) + /** Seed the random number generator with extra random bytes. +- ++ + You should almost never need to call this function; it should be + sufficient to invoke evutil_secure_rng_init(), or let Libevent take + care of calling evutil_secure_rng_init() on its own. +- ++ + If you call this function as a _replacement_ for the regular + entropy sources, then you need to be sure that your input + contains a fairly large amount of strong entropy. Doing so is + notoriously hard: most people who try get it wrong. Watch out! +- ++ + @param dat a buffer full of a strong source of random numbers + @param datlen the number of bytes to read from datlen + */ + EVENT2_EXPORT_SYMBOL + void evutil_secure_rng_add_bytes(const char *dat, size_t datlen); + +#endif +- ++ + #ifdef __cplusplus + } + #endif +- ++ + #endif /* EVENT1_EVUTIL_H_INCLUDED_ */ diff --git a/www/cliqz/files/patch-mozilla-release_nsprpub_pr_src_pthreads_ptsynch.c b/www/cliqz/files/patch-mozilla-release_nsprpub_pr_src_pthreads_ptsynch.c new file mode 100644 index 00000000000..7043c8e9ab0 --- /dev/null +++ b/www/cliqz/files/patch-mozilla-release_nsprpub_pr_src_pthreads_ptsynch.c @@ -0,0 +1,12 @@ +--- mozilla-release/nsprpub/pr/src/pthreads/ptsynch.c.orig 2018-10-05 16:27:24 UTC ++++ mozilla-release/nsprpub/pr/src/pthreads/ptsynch.c +@@ -911,7 +911,8 @@ PR_IMPLEMENT(PRStatus) PR_DeleteSemaphor + * From the semctl(2) man page in glibc 2.0 + */ + #if (defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)) \ +- || defined(FREEBSD) || defined(OPENBSD) || defined(BSDI) \ ++ || (defined(FREEBSD) && __FreeBSD_version < 1200059) \ ++ || defined(OPENBSD) || defined(BSDI) \ + || defined(DARWIN) || defined(SYMBIAN) + /* union semun is defined by including */ + #else diff --git a/www/cliqz/pkg-descr b/www/cliqz/pkg-descr new file mode 100644 index 00000000000..154c3bc0c55 --- /dev/null +++ b/www/cliqz/pkg-descr @@ -0,0 +1,5 @@ +Cliqz develops novel Internet browsers that incorporate proprietary +features such as search and anti-tracking. Cliqz desktop browser is +based on Mozilla Firefox. + +WWW: https://cliqz.com/en/desktop diff --git a/www/cliqz/pkg-plist b/www/cliqz/pkg-plist new file mode 100644 index 00000000000..e0b3bf9ed5c --- /dev/null +++ b/www/cliqz/pkg-plist @@ -0,0 +1,55 @@ +bin/cliqz +lib/cliqz/application.ini +lib/cliqz/browser/adult-domains.bin +lib/cliqz/browser/blocklist.xml +lib/cliqz/browser/chrome.manifest +lib/cliqz/browser/chrome/icons/default/default128.png +lib/cliqz/browser/chrome/icons/default/default16.png +lib/cliqz/browser/chrome/icons/default/default32.png +lib/cliqz/browser/chrome/icons/default/default48.png +lib/cliqz/browser/chrome/icons/default/default64.png +lib/cliqz/browser/features/cliqz@cliqz.com.xpi +lib/cliqz/browser/features/gdprtool@cliqz.com.xpi +lib/cliqz/browser/features/https-everywhere@cliqz.com.xpi +lib/cliqz/browser/omni.ja +lib/cliqz/chrome.manifest +lib/cliqz/cliqz +lib/cliqz/cliqz-bin +lib/cliqz/cliqz.cfg +lib/cliqz/defaults/pref/channel-prefs.js +lib/cliqz/dependentlibs.list +lib/cliqz/gmp-clearkey/0.1/libclearkey.so +lib/cliqz/gmp-clearkey/0.1/manifest.json +lib/cliqz/gtk2/libmozgtk.so +lib/cliqz/icons/updater.png +lib/cliqz/libfreebl3.chk +lib/cliqz/libfreebl3.so +lib/cliqz/liblgpllibs.so +lib/cliqz/libmozavcodec.so +lib/cliqz/libmozavutil.so +lib/cliqz/libmozgtk.so +lib/cliqz/libmozsqlite3.so +lib/cliqz/libnspr4.so +lib/cliqz/libnss3.so +lib/cliqz/libnssckbi.so +lib/cliqz/libnssdbm3.chk +lib/cliqz/libnssdbm3.so +lib/cliqz/libnssutil3.so +lib/cliqz/libplc4.so +lib/cliqz/libplds4.so +lib/cliqz/libsmime3.so +lib/cliqz/libsoftokn3.chk +lib/cliqz/libsoftokn3.so +lib/cliqz/libssl3.so +lib/cliqz/libxul.so +lib/cliqz/omni.ja +lib/cliqz/pingsender +lib/cliqz/platform.ini +lib/cliqz/plugin-container +lib/cliqz/precomplete +lib/cliqz/removed-files +lib/cliqz/update-settings.ini +lib/cliqz/updater +lib/cliqz/updater.ini +share/applications/cliqz.desktop +share/pixmaps/cliqz.png diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index ad5fd09cb5b..b576433a2ff 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -3,7 +3,7 @@ PORTNAME= firefox DISTVERSION= 60.3.0 -PORTREVISION= 3 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ @@ -29,13 +29,12 @@ BUILD_DEPENDS= nspr>=4.19:devel/nspr \ autoconf-2.13:devel/autoconf213 \ yasm:devel/yasm \ zip:archivers/zip -# soundtouch>=1.9.0:audio/soundtouch \ USE_GECKO= gecko CPE_PRODUCT= ${PORTNAME}_esr CONFLICTS_INSTALL= firefox MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= -cairo -soundtouch +USE_MOZILLA= # empty USES= tar:xz @@ -49,8 +48,6 @@ MOZ_OPTIONS= --enable-application=browser \ MOZ_OPTIONS+= --enable-pie -OPTIONS_EXCLUDE= BUNDLED_CAIRO - .include "${.CURDIR}/../../www/firefox/Makefile.options" post-patch: diff --git a/www/firefox-esr/files/patch-bug1021761 b/www/firefox-esr/files/patch-bug1021761 deleted file mode 100644 index 245f4fd8695..00000000000 --- a/www/firefox-esr/files/patch-bug1021761 +++ /dev/null @@ -1,1269 +0,0 @@ -commit f9bcf9c81c4a -Author: Evgeniy Vodolazskiy -Date: Tue Sep 9 14:38:00 2014 -0700 - - Bug 1021761 - Make ALSA optional on Linux, allowing fallback to another backend. r=kinetik r=glandium ---- - media/libcubeb/gtest/moz.build | 1 - - media/libcubeb/src/cubeb_alsa.c | 228 +++++++++++++++++++++++++++++----------- - toolkit/library/moz.build | 3 - - 3 files changed, 168 insertions(+), 64 deletions(-) - -diff --git media/libcubeb/gtest/moz.build media/libcubeb/gtest/moz.build -index 558130188c2e..0cf157d41903 100644 ---- media/libcubeb/gtest/moz.build -+++ media/libcubeb/gtest/moz.build -@@ -72,7 +72,6 @@ elif CONFIG['OS_TARGET'] == 'OpenBSD': - 'sndio', - ] - else: -- OS_LIBS += CONFIG['MOZ_ALSA_LIBS'] - OS_LIBS += CONFIG['MOZ_PULSEAUDIO_LIBS'] - - if CONFIG['CC_TYPE'] in ('clang', 'gcc'): -diff --git media/libcubeb/src/cubeb_alsa.c media/libcubeb/src/cubeb_alsa.c -index bfd4d8f199d4..213c1eaa3d07 100644 ---- media/libcubeb/src/cubeb_alsa.c -+++ media/libcubeb/src/cubeb_alsa.c -@@ -12,6 +12,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -25,6 +26,52 @@ - - #define ALSA_PA_PLUGIN "ALSA <-> PulseAudio PCM I/O Plugin" - -+#ifdef DISABLE_LIBASOUND_DLOPEN -+#define WRAP(x) x -+#else -+#define WRAP(x) cubeb_##x -+#define MAKE_TYPEDEF(x) static typeof(x) * cubeb_##x -+MAKE_TYPEDEF(snd_config); -+MAKE_TYPEDEF(snd_config_add); -+MAKE_TYPEDEF(snd_config_copy); -+MAKE_TYPEDEF(snd_config_delete); -+MAKE_TYPEDEF(snd_config_get_id); -+MAKE_TYPEDEF(snd_config_get_string); -+MAKE_TYPEDEF(snd_config_imake_integer); -+MAKE_TYPEDEF(snd_config_search); -+MAKE_TYPEDEF(snd_config_search_definition); -+MAKE_TYPEDEF(snd_lib_error_set_handler); -+MAKE_TYPEDEF(snd_pcm_avail_update); -+MAKE_TYPEDEF(snd_pcm_close); -+MAKE_TYPEDEF(snd_pcm_delay); -+MAKE_TYPEDEF(snd_pcm_drain); -+MAKE_TYPEDEF(snd_pcm_frames_to_bytes); -+MAKE_TYPEDEF(snd_pcm_get_params); -+/* snd_pcm_hw_params_alloca is actually a macro */ -+/* MAKE_TYPEDEF(snd_pcm_hw_params_alloca); */ -+MAKE_TYPEDEF(snd_pcm_hw_params_sizeof); -+#define snd_pcm_hw_params_sizeof cubeb_snd_pcm_hw_params_sizeof -+MAKE_TYPEDEF(snd_pcm_hw_params_any); -+MAKE_TYPEDEF(snd_pcm_hw_params_get_channels_max); -+MAKE_TYPEDEF(snd_pcm_hw_params_get_rate); -+MAKE_TYPEDEF(snd_pcm_hw_params_set_rate_near); -+MAKE_TYPEDEF(snd_pcm_nonblock); -+MAKE_TYPEDEF(snd_pcm_open); -+MAKE_TYPEDEF(snd_pcm_open_lconf); -+MAKE_TYPEDEF(snd_pcm_pause); -+MAKE_TYPEDEF(snd_pcm_poll_descriptors); -+MAKE_TYPEDEF(snd_pcm_poll_descriptors_count); -+MAKE_TYPEDEF(snd_pcm_poll_descriptors_revents); -+MAKE_TYPEDEF(snd_pcm_readi); -+MAKE_TYPEDEF(snd_pcm_recover); -+MAKE_TYPEDEF(snd_pcm_set_params); -+MAKE_TYPEDEF(snd_pcm_start); -+MAKE_TYPEDEF(snd_pcm_state); -+MAKE_TYPEDEF(snd_pcm_writei); -+ -+#undef MAKE_TYPEDEF -+#endif -+ - /* ALSA is not thread-safe. snd_pcm_t instances are individually protected - by the owning cubeb_stream's mutex. snd_pcm_t creation and destruction - is not thread-safe until ALSA 1.0.24 (see alsa-lib.git commit 91c9c8f1), -@@ -65,6 +112,8 @@ struct cubeb { - workaround is not required. */ - snd_config_t * local_config; - int is_pa; -+ -+ void * libasound; - }; - - enum stream_state { -@@ -245,8 +294,8 @@ set_timeout(struct timeval * timeout, unsigned int ms) - static void - stream_buffer_decrement(cubeb_stream * stm, long count) - { -- char * bufremains = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, count); -- memmove(stm->buffer, bufremains, snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes - count)); -+ char * bufremains = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, count); -+ memmove(stm->buffer, bufremains, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes - count)); - stm->bufframes -= count; - } - -@@ -278,9 +327,9 @@ alsa_process_stream(cubeb_stream * stm) - /* Call _poll_descriptors_revents() even if we don't use it - to let underlying plugins clear null events. Otherwise poll() - may wake up again and again, producing unnecessary CPU usage. */ -- snd_pcm_poll_descriptors_revents(stm->pcm, stm->fds, stm->nfds, &revents); -+ WRAP(snd_pcm_poll_descriptors_revents)(stm->pcm, stm->fds, stm->nfds, &revents); - -- avail = snd_pcm_avail_update(stm->pcm); -+ avail = WRAP(snd_pcm_avail_update)(stm->pcm); - - /* Got null event? Bail and wait for another wakeup. */ - if (avail == 0) { -@@ -303,7 +352,7 @@ alsa_process_stream(cubeb_stream * stm) - // TODO: should it be marked as DRAINING? - } - -- got = snd_pcm_readi(stm->pcm, stm->buffer+stm->bufframes, avail); -+ got = WRAP(snd_pcm_readi)(stm->pcm, stm->buffer+stm->bufframes, avail); - - if (got < 0) { - avail = got; // the error handler below will recover us -@@ -347,7 +396,7 @@ alsa_process_stream(cubeb_stream * stm) - (!stm->other_stream || stm->other_stream->bufframes > 0)) { - long got = avail - stm->bufframes; - void * other_buffer = stm->other_stream ? stm->other_stream->buffer : NULL; -- char * buftail = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes); -+ char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes); - - /* Correct read size to the other stream available frames */ - if (stm->other_stream && got > (snd_pcm_sframes_t) stm->other_stream->bufframes) { -@@ -374,8 +423,8 @@ alsa_process_stream(cubeb_stream * stm) - long drain_frames = avail - stm->bufframes; - double drain_time = (double) drain_frames / stm->params.rate; - -- char * buftail = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes); -- memset(buftail, 0, snd_pcm_frames_to_bytes(stm->pcm, drain_frames)); -+ char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes); -+ memset(buftail, 0, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, drain_frames)); - stm->bufframes = avail; - - /* Mark as draining, unless we're waiting for capture */ -@@ -402,7 +451,7 @@ alsa_process_stream(cubeb_stream * stm) - } - } - -- wrote = snd_pcm_writei(stm->pcm, stm->buffer, avail); -+ wrote = WRAP(snd_pcm_writei)(stm->pcm, stm->buffer, avail); - if (wrote < 0) { - avail = wrote; // the error handler below will recover us - } else { -@@ -415,13 +464,13 @@ alsa_process_stream(cubeb_stream * stm) - - /* Got some error? Let's try to recover the stream. */ - if (avail < 0) { -- avail = snd_pcm_recover(stm->pcm, avail, 0); -+ avail = WRAP(snd_pcm_recover)(stm->pcm, avail, 0); - - /* Capture pcm must be started after initial setup/recover */ - if (avail >= 0 && - stm->stream_type == SND_PCM_STREAM_CAPTURE && -- snd_pcm_state(stm->pcm) == SND_PCM_STATE_PREPARED) { -- avail = snd_pcm_start(stm->pcm); -+ WRAP(snd_pcm_state)(stm->pcm) == SND_PCM_STATE_PREPARED) { -+ avail = WRAP(snd_pcm_start)(stm->pcm); - } - } - -@@ -537,26 +586,26 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm) - - slave_def = NULL; - -- r = snd_config_search(root_pcm, "slave", &slave_pcm); -+ r = WRAP(snd_config_search)(root_pcm, "slave", &slave_pcm); - if (r < 0) { - return NULL; - } - -- r = snd_config_get_string(slave_pcm, &string); -+ r = WRAP(snd_config_get_string)(slave_pcm, &string); - if (r >= 0) { -- r = snd_config_search_definition(lconf, "pcm_slave", string, &slave_def); -+ r = WRAP(snd_config_search_definition)(lconf, "pcm_slave", string, &slave_def); - if (r < 0) { - return NULL; - } - } - - do { -- r = snd_config_search(slave_def ? slave_def : slave_pcm, "pcm", &pcm); -+ r = WRAP(snd_config_search)(slave_def ? slave_def : slave_pcm, "pcm", &pcm); - if (r < 0) { - break; - } - -- r = snd_config_get_string(slave_def ? slave_def : slave_pcm, &string); -+ r = WRAP(snd_config_get_string)(slave_def ? slave_def : slave_pcm, &string); - if (r < 0) { - break; - } -@@ -565,7 +614,7 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm) - if (r < 0 || r > (int) sizeof(node_name)) { - break; - } -- r = snd_config_search(lconf, node_name, &pcm); -+ r = WRAP(snd_config_search)(lconf, node_name, &pcm); - if (r < 0) { - break; - } -@@ -574,7 +623,7 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm) - } while (0); - - if (slave_def) { -- snd_config_delete(slave_def); -+ WRAP(snd_config_delete)(slave_def); - } - - return NULL; -@@ -597,22 +646,22 @@ init_local_config_with_workaround(char const * pcm_name) - - lconf = NULL; - -- if (snd_config == NULL) { -+ if (*WRAP(snd_config) == NULL) { - return NULL; - } - -- r = snd_config_copy(&lconf, snd_config); -+ r = WRAP(snd_config_copy)(&lconf, *WRAP(snd_config)); - if (r < 0) { - return NULL; - } - - do { -- r = snd_config_search_definition(lconf, "pcm", pcm_name, &pcm_node); -+ r = WRAP(snd_config_search_definition)(lconf, "pcm", pcm_name, &pcm_node); - if (r < 0) { - break; - } - -- r = snd_config_get_id(pcm_node, &string); -+ r = WRAP(snd_config_get_id)(pcm_node, &string); - if (r < 0) { - break; - } -@@ -621,7 +670,7 @@ init_local_config_with_workaround(char const * pcm_name) - if (r < 0 || r > (int) sizeof(node_name)) { - break; - } -- r = snd_config_search(lconf, node_name, &pcm_node); -+ r = WRAP(snd_config_search)(lconf, node_name, &pcm_node); - if (r < 0) { - break; - } -@@ -632,12 +681,12 @@ init_local_config_with_workaround(char const * pcm_name) - } - - /* Fetch the PCM node's type, and bail out if it's not the PulseAudio plugin. */ -- r = snd_config_search(pcm_node, "type", &node); -+ r = WRAP(snd_config_search)(pcm_node, "type", &node); - if (r < 0) { - break; - } - -- r = snd_config_get_string(node, &string); -+ r = WRAP(snd_config_get_string)(node, &string); - if (r < 0) { - break; - } -@@ -648,18 +697,18 @@ init_local_config_with_workaround(char const * pcm_name) - - /* Don't clobber an explicit existing handle_underrun value, set it only - if it doesn't already exist. */ -- r = snd_config_search(pcm_node, "handle_underrun", &node); -+ r = WRAP(snd_config_search)(pcm_node, "handle_underrun", &node); - if (r != -ENOENT) { - break; - } - - /* Disable pcm_pulse's asynchronous underrun handling. */ -- r = snd_config_imake_integer(&node, "handle_underrun", 0); -+ r = WRAP(snd_config_imake_integer)(&node, "handle_underrun", 0); - if (r < 0) { - break; - } - -- r = snd_config_add(pcm_node, node); -+ r = WRAP(snd_config_add)(pcm_node, node); - if (r < 0) { - break; - } -@@ -667,7 +716,7 @@ init_local_config_with_workaround(char const * pcm_name) - return lconf; - } while (0); - -- snd_config_delete(lconf); -+ WRAP(snd_config_delete)(lconf); - - return NULL; - } -@@ -679,9 +728,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, char const * pcm_name, snd_pcm_stream_t s - - pthread_mutex_lock(&cubeb_alsa_mutex); - if (local_config) { -- r = snd_pcm_open_lconf(pcm, pcm_name, stream, SND_PCM_NONBLOCK, local_config); -+ r = WRAP(snd_pcm_open_lconf)(pcm, pcm_name, stream, SND_PCM_NONBLOCK, local_config); - } else { -- r = snd_pcm_open(pcm, pcm_name, stream, SND_PCM_NONBLOCK); -+ r = WRAP(snd_pcm_open)(pcm, pcm_name, stream, SND_PCM_NONBLOCK); - } - pthread_mutex_unlock(&cubeb_alsa_mutex); - -@@ -694,7 +743,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm) - int r; - - pthread_mutex_lock(&cubeb_alsa_mutex); -- r = snd_pcm_close(pcm); -+ r = WRAP(snd_pcm_close)(pcm); - pthread_mutex_unlock(&cubeb_alsa_mutex); - - return r; -@@ -757,12 +806,65 @@ alsa_init(cubeb ** context, char const * context_name) - pthread_attr_t attr; - snd_pcm_t * dummy; - -+ void * libasound = NULL; -+ -+#ifndef DISABLE_LIBASOUND_DLOPEN -+ libasound = dlopen("libasound.so", RTLD_LAZY); -+ if (!libasound) { -+ return CUBEB_ERROR; -+ } -+ -+#define LOAD(x) do { \ -+ cubeb_##x = dlsym(libasound, #x); \ -+ if (!cubeb_##x) { \ -+ dlclose(libasound); \ -+ return CUBEB_ERROR; \ -+ } \ -+ } while(0) -+ -+ LOAD(snd_config); -+ LOAD(snd_config_add); -+ LOAD(snd_config_copy); -+ LOAD(snd_config_delete); -+ LOAD(snd_config_get_id); -+ LOAD(snd_config_get_string); -+ LOAD(snd_config_imake_integer); -+ LOAD(snd_config_search); -+ LOAD(snd_config_search_definition); -+ LOAD(snd_lib_error_set_handler); -+ LOAD(snd_pcm_avail_update); -+ LOAD(snd_pcm_close); -+ LOAD(snd_pcm_delay); -+ LOAD(snd_pcm_drain); -+ LOAD(snd_pcm_frames_to_bytes); -+ LOAD(snd_pcm_get_params); -+ /* snd_pcm_hw_params_alloca is actually a macro */ -+ /* LOAD(snd_pcm_hw_params_alloca); */ -+ LOAD(snd_pcm_hw_params_sizeof); -+ LOAD(snd_pcm_hw_params_any); -+ LOAD(snd_pcm_hw_params_get_channels_max); -+ LOAD(snd_pcm_hw_params_get_rate); -+ LOAD(snd_pcm_hw_params_set_rate_near); -+ LOAD(snd_pcm_nonblock); -+ LOAD(snd_pcm_open); -+ LOAD(snd_pcm_open_lconf); -+ LOAD(snd_pcm_pause); -+ LOAD(snd_pcm_poll_descriptors); -+ LOAD(snd_pcm_poll_descriptors_count); -+ LOAD(snd_pcm_poll_descriptors_revents); -+ LOAD(snd_pcm_recover); -+ LOAD(snd_pcm_set_params); -+ LOAD(snd_pcm_state); -+ LOAD(snd_pcm_writei); -+ -+#undef LOAD -+#endif - assert(context); - *context = NULL; - - pthread_mutex_lock(&cubeb_alsa_mutex); - if (!cubeb_alsa_error_handler_set) { -- snd_lib_error_set_handler(silent_error_handler); -+ WRAP(snd_lib_error_set_handler)(silent_error_handler); - cubeb_alsa_error_handler_set = 1; - } - pthread_mutex_unlock(&cubeb_alsa_mutex); -@@ -770,6 +872,8 @@ alsa_init(cubeb ** context, char const * context_name) - ctx = calloc(1, sizeof(*ctx)); - assert(ctx); - -+ ctx->libasound = libasound; -+ - ctx->ops = &alsa_ops; - - r = pthread_mutex_init(&ctx->mutex, NULL); -@@ -819,7 +923,7 @@ alsa_init(cubeb ** context, char const * context_name) - config fails with EINVAL, the PA PCM is too old for this workaround. */ - if (r == -EINVAL) { - pthread_mutex_lock(&cubeb_alsa_mutex); -- snd_config_delete(ctx->local_config); -+ WRAP(snd_config_delete)(ctx->local_config); - pthread_mutex_unlock(&cubeb_alsa_mutex); - ctx->local_config = NULL; - } else if (r >= 0) { -@@ -859,9 +963,13 @@ alsa_destroy(cubeb * ctx) - pthread_mutex_destroy(&ctx->mutex); - free(ctx->fds); - -+ if (ctx->libasound) { -+ dlclose(ctx->libasound); -+ } -+ - if (ctx->local_config) { - pthread_mutex_lock(&cubeb_alsa_mutex); -- snd_config_delete(ctx->local_config); -+ WRAP(snd_config_delete)(ctx->local_config); - pthread_mutex_unlock(&cubeb_alsa_mutex); - } - -@@ -948,7 +1056,7 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream - return CUBEB_ERROR; - } - -- r = snd_pcm_nonblock(stm->pcm, 1); -+ r = WRAP(snd_pcm_nonblock)(stm->pcm, 1); - assert(r == 0); - - latency_us = latency_frames * 1e6 / stm->params.rate; -@@ -961,7 +1069,7 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream - latency_us = latency_us < min_latency ? min_latency: latency_us; - } - -- r = snd_pcm_set_params(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED, -+ r = WRAP(snd_pcm_set_params)(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED, - stm->params.channels, stm->params.rate, 1, - latency_us); - if (r < 0) { -@@ -969,20 +1077,20 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream - return CUBEB_ERROR_INVALID_FORMAT; - } - -- r = snd_pcm_get_params(stm->pcm, &stm->buffer_size, &period_size); -+ r = WRAP(snd_pcm_get_params)(stm->pcm, &stm->buffer_size, &period_size); - assert(r == 0); - - /* Double internal buffer size to have enough space when waiting for the other side of duplex connection */ - stm->buffer_size *= 2; -- stm->buffer = calloc(1, snd_pcm_frames_to_bytes(stm->pcm, stm->buffer_size)); -+ stm->buffer = calloc(1, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->buffer_size)); - assert(stm->buffer); - -- stm->nfds = snd_pcm_poll_descriptors_count(stm->pcm); -+ stm->nfds = WRAP(snd_pcm_poll_descriptors_count)(stm->pcm); - assert(stm->nfds > 0); - - stm->saved_fds = calloc(stm->nfds, sizeof(struct pollfd)); - assert(stm->saved_fds); -- r = snd_pcm_poll_descriptors(stm->pcm, stm->saved_fds, stm->nfds); -+ r = WRAP(snd_pcm_poll_descriptors)(stm->pcm, stm->saved_fds, stm->nfds); - assert((nfds_t) r == stm->nfds); - - if (alsa_register_stream(ctx, stm) != 0) { -@@ -1054,7 +1162,7 @@ alsa_stream_destroy(cubeb_stream * stm) - pthread_mutex_lock(&stm->mutex); - if (stm->pcm) { - if (stm->state == DRAINING) { -- snd_pcm_drain(stm->pcm); -+ WRAP(snd_pcm_drain)(stm->pcm); - } - alsa_locked_pcm_close(stm->pcm); - stm->pcm = NULL; -@@ -1100,12 +1208,12 @@ alsa_get_max_channel_count(cubeb * ctx, uint32_t * max_channels) - - assert(stm); - -- r = snd_pcm_hw_params_any(stm->pcm, hw_params); -+ r = WRAP(snd_pcm_hw_params_any)(stm->pcm, hw_params); - if (r < 0) { - return CUBEB_ERROR; - } - -- r = snd_pcm_hw_params_get_channels_max(hw_params, max_channels); -+ r = WRAP(snd_pcm_hw_params_get_channels_max)(hw_params, max_channels); - if (r < 0) { - return CUBEB_ERROR; - } -@@ -1126,34 +1234,34 @@ alsa_get_preferred_sample_rate(cubeb * ctx, uint32_t * rate) { - - /* get a pcm, disabling resampling, so we get a rate the - * hardware/dmix/pulse/etc. supports. */ -- r = snd_pcm_open(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK, SND_PCM_NO_AUTO_RESAMPLE); -+ r = WRAP(snd_pcm_open)(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK, SND_PCM_NO_AUTO_RESAMPLE); - if (r < 0) { - return CUBEB_ERROR; - } - -- r = snd_pcm_hw_params_any(pcm, hw_params); -+ r = WRAP(snd_pcm_hw_params_any)(pcm, hw_params); - if (r < 0) { -- snd_pcm_close(pcm); -+ WRAP(snd_pcm_close)(pcm); - return CUBEB_ERROR; - } - -- r = snd_pcm_hw_params_get_rate(hw_params, rate, &dir); -+ r = WRAP(snd_pcm_hw_params_get_rate)(hw_params, rate, &dir); - if (r >= 0) { - /* There is a default rate: use it. */ -- snd_pcm_close(pcm); -+ WRAP(snd_pcm_close)(pcm); - return CUBEB_OK; - } - - /* Use a common rate, alsa may adjust it based on hw/etc. capabilities. */ - *rate = 44100; - -- r = snd_pcm_hw_params_set_rate_near(pcm, hw_params, rate, NULL); -+ r = WRAP(snd_pcm_hw_params_set_rate_near)(pcm, hw_params, rate, NULL); - if (r < 0) { -- snd_pcm_close(pcm); -+ WRAP(snd_pcm_close)(pcm); - return CUBEB_ERROR; - } - -- snd_pcm_close(pcm); -+ WRAP(snd_pcm_close)(pcm); - - return CUBEB_OK; - } -@@ -1186,10 +1294,10 @@ alsa_stream_start(cubeb_stream * stm) - pthread_mutex_lock(&stm->mutex); - /* Capture pcm must be started after initial setup/recover */ - if (stm->stream_type == SND_PCM_STREAM_CAPTURE && -- snd_pcm_state(stm->pcm) == SND_PCM_STATE_PREPARED) { -- snd_pcm_start(stm->pcm); -+ WRAP(snd_pcm_state)(stm->pcm) == SND_PCM_STATE_PREPARED) { -+ WRAP(snd_pcm_start)(stm->pcm); - } -- snd_pcm_pause(stm->pcm, 0); -+ WRAP(snd_pcm_pause)(stm->pcm, 0); - gettimeofday(&stm->last_activity, NULL); - pthread_mutex_unlock(&stm->mutex); - -@@ -1229,7 +1337,7 @@ alsa_stream_stop(cubeb_stream * stm) - pthread_mutex_unlock(&ctx->mutex); - - pthread_mutex_lock(&stm->mutex); -- snd_pcm_pause(stm->pcm, 1); -+ WRAP(snd_pcm_pause)(stm->pcm, 1); - pthread_mutex_unlock(&stm->mutex); - - return CUBEB_OK; -@@ -1245,8 +1353,8 @@ alsa_stream_get_position(cubeb_stream * stm, uint64_t * position) - pthread_mutex_lock(&stm->mutex); - - delay = -1; -- if (snd_pcm_state(stm->pcm) != SND_PCM_STATE_RUNNING || -- snd_pcm_delay(stm->pcm, &delay) != 0) { -+ if (WRAP(snd_pcm_state)(stm->pcm) != SND_PCM_STATE_RUNNING || -+ WRAP(snd_pcm_delay)(stm->pcm, &delay) != 0) { - *position = stm->last_position; - pthread_mutex_unlock(&stm->mutex); - return CUBEB_OK; -@@ -1271,7 +1379,7 @@ alsa_stream_get_latency(cubeb_stream * stm, uint32_t * latency) - snd_pcm_sframes_t delay; - /* This function returns the delay in frames until a frame written using - snd_pcm_writei is sent to the DAC. The DAC delay should be < 1ms anyways. */ -- if (snd_pcm_delay(stm->pcm, &delay)) { -+ if (WRAP(snd_pcm_delay)(stm->pcm, &delay)) { - return CUBEB_ERROR; - } - -diff --git toolkit/library/moz.build toolkit/library/moz.build -index b0df6b98b91f..e06592daa265 100644 ---- toolkit/library/moz.build -+++ toolkit/library/moz.build -@@ -247,9 +247,6 @@ if CONFIG['MOZ_SYSTEM_LIBVPX']: - if not CONFIG['MOZ_TREE_PIXMAN']: - OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS'] - --if CONFIG['MOZ_ALSA']: -- OS_LIBS += CONFIG['MOZ_ALSA_LIBS'] -- - if CONFIG['HAVE_CLOCK_MONOTONIC']: - OS_LIBS += CONFIG['REALTIME_LIBS'] - - -commit 161bcd671217 -Author: Evgeniy Vodolazskiy -Date: Wed Sep 3 10:47:00 2014 -0700 - - Bug 1021761 - Add OSS backend to libcubeb, default but last on Linux. r=kinetik r=glandium ---- - build/moz.configure/old.configure | 1 + - dom/media/CubebUtils.cpp | 3 +- - media/libcubeb/AUTHORS | 1 + - media/libcubeb/src/cubeb.c | 10 + - media/libcubeb/src/cubeb_oss.c | 453 ++++++++++++++++++++++++++++++++++++++ - media/libcubeb/src/moz.build | 7 + - media/libcubeb/update.sh | 1 + - old-configure.in | 62 ++++++ - toolkit/library/moz.build | 3 + - 9 files changed, 540 insertions(+), 1 deletion(-) - -diff --git build/moz.configure/old.configure build/moz.configure/old.configure -index 17d0c5bf3420..3e6dbc16ca14 100644 ---- build/moz.configure/old.configure -+++ build/moz.configure/old.configure -@@ -262,6 +262,7 @@ def old_configure_options(*options): - '--with-nspr-prefix', - '--with-nss-exec-prefix', - '--with-nss-prefix', -+ '--with-oss', - '--with-pthreads', - '--with-qemu-exe', - '--with-sixgill', -diff --git dom/media/CubebUtils.cpp dom/media/CubebUtils.cpp -index 88063ed3a4d6..8613f86dbd16 100644 ---- dom/media/CubebUtils.cpp -+++ dom/media/CubebUtils.cpp -@@ -149,7 +149,8 @@ const char* AUDIOSTREAM_BACKEND_ID_STR[] = { - "sndio", - "opensl", - "audiotrack", -- "kai" -+ "kai", -+ "oss", - }; - /* Index for failures to create an audio stream the first time. */ - const int CUBEB_BACKEND_INIT_FAILURE_FIRST = -diff --git media/libcubeb/AUTHORS media/libcubeb/AUTHORS -index f0f9595227f2..e7e7048190ab 100644 ---- media/libcubeb/AUTHORS -+++ media/libcubeb/AUTHORS -@@ -4,6 +4,7 @@ Michael Wu - Paul Adenot - David Richards - Sebastien Alaiwan -+Evgeniy Vodolazskiy - KO Myung-Hun - Haakon Sporsheim - Alex Chronopoulos -diff --git media/libcubeb/src/cubeb.c media/libcubeb/src/cubeb.c -index bb35e0ce349f..e523d94108a3 100644 ---- media/libcubeb/src/cubeb.c -+++ media/libcubeb/src/cubeb.c -@@ -60,6 +60,9 @@ int audiotrack_init(cubeb ** context, char const * context_name); - #if defined(USE_KAI) - int kai_init(cubeb ** context, char const * context_name); - #endif -+#if defined(USE_OSS) -+int oss_init(cubeb ** context, char const * context_name); -+#endif - - static int - validate_stream_params(cubeb_stream_params * input_stream_params, -@@ -159,6 +162,10 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam - } else if (!strcmp(backend_name, "kai")) { - #if defined(USE_KAI) - init_oneshot = kai_init; -+#endif -+ } else if (!strcmp(backend_name, "oss")) { -+#if defined(USE_OSS) -+ init_oneshot = oss_init; - #endif - } else { - /* Already set */ -@@ -203,6 +210,9 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam - #endif - #if defined(USE_KAI) - kai_init, -+#endif -+#if defined(USE_OSS) -+ oss_init, - #endif - }; - int i; -diff --git media/libcubeb/src/cubeb_oss.c media/libcubeb/src/cubeb_oss.c -new file mode 100644 -index 000000000000..7d96168b9ea6 ---- /dev/null -+++ media/libcubeb/src/cubeb_oss.c -@@ -0,0 +1,454 @@ -+/* -+ * Copyright © 2014 Mozilla Foundation -+ * -+ * This program is made available under an ISC-style license. See the -+ * accompanying file LICENSE for details. -+ */ -+#if defined(HAVE_SYS_SOUNDCARD_H) -+#include -+#else -+#include -+#endif -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "cubeb/cubeb.h" -+#include "cubeb-internal.h" -+ -+#ifndef CUBEB_OSS_DEFAULT_OUTPUT -+#define CUBEB_OSS_DEFAULT_OUTPUT "/dev/dsp" -+#endif -+ -+#define OSS_BUFFER_SIZE 1024 -+ -+struct cubeb { -+ struct cubeb_ops const * ops; -+}; -+ -+struct cubeb_stream { -+ /* Note: Must match cubeb_stream layout in cubeb.c. */ -+ cubeb * context; -+ void * user_ptr; -+ /**/ -+ -+ cubeb_data_callback data_callback; -+ cubeb_state_callback state_callback; -+ float volume; -+ float panning; -+ -+ pthread_mutex_t state_mutex; -+ pthread_cond_t state_cond; -+ -+ int running; -+ int stopped; -+ int floating; -+ -+ /* These two vars are needed to support old versions of OSS */ -+ unsigned int position_bytes; -+ unsigned int last_position_bytes; -+ -+ uint64_t written_frags; /* The number of fragments written to /dev/dsp */ -+ uint64_t missed_frags; /* fragments output with stopped stream */ -+ -+ cubeb_stream_params params; -+ int fd; -+ pthread_t th; -+}; -+ -+static struct cubeb_ops const oss_ops; -+ -+int oss_init(cubeb ** context, char const * context_name) -+{ -+ cubeb* ctx = (cubeb*)malloc(sizeof(cubeb)); -+ ctx->ops = &oss_ops; -+ *context = ctx; -+ return CUBEB_OK; -+} -+ -+static void oss_destroy(cubeb *ctx) -+{ -+ free(ctx); -+} -+ -+static char const * oss_get_backend_id(cubeb * context) -+{ -+ static char oss_name[] = "oss"; -+ return oss_name; -+} -+ -+static int oss_get_max_channel_count(cubeb * ctx, uint32_t * max_channels) -+{ -+ *max_channels = 2; /* Let's support only stereo for now */ -+ return CUBEB_OK; -+} -+ -+static int oss_get_min_latency(cubeb * context, cubeb_stream_params params, -+ uint32_t * latency_frames) -+{ -+ (void)context; -+ /* 40ms is a big enough number to work ok */ -+ *latency_frames = 40 * params.rate / 1000; -+ return CUBEB_OK; -+} -+ -+static int oss_get_preferred_sample_rate(cubeb *context, uint32_t * rate) -+{ -+ /* 48000 seems a prefered choice for most audio devices -+ * and a good choice for OSS */ -+ *rate = 48000; -+ return CUBEB_OK; -+} -+ -+static void run_state_callback(cubeb_stream *stream, cubeb_state state) -+{ -+ if (stream->state_callback) { -+ stream->state_callback(stream, stream->user_ptr, state); -+ } -+} -+ -+static long run_data_callback(cubeb_stream *stream, void *buffer, long nframes) -+{ -+ long got = 0; -+ pthread_mutex_lock(&stream->state_mutex); -+ if (stream->data_callback && stream->running && !stream->stopped) { -+ pthread_mutex_unlock(&stream->state_mutex); -+ got = stream->data_callback(stream, stream->user_ptr, NULL, buffer, nframes); -+ } else { -+ pthread_mutex_unlock(&stream->state_mutex); -+ } -+ return got; -+} -+ -+static void apply_volume_int(int16_t* buffer, unsigned int n, -+ float volume, float panning) -+{ -+ float left = volume; -+ float right = volume; -+ unsigned int i; -+ int pan[2]; -+ if (panning<0) { -+ right *= (1+panning); -+ } else { -+ left *= (1-panning); -+ } -+ pan[0] = 128.0*left; -+ pan[1] = 128.0*right; -+ for(i=0; irunning) { -+ pthread_mutex_lock(&stream->state_mutex); -+ if (stream->stopped) { -+ pthread_mutex_unlock(&stream->state_mutex); -+ run_state_callback(stream, CUBEB_STATE_STOPPED); -+ pthread_mutex_lock(&stream->state_mutex); -+ while (stream->stopped) { -+ pthread_cond_wait(&stream->state_cond, &stream->state_mutex); -+ } -+ pthread_mutex_unlock(&stream->state_mutex); -+ run_state_callback(stream, CUBEB_STATE_STARTED); -+ continue; -+ } -+ pthread_mutex_unlock(&stream->state_mutex); -+ if (stream->floating) { -+ got = run_data_callback(stream, f_buffer, -+ OSS_BUFFER_SIZE/stream->params.channels); -+ apply_volume_float(f_buffer, got*stream->params.channels, -+ stream->volume, stream->panning); -+ for (i=0; i<((unsigned long)got)*stream->params.channels; i++) { -+ /* Clipping is prefered to overflow */ -+ if(f_buffer[i]>=1.0){ -+ f_buffer[i]=1.0; -+ } -+ if(f_buffer[i]<=-1.0){ -+ f_buffer[i]=-1.0; -+ } -+ /* One might think that multipling by 32767.0 is logical but results in clipping */ -+ buffer[i] = f_buffer[i]*32767.0; -+ } -+ } else { -+ got = run_data_callback(stream, buffer, -+ OSS_BUFFER_SIZE/stream->params.channels); -+ apply_volume_int(buffer, got*stream->params.channels, -+ stream->volume, stream->panning); -+ } -+ if (got<0) { -+ run_state_callback(stream, CUBEB_STATE_ERROR); -+ break; -+ } -+ if (!got) { -+ run_state_callback(stream, CUBEB_STATE_DRAINED); -+ } -+ if (got) { -+ size_t i = 0; -+ size_t s = got*stream->params.channels*sizeof(int16_t); -+ while (i < s) { -+ ssize_t n = write(stream->fd, ((char*)buffer) + i, s - i); -+ if (n<=0) { -+ run_state_callback(stream, CUBEB_STATE_ERROR); -+ break; -+ } -+ i+=n; -+ } -+ stream->written_frags+=got; -+ } -+ } -+ return NULL; -+} -+ -+static void oss_try_set_latency(cubeb_stream* stream, unsigned int latency) -+{ -+ unsigned int latency_bytes, n_frag; -+ int frag; -+ /* fragment size of 1024 is a good choice with good chances to be accepted */ -+ unsigned int frag_log=10; /* 2^frag_log = fragment size */ -+ latency_bytes = -+ latency*stream->params.rate*stream->params.channels*sizeof(uint16_t)/1000; -+ n_frag = latency_bytes>>frag_log; -+ frag = (n_frag<<16) | frag_log; -+ /* Even if this fails we wish to continue, not checking for errors */ -+ ioctl(stream->fd, SNDCTL_DSP_SETFRAGMENT, &frag); -+} -+ -+static int oss_stream_init(cubeb * context, cubeb_stream ** stm, -+ char const * stream_name, -+ cubeb_devid input_device, -+ cubeb_stream_params * input_stream_params, -+ cubeb_devid output_device, -+ cubeb_stream_params * output_stream_params, -+ unsigned int latency, -+ cubeb_data_callback data_callback, -+ cubeb_state_callback state_callback, void * user_ptr) -+{ -+ cubeb_stream* stream = (cubeb_stream*)malloc(sizeof(cubeb_stream)); -+ stream->context = context; -+ stream->data_callback = data_callback; -+ stream->state_callback = state_callback; -+ stream->user_ptr = user_ptr; -+ -+ assert(!input_stream_params && "not supported."); -+ if (input_device || output_device) { -+ /* Device selection not yet implemented. */ -+ return CUBEB_ERROR_DEVICE_UNAVAILABLE; -+ } -+ -+ if ((input_stream_params && input_stream_params->prefs & CUBEB_STREAM_PREF_LOOPBACK) || -+ (output_stream_params && output_stream_params->prefs & CUBEB_STREAM_PREF_LOOPBACK)) { -+ return CUBEB_ERROR_NOT_SUPPORTED; -+ } -+ -+ if ((stream->fd = open(CUBEB_OSS_DEFAULT_OUTPUT, O_WRONLY)) == -1) { -+ free(stream); -+ return CUBEB_ERROR; -+ } -+#define SET(what, to) do { unsigned int i = to; \ -+ int j = ioctl(stream->fd, what, &i); \ -+ if (j == -1 || i != to) { \ -+ close(stream->fd); \ -+ free(stream); \ -+ return CUBEB_ERROR_INVALID_FORMAT; } } while (0) -+ -+ stream->params = *output_stream_params; -+ stream->volume = 1.0; -+ stream->panning = 0.0; -+ -+ oss_try_set_latency(stream, latency); -+ -+ stream->floating = 0; -+ SET(SNDCTL_DSP_CHANNELS, stream->params.channels); -+ SET(SNDCTL_DSP_SPEED, stream->params.rate); -+ switch (stream->params.format) { -+ case CUBEB_SAMPLE_S16LE: -+ SET(SNDCTL_DSP_SETFMT, AFMT_S16_LE); -+ break; -+ case CUBEB_SAMPLE_S16BE: -+ SET(SNDCTL_DSP_SETFMT, AFMT_S16_BE); -+ break; -+ case CUBEB_SAMPLE_FLOAT32LE: -+ SET(SNDCTL_DSP_SETFMT, AFMT_S16_NE); -+ stream->floating = 1; -+ break; -+ default: -+ close(stream->fd); -+ free(stream); -+ return CUBEB_ERROR; -+ } -+ -+ -+ pthread_mutex_init(&stream->state_mutex, NULL); -+ pthread_cond_init(&stream->state_cond, NULL); -+ -+ stream->running = 1; -+ stream->stopped = 1; -+ stream->position_bytes = 0; -+ stream->last_position_bytes = 0; -+ stream->written_frags = 0; -+ stream->missed_frags = 0; -+ -+ pthread_create(&stream->th, NULL, writer, (void*)stream); -+ -+ *stm = stream; -+ -+ return CUBEB_OK; -+} -+ -+static void oss_stream_destroy(cubeb_stream * stream) -+{ -+ pthread_mutex_lock(&stream->state_mutex); -+ -+ stream->running = 0; -+ stream->stopped = 0; -+ pthread_cond_signal(&stream->state_cond); -+ -+ pthread_mutex_unlock(&stream->state_mutex); -+ -+ pthread_join(stream->th, NULL); -+ -+ pthread_mutex_destroy(&stream->state_mutex); -+ pthread_cond_destroy(&stream->state_cond); -+ close(stream->fd); -+ free(stream); -+} -+ -+static int oss_stream_get_latency(cubeb_stream * stream, uint32_t * latency) -+{ -+ if (ioctl(stream->fd, SNDCTL_DSP_GETODELAY, latency)==-1) { -+ return CUBEB_ERROR; -+ } -+ /* Convert latency from bytes to frames */ -+ *latency /= stream->params.channels*sizeof(int16_t); -+ return CUBEB_OK; -+} -+ -+ -+static int oss_stream_current_optr(cubeb_stream * stream, uint64_t * position) -+{ -+ count_info ci; -+ /* Unfortunately, this ioctl is only available in OSS 4.x */ -+#ifdef SNDCTL_DSP_CURRENT_OPTR -+ oss_count_t count; -+ if (ioctl(stream->fd, SNDCTL_DSP_CURRENT_OPTR, &count) != -1) { -+ *position = count.samples;// + count.fifo_samples; -+ return CUBEB_OK; -+ } -+#endif -+ /* Fall back to this ioctl in case the previous one fails */ -+ if (ioctl(stream->fd, SNDCTL_DSP_GETOPTR, &ci) == -1) { -+ return CUBEB_ERROR; -+ } -+ /* ci.bytes is only 32 bit and will start to wrap after arithmetic overflow */ -+ stream->position_bytes += ci.bytes - stream->last_position_bytes; -+ stream->last_position_bytes = ci.bytes; -+ *position = stream->position_bytes/stream->params.channels/sizeof(int16_t); -+ return CUBEB_OK; -+} -+ -+static int oss_stream_get_position(cubeb_stream * stream, uint64_t * position) -+{ -+ if ( oss_stream_current_optr(stream, position) == CUBEB_OK ){ -+ *position -= stream->missed_frags; -+ return CUBEB_OK; -+ } -+ /* If no correct method to get position works we resort to this */ -+ *position = stream->written_frags; -+ return CUBEB_OK; -+} -+ -+ -+static int oss_stream_start(cubeb_stream * stream) -+{ -+ pthread_mutex_lock(&stream->state_mutex); -+ if (stream->stopped) { -+ uint64_t ptr; -+ oss_stream_current_optr(stream, &ptr); -+ stream->missed_frags = ptr - stream->written_frags; -+ stream->stopped = 0; -+ pthread_cond_signal(&stream->state_cond); -+ } -+ pthread_mutex_unlock(&stream->state_mutex); -+ return CUBEB_OK; -+} -+ -+static int oss_stream_stop(cubeb_stream * stream) -+{ -+ pthread_mutex_lock(&stream->state_mutex); -+ stream->stopped = 1; -+ pthread_mutex_unlock(&stream->state_mutex); -+ return CUBEB_OK; -+} -+ -+int oss_stream_set_panning(cubeb_stream * stream, float panning) -+{ -+ if (stream->params.channels == 2) { -+ stream->panning=panning; -+ } -+ return CUBEB_OK; -+} -+ -+int oss_stream_set_volume(cubeb_stream * stream, float volume) -+{ -+ stream->volume=volume; -+ return CUBEB_OK; -+} -+ -+static struct cubeb_ops const oss_ops = { -+ .init = oss_init, -+ .get_backend_id = oss_get_backend_id, -+ .get_max_channel_count = oss_get_max_channel_count, -+ .get_min_latency = oss_get_min_latency, -+ .get_preferred_sample_rate = oss_get_preferred_sample_rate, -+ .get_preferred_channel_layout = NULL, -+ .enumerate_devices = NULL, -+ .device_collection_destroy = NULL, -+ .destroy = oss_destroy, -+ .stream_init = oss_stream_init, -+ .stream_destroy = oss_stream_destroy, -+ .stream_start = oss_stream_start, -+ .stream_stop = oss_stream_stop, -+ .stream_reset_default_device = NULL, -+ .stream_get_position = oss_stream_get_position, -+ .stream_get_latency = oss_stream_get_latency, -+ .stream_set_volume = oss_stream_set_volume, -+ .stream_set_panning = oss_stream_set_panning, -+ .stream_get_current_device = NULL, -+ .stream_device_destroy = NULL, -+ .stream_register_device_changed_callback = NULL, -+ .register_device_collection_changed = NULL -+}; -diff --git media/libcubeb/src/moz.build media/libcubeb/src/moz.build -index e1fea30ca417..a5b1100f1014 100644 ---- media/libcubeb/src/moz.build -+++ media/libcubeb/src/moz.build -@@ -23,6 +23,12 @@ if CONFIG['MOZ_ALSA']: - ] - DEFINES['USE_ALSA'] = True - -+if CONFIG['MOZ_OSS']: -+ SOURCES += [ -+ 'cubeb_oss.c', -+ ] -+ DEFINES['USE_OSS'] = True -+ - if CONFIG['MOZ_PULSEAUDIO'] or CONFIG['MOZ_JACK']: - SOURCES += [ - 'cubeb_resampler.cpp', -@@ -88,6 +94,7 @@ if CONFIG['OS_TARGET'] == 'Android': - FINAL_LIBRARY = 'gkmedias' - - CFLAGS += CONFIG['MOZ_ALSA_CFLAGS'] -+CFLAGS += CONFIG['MOZ_OSS_CFLAGS'] - CFLAGS += CONFIG['MOZ_PULSEAUDIO_CFLAGS'] - - # We allow warnings for third-party code that can be updated from upstream. -diff --git media/libcubeb/update.sh media/libcubeb/update.sh -index 0bb6345c9fa9..78a102dc47cb 100755 ---- media/libcubeb/update.sh -+++ media/libcubeb/update.sh -@@ -20,6 +20,7 @@ cp $1/src/cubeb_log.h src - cp $1/src/cubeb_mixer.cpp src - cp $1/src/cubeb_mixer.h src - cp $1/src/cubeb_opensl.c src -+cp $1/src/cubeb_oss.c src - cp $1/src/cubeb-jni.cpp src - cp $1/src/cubeb-jni.h src - cp $1/src/android/cubeb-output-latency.h src/android -diff --git old-configure.in old-configure.in -index 28e1a9e48d61..edacedcf6e5d 100644 ---- old-configure.in -+++ old-configure.in -@@ -2598,6 +2598,67 @@ MOZ_WEBM_ENCODER=1 - AC_DEFINE(MOZ_WEBM_ENCODER) - AC_SUBST(MOZ_WEBM_ENCODER) - -+dnl ================================== -+dnl = Check OSS availability -+dnl ================================== -+ -+dnl If using Linux, Solaris or BSDs, ensure that OSS is available -+case "$OS_TARGET" in -+Linux|SunOS|DragonFly|FreeBSD|NetBSD|GNU/kFreeBSD) -+ MOZ_OSS=1 -+ ;; -+esac -+ -+MOZ_ARG_WITH_STRING(oss, -+[ --with-oss[=PFX] Enable OpenSoundSystem support [installed at prefix PFX]], -+ OSSPREFIX=$withval) -+ -+if test -n "$OSSPREFIX"; then -+ if test "$OSSPREFIX" != "no"; then -+ MOZ_OSS=1 -+ else -+ MOZ_OSS= -+ fi -+fi -+ -+_SAVE_CFLAGS=$CFLAGS -+_SAVE_LIBS=$LIBS -+if test -n "$MOZ_OSS"; then -+ dnl Prefer 4Front implementation -+ AC_MSG_CHECKING([MOZ_OSS_CFLAGS]) -+ if test "$OSSPREFIX" != "yes"; then -+ oss_conf=${OSSPREFIX%/usr}/etc/oss.conf -+ if test -f "$oss_conf"; then -+ . "$oss_conf" -+ else -+ OSSLIBDIR=$OSSPREFIX/lib/oss -+ fi -+ if test -d "$OSSLIBDIR"; then -+ MOZ_OSS_CFLAGS="$MOZ_OSS_CFLAGS -I$OSSLIBDIR/include" -+ fi -+ fi -+ AC_MSG_RESULT([$MOZ_OSS_CFLAGS]) -+ -+ CFLAGS="$CFLAGS $MOZ_OSS_CFLAGS" -+ MOZ_CHECK_HEADERS(sys/soundcard.h soundcard.h) -+ -+ if test "$ac_cv_header_sys_soundcard_h" != "yes" -a \ -+ "$ac_cv_header_soundcard_h" != "yes"; then -+ AC_MSG_ERROR([Need OSS for Ogg, Wave or WebM decoding on $OS_TARGET. Disable with --without-oss.]) -+ fi -+ -+ dnl Assume NetBSD implementation over SunAudio -+ AC_CHECK_LIB(ossaudio, _oss_ioctl, -+ [AC_DEFINE_UNQUOTED(CUBEB_OSS_DEFAULT_OUTPUT, "/dev/sound") -+ MOZ_OSS_LIBS="$MOZ_OSS_LIBS -lossaudio"]) -+fi -+CFLAGS=$_SAVE_CFLAGS -+LIBS=$_SAVE_LIBS -+ -+AC_SUBST(MOZ_OSS) -+AC_SUBST_LIST(MOZ_OSS_CFLAGS) -+AC_SUBST_LIST(MOZ_OSS_LIBS) -+ - dnl ================================== - dnl = Check alsa availability on Linux - dnl ================================== -diff --git toolkit/library/moz.build toolkit/library/moz.build -index e06592daa265..ce016b96c2bc 100644 ---- toolkit/library/moz.build -+++ toolkit/library/moz.build -@@ -247,6 +247,9 @@ if CONFIG['MOZ_SYSTEM_LIBVPX']: - if not CONFIG['MOZ_TREE_PIXMAN']: - OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS'] - -+if CONFIG['MOZ_OSS']: -+ OS_LIBS += CONFIG['MOZ_OSS_LIBS'] -+ - if CONFIG['HAVE_CLOCK_MONOTONIC']: - OS_LIBS += CONFIG['REALTIME_LIBS'] - diff --git a/www/firefox-esr/files/patch-ijg-libjpeg b/www/firefox-esr/files/patch-ijg-libjpeg deleted file mode 100644 index b6788adc0f8..00000000000 --- a/www/firefox-esr/files/patch-ijg-libjpeg +++ /dev/null @@ -1,383 +0,0 @@ -# Partially revert bug 791305 to allow building with system IJG jpeg library - -diff --git old-configure.in configure.in -index f0aeb5d..1c01010 100644 ---- old-configure.in -+++ old-configure.in -@@ -4027,11 +4027,7 @@ if test "$MOZ_SYSTEM_JPEG" = 1; then - #include ], - [ #if JPEG_LIB_VERSION < $MOZJPEG - #error "Insufficient JPEG library version ($MOZJPEG required)." -- #endif -- #ifndef JCS_EXTENSIONS -- #error "libjpeg-turbo JCS_EXTENSIONS required" -- #endif -- ], -+ #endif ], - MOZ_SYSTEM_JPEG=1, - AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg])) - fi -diff --git image/decoders/nsJPEGDecoder.cpp image/decoders/nsJPEGDecoder.cpp -index 8fa8200..1d2a259 100644 ---- image/decoders/nsJPEGDecoder.cpp -+++ image/decoders/nsJPEGDecoder.cpp -@@ -21,13 +21,28 @@ - - extern "C" { - #include "iccjpeg.h" --} - -+#ifdef JCS_EXTENSIONS - #if MOZ_BIG_ENDIAN - #define MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB JCS_EXT_XRGB - #else - #define MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB JCS_EXT_BGRX - #endif -+#else -+/* Colorspace conversion (copied from jpegint.h) */ -+struct jpeg_color_deconverter { -+ JMETHOD(void, start_pass, (j_decompress_ptr cinfo)); -+ JMETHOD(void, color_convert, (j_decompress_ptr cinfo, -+ JSAMPIMAGE input_buf, JDIMENSION input_row, -+ JSAMPARRAY output_buf, int num_rows)); -+}; -+ -+METHODDEF(void) -+ycc_rgb_convert_argb (j_decompress_ptr cinfo, -+ JSAMPIMAGE input_buf, JDIMENSION input_row, -+ JSAMPARRAY output_buf, int num_rows); -+#endif -+} - - static void cmyk_convert_rgb(JSAMPROW row, JDIMENSION width); - -@@ -367,6 +382,7 @@ nsJPEGDecoder::WriteInternal(const char* - case JCS_GRAYSCALE: - case JCS_RGB: - case JCS_YCbCr: -+#ifdef JCS_EXTENSIONS - // if we're not color managing we can decode directly to - // MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB - if (mCMSMode != eCMSMode_All) { -@@ -375,6 +391,9 @@ nsJPEGDecoder::WriteInternal(const char* - } else { - mInfo.out_color_space = JCS_RGB; - } -+#else -+ mInfo.out_color_space = JCS_RGB; -+#endif - break; - case JCS_CMYK: - case JCS_YCCK: -@@ -448,6 +467,16 @@ nsJPEGDecoder::WriteInternal(const char* - return; // I/O suspension - } - -+#ifndef JCS_EXTENSIONS -+ /* Force to use our YCbCr to Packed RGB converter when possible */ -+ if (!mTransform && (mCMSMode != eCMSMode_All) && -+ mInfo.jpeg_color_space == JCS_YCbCr && mInfo.out_color_space == JCS_RGB) { -+ /* Special case for the most common case: transform from YCbCr direct into packed ARGB */ -+ mInfo.out_color_components = 4; /* Packed ARGB pixels are always 4 bytes...*/ -+ mInfo.cconvert->color_convert = ycc_rgb_convert_argb; -+ } -+#endif -+ - // If this is a progressive JPEG ... - mState = mInfo.buffered_image ? - JPEG_DECOMPRESS_PROGRESSIVE : JPEG_DECOMPRESS_SEQUENTIAL; -@@ -605,7 +633,11 @@ nsJPEGDecoder::OutputScanlines(bool* sus - uint32_t* imageRow = ((uint32_t*)mImageData) + - (mInfo.output_scanline * mInfo.output_width); - -+#ifdef JCS_EXTENSIONS - if (mInfo.out_color_space == MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB) { -+#else -+ if (mInfo.cconvert->color_convert == ycc_rgb_convert_argb) { -+#endif - // Special case: scanline will be directly converted into packed ARGB - if (jpeg_read_scanlines(&mInfo, (JSAMPARRAY)&imageRow, 1) != 1) { - *suspend = true; // suspend -@@ -920,6 +952,282 @@ term_source (j_decompress_ptr jd) - } // namespace mozilla - - -+#ifndef JCS_EXTENSIONS -+/**************** YCbCr -> Cairo's RGB24/ARGB32 conversion: most common case **************/ -+ -+/* -+ * YCbCr is defined per CCIR 601-1, except that Cb and Cr are -+ * normalized to the range 0..MAXJSAMPLE rather than -0.5 .. 0.5. -+ * The conversion equations to be implemented are therefore -+ * R = Y + 1.40200 * Cr -+ * G = Y - 0.34414 * Cb - 0.71414 * Cr -+ * B = Y + 1.77200 * Cb -+ * where Cb and Cr represent the incoming values less CENTERJSAMPLE. -+ * (These numbers are derived from TIFF 6.0 section 21, dated 3-June-92.) -+ * -+ * To avoid floating-point arithmetic, we represent the fractional constants -+ * as integers scaled up by 2^16 (about 4 digits precision); we have to divide -+ * the products by 2^16, with appropriate rounding, to get the correct answer. -+ * Notice that Y, being an integral input, does not contribute any fraction -+ * so it need not participate in the rounding. -+ * -+ * For even more speed, we avoid doing any multiplications in the inner loop -+ * by precalculating the constants times Cb and Cr for all possible values. -+ * For 8-bit JSAMPLEs this is very reasonable (only 256 entries per table); -+ * for 12-bit samples it is still acceptable. It's not very reasonable for -+ * 16-bit samples, but if you want lossless storage you shouldn't be changing -+ * colorspace anyway. -+ * The Cr=>R and Cb=>B values can be rounded to integers in advance; the -+ * values for the G calculation are left scaled up, since we must add them -+ * together before rounding. -+ */ -+ -+#define SCALEBITS 16 /* speediest right-shift on some machines */ -+ -+/* Use static tables for color processing. */ -+/* Four tables, each 256 entries of 4 bytes totals 4K which is not bad... */ -+ -+const int Cr_r_tab[(MAXJSAMPLE+1) * sizeof(int)] ={ -+ -0xb3, -0xb2, -0xb1, -0xaf, -0xae, -0xac, -+ -0xab, -0xaa, -0xa8, -0xa7, -0xa5, -0xa4, -+ -0xa3, -0xa1, -0xa0, -0x9e, -0x9d, -0x9c, -+ -0x9a, -0x99, -0x97, -0x96, -0x95, -0x93, -+ -0x92, -0x90, -0x8f, -0x8e, -0x8c, -0x8b, -+ -0x89, -0x88, -0x87, -0x85, -0x84, -0x82, -+ -0x81, -0x80, -0x7e, -0x7d, -0x7b, -0x7a, -+ -0x79, -0x77, -0x76, -0x74, -0x73, -0x72, -+ -0x70, -0x6f, -0x6d, -0x6c, -0x6b, -0x69, -+ -0x68, -0x66, -0x65, -0x64, -0x62, -0x61, -+ -0x5f, -0x5e, -0x5d, -0x5b, -0x5a, -0x58, -+ -0x57, -0x56, -0x54, -0x53, -0x51, -0x50, -+ -0x4f, -0x4d, -0x4c, -0x4a, -0x49, -0x48, -+ -0x46, -0x45, -0x43, -0x42, -0x40, -0x3f, -+ -0x3e, -0x3c, -0x3b, -0x39, -0x38, -0x37, -+ -0x35, -0x34, -0x32, -0x31, -0x30, -0x2e, -+ -0x2d, -0x2b, -0x2a, -0x29, -0x27, -0x26, -+ -0x24, -0x23, -0x22, -0x20, -0x1f, -0x1d, -+ -0x1c, -0x1b, -0x19, -0x18, -0x16, -0x15, -+ -0x14, -0x12, -0x11, -0x0f, -0x0e, -0x0d, -+ -0x0b, -0x0a, -0x08, -0x07, -0x06, -0x04, -+ -0x03, -0x01, 0x00, 0x01, 0x03, 0x04, -+ 0x06, 0x07, 0x08, 0x0a, 0x0b, 0x0d, -+ 0x0e, 0x0f, 0x11, 0x12, 0x14, 0x15, -+ 0x16, 0x18, 0x19, 0x1b, 0x1c, 0x1d, -+ 0x1f, 0x20, 0x22, 0x23, 0x24, 0x26, -+ 0x27, 0x29, 0x2a, 0x2b, 0x2d, 0x2e, -+ 0x30, 0x31, 0x32, 0x34, 0x35, 0x37, -+ 0x38, 0x39, 0x3b, 0x3c, 0x3e, 0x3f, -+ 0x40, 0x42, 0x43, 0x45, 0x46, 0x48, -+ 0x49, 0x4a, 0x4c, 0x4d, 0x4f, 0x50, -+ 0x51, 0x53, 0x54, 0x56, 0x57, 0x58, -+ 0x5a, 0x5b, 0x5d, 0x5e, 0x5f, 0x61, -+ 0x62, 0x64, 0x65, 0x66, 0x68, 0x69, -+ 0x6b, 0x6c, 0x6d, 0x6f, 0x70, 0x72, -+ 0x73, 0x74, 0x76, 0x77, 0x79, 0x7a, -+ 0x7b, 0x7d, 0x7e, 0x80, 0x81, 0x82, -+ 0x84, 0x85, 0x87, 0x88, 0x89, 0x8b, -+ 0x8c, 0x8e, 0x8f, 0x90, 0x92, 0x93, -+ 0x95, 0x96, 0x97, 0x99, 0x9a, 0x9c, -+ 0x9d, 0x9e, 0xa0, 0xa1, 0xa3, 0xa4, -+ 0xa5, 0xa7, 0xa8, 0xaa, 0xab, 0xac, -+ 0xae, 0xaf, 0xb1, 0xb2, -+ }; -+ -+const int Cb_b_tab[(MAXJSAMPLE+1) * sizeof(int)] ={ -+ -0xe3, -0xe1, -0xdf, -0xde, -0xdc, -0xda, -+ -0xd8, -0xd6, -0xd5, -0xd3, -0xd1, -0xcf, -+ -0xce, -0xcc, -0xca, -0xc8, -0xc6, -0xc5, -+ -0xc3, -0xc1, -0xbf, -0xbe, -0xbc, -0xba, -+ -0xb8, -0xb7, -0xb5, -0xb3, -0xb1, -0xaf, -+ -0xae, -0xac, -0xaa, -0xa8, -0xa7, -0xa5, -+ -0xa3, -0xa1, -0x9f, -0x9e, -0x9c, -0x9a, -+ -0x98, -0x97, -0x95, -0x93, -0x91, -0x90, -+ -0x8e, -0x8c, -0x8a, -0x88, -0x87, -0x85, -+ -0x83, -0x81, -0x80, -0x7e, -0x7c, -0x7a, -+ -0x78, -0x77, -0x75, -0x73, -0x71, -0x70, -+ -0x6e, -0x6c, -0x6a, -0x69, -0x67, -0x65, -+ -0x63, -0x61, -0x60, -0x5e, -0x5c, -0x5a, -+ -0x59, -0x57, -0x55, -0x53, -0x52, -0x50, -+ -0x4e, -0x4c, -0x4a, -0x49, -0x47, -0x45, -+ -0x43, -0x42, -0x40, -0x3e, -0x3c, -0x3a, -+ -0x39, -0x37, -0x35, -0x33, -0x32, -0x30, -+ -0x2e, -0x2c, -0x2b, -0x29, -0x27, -0x25, -+ -0x23, -0x22, -0x20, -0x1e, -0x1c, -0x1b, -+ -0x19, -0x17, -0x15, -0x13, -0x12, -0x10, -+ -0x0e, -0x0c, -0x0b, -0x09, -0x07, -0x05, -+ -0x04, -0x02, 0x00, 0x02, 0x04, 0x05, -+ 0x07, 0x09, 0x0b, 0x0c, 0x0e, 0x10, -+ 0x12, 0x13, 0x15, 0x17, 0x19, 0x1b, -+ 0x1c, 0x1e, 0x20, 0x22, 0x23, 0x25, -+ 0x27, 0x29, 0x2b, 0x2c, 0x2e, 0x30, -+ 0x32, 0x33, 0x35, 0x37, 0x39, 0x3a, -+ 0x3c, 0x3e, 0x40, 0x42, 0x43, 0x45, -+ 0x47, 0x49, 0x4a, 0x4c, 0x4e, 0x50, -+ 0x52, 0x53, 0x55, 0x57, 0x59, 0x5a, -+ 0x5c, 0x5e, 0x60, 0x61, 0x63, 0x65, -+ 0x67, 0x69, 0x6a, 0x6c, 0x6e, 0x70, -+ 0x71, 0x73, 0x75, 0x77, 0x78, 0x7a, -+ 0x7c, 0x7e, 0x80, 0x81, 0x83, 0x85, -+ 0x87, 0x88, 0x8a, 0x8c, 0x8e, 0x90, -+ 0x91, 0x93, 0x95, 0x97, 0x98, 0x9a, -+ 0x9c, 0x9e, 0x9f, 0xa1, 0xa3, 0xa5, -+ 0xa7, 0xa8, 0xaa, 0xac, 0xae, 0xaf, -+ 0xb1, 0xb3, 0xb5, 0xb7, 0xb8, 0xba, -+ 0xbc, 0xbe, 0xbf, 0xc1, 0xc3, 0xc5, -+ 0xc6, 0xc8, 0xca, 0xcc, 0xce, 0xcf, -+ 0xd1, 0xd3, 0xd5, 0xd6, 0xd8, 0xda, -+ 0xdc, 0xde, 0xdf, 0xe1, -+ }; -+ -+const int Cr_g_tab[(MAXJSAMPLE+1) * sizeof(int)] ={ -+ 0x5b6900, 0x5ab22e, 0x59fb5c, 0x59448a, 0x588db8, 0x57d6e6, -+ 0x572014, 0x566942, 0x55b270, 0x54fb9e, 0x5444cc, 0x538dfa, -+ 0x52d728, 0x522056, 0x516984, 0x50b2b2, 0x4ffbe0, 0x4f450e, -+ 0x4e8e3c, 0x4dd76a, 0x4d2098, 0x4c69c6, 0x4bb2f4, 0x4afc22, -+ 0x4a4550, 0x498e7e, 0x48d7ac, 0x4820da, 0x476a08, 0x46b336, -+ 0x45fc64, 0x454592, 0x448ec0, 0x43d7ee, 0x43211c, 0x426a4a, -+ 0x41b378, 0x40fca6, 0x4045d4, 0x3f8f02, 0x3ed830, 0x3e215e, -+ 0x3d6a8c, 0x3cb3ba, 0x3bfce8, 0x3b4616, 0x3a8f44, 0x39d872, -+ 0x3921a0, 0x386ace, 0x37b3fc, 0x36fd2a, 0x364658, 0x358f86, -+ 0x34d8b4, 0x3421e2, 0x336b10, 0x32b43e, 0x31fd6c, 0x31469a, -+ 0x308fc8, 0x2fd8f6, 0x2f2224, 0x2e6b52, 0x2db480, 0x2cfdae, -+ 0x2c46dc, 0x2b900a, 0x2ad938, 0x2a2266, 0x296b94, 0x28b4c2, -+ 0x27fdf0, 0x27471e, 0x26904c, 0x25d97a, 0x2522a8, 0x246bd6, -+ 0x23b504, 0x22fe32, 0x224760, 0x21908e, 0x20d9bc, 0x2022ea, -+ 0x1f6c18, 0x1eb546, 0x1dfe74, 0x1d47a2, 0x1c90d0, 0x1bd9fe, -+ 0x1b232c, 0x1a6c5a, 0x19b588, 0x18feb6, 0x1847e4, 0x179112, -+ 0x16da40, 0x16236e, 0x156c9c, 0x14b5ca, 0x13fef8, 0x134826, -+ 0x129154, 0x11da82, 0x1123b0, 0x106cde, 0x0fb60c, 0x0eff3a, -+ 0x0e4868, 0x0d9196, 0x0cdac4, 0x0c23f2, 0x0b6d20, 0x0ab64e, -+ 0x09ff7c, 0x0948aa, 0x0891d8, 0x07db06, 0x072434, 0x066d62, -+ 0x05b690, 0x04ffbe, 0x0448ec, 0x03921a, 0x02db48, 0x022476, -+ 0x016da4, 0x00b6d2, 0x000000, -0x00b6d2, -0x016da4, -0x022476, -+ -0x02db48, -0x03921a, -0x0448ec, -0x04ffbe, -0x05b690, -0x066d62, -+ -0x072434, -0x07db06, -0x0891d8, -0x0948aa, -0x09ff7c, -0x0ab64e, -+ -0x0b6d20, -0x0c23f2, -0x0cdac4, -0x0d9196, -0x0e4868, -0x0eff3a, -+ -0x0fb60c, -0x106cde, -0x1123b0, -0x11da82, -0x129154, -0x134826, -+ -0x13fef8, -0x14b5ca, -0x156c9c, -0x16236e, -0x16da40, -0x179112, -+ -0x1847e4, -0x18feb6, -0x19b588, -0x1a6c5a, -0x1b232c, -0x1bd9fe, -+ -0x1c90d0, -0x1d47a2, -0x1dfe74, -0x1eb546, -0x1f6c18, -0x2022ea, -+ -0x20d9bc, -0x21908e, -0x224760, -0x22fe32, -0x23b504, -0x246bd6, -+ -0x2522a8, -0x25d97a, -0x26904c, -0x27471e, -0x27fdf0, -0x28b4c2, -+ -0x296b94, -0x2a2266, -0x2ad938, -0x2b900a, -0x2c46dc, -0x2cfdae, -+ -0x2db480, -0x2e6b52, -0x2f2224, -0x2fd8f6, -0x308fc8, -0x31469a, -+ -0x31fd6c, -0x32b43e, -0x336b10, -0x3421e2, -0x34d8b4, -0x358f86, -+ -0x364658, -0x36fd2a, -0x37b3fc, -0x386ace, -0x3921a0, -0x39d872, -+ -0x3a8f44, -0x3b4616, -0x3bfce8, -0x3cb3ba, -0x3d6a8c, -0x3e215e, -+ -0x3ed830, -0x3f8f02, -0x4045d4, -0x40fca6, -0x41b378, -0x426a4a, -+ -0x43211c, -0x43d7ee, -0x448ec0, -0x454592, -0x45fc64, -0x46b336, -+ -0x476a08, -0x4820da, -0x48d7ac, -0x498e7e, -0x4a4550, -0x4afc22, -+ -0x4bb2f4, -0x4c69c6, -0x4d2098, -0x4dd76a, -0x4e8e3c, -0x4f450e, -+ -0x4ffbe0, -0x50b2b2, -0x516984, -0x522056, -0x52d728, -0x538dfa, -+ -0x5444cc, -0x54fb9e, -0x55b270, -0x566942, -0x572014, -0x57d6e6, -+ -0x588db8, -0x59448a, -0x59fb5c, -0x5ab22e, -+ }; -+ -+const int Cb_g_tab[(MAXJSAMPLE+1) * sizeof(int)] ={ -+ 0x2c8d00, 0x2c34e6, 0x2bdccc, 0x2b84b2, 0x2b2c98, 0x2ad47e, -+ 0x2a7c64, 0x2a244a, 0x29cc30, 0x297416, 0x291bfc, 0x28c3e2, -+ 0x286bc8, 0x2813ae, 0x27bb94, 0x27637a, 0x270b60, 0x26b346, -+ 0x265b2c, 0x260312, 0x25aaf8, 0x2552de, 0x24fac4, 0x24a2aa, -+ 0x244a90, 0x23f276, 0x239a5c, 0x234242, 0x22ea28, 0x22920e, -+ 0x2239f4, 0x21e1da, 0x2189c0, 0x2131a6, 0x20d98c, 0x208172, -+ 0x202958, 0x1fd13e, 0x1f7924, 0x1f210a, 0x1ec8f0, 0x1e70d6, -+ 0x1e18bc, 0x1dc0a2, 0x1d6888, 0x1d106e, 0x1cb854, 0x1c603a, -+ 0x1c0820, 0x1bb006, 0x1b57ec, 0x1affd2, 0x1aa7b8, 0x1a4f9e, -+ 0x19f784, 0x199f6a, 0x194750, 0x18ef36, 0x18971c, 0x183f02, -+ 0x17e6e8, 0x178ece, 0x1736b4, 0x16de9a, 0x168680, 0x162e66, -+ 0x15d64c, 0x157e32, 0x152618, 0x14cdfe, 0x1475e4, 0x141dca, -+ 0x13c5b0, 0x136d96, 0x13157c, 0x12bd62, 0x126548, 0x120d2e, -+ 0x11b514, 0x115cfa, 0x1104e0, 0x10acc6, 0x1054ac, 0x0ffc92, -+ 0x0fa478, 0x0f4c5e, 0x0ef444, 0x0e9c2a, 0x0e4410, 0x0debf6, -+ 0x0d93dc, 0x0d3bc2, 0x0ce3a8, 0x0c8b8e, 0x0c3374, 0x0bdb5a, -+ 0x0b8340, 0x0b2b26, 0x0ad30c, 0x0a7af2, 0x0a22d8, 0x09cabe, -+ 0x0972a4, 0x091a8a, 0x08c270, 0x086a56, 0x08123c, 0x07ba22, -+ 0x076208, 0x0709ee, 0x06b1d4, 0x0659ba, 0x0601a0, 0x05a986, -+ 0x05516c, 0x04f952, 0x04a138, 0x04491e, 0x03f104, 0x0398ea, -+ 0x0340d0, 0x02e8b6, 0x02909c, 0x023882, 0x01e068, 0x01884e, -+ 0x013034, 0x00d81a, 0x008000, 0x0027e6, -0x003034, -0x00884e, -+ -0x00e068, -0x013882, -0x01909c, -0x01e8b6, -0x0240d0, -0x0298ea, -+ -0x02f104, -0x03491e, -0x03a138, -0x03f952, -0x04516c, -0x04a986, -+ -0x0501a0, -0x0559ba, -0x05b1d4, -0x0609ee, -0x066208, -0x06ba22, -+ -0x07123c, -0x076a56, -0x07c270, -0x081a8a, -0x0872a4, -0x08cabe, -+ -0x0922d8, -0x097af2, -0x09d30c, -0x0a2b26, -0x0a8340, -0x0adb5a, -+ -0x0b3374, -0x0b8b8e, -0x0be3a8, -0x0c3bc2, -0x0c93dc, -0x0cebf6, -+ -0x0d4410, -0x0d9c2a, -0x0df444, -0x0e4c5e, -0x0ea478, -0x0efc92, -+ -0x0f54ac, -0x0facc6, -0x1004e0, -0x105cfa, -0x10b514, -0x110d2e, -+ -0x116548, -0x11bd62, -0x12157c, -0x126d96, -0x12c5b0, -0x131dca, -+ -0x1375e4, -0x13cdfe, -0x142618, -0x147e32, -0x14d64c, -0x152e66, -+ -0x158680, -0x15de9a, -0x1636b4, -0x168ece, -0x16e6e8, -0x173f02, -+ -0x17971c, -0x17ef36, -0x184750, -0x189f6a, -0x18f784, -0x194f9e, -+ -0x19a7b8, -0x19ffd2, -0x1a57ec, -0x1ab006, -0x1b0820, -0x1b603a, -+ -0x1bb854, -0x1c106e, -0x1c6888, -0x1cc0a2, -0x1d18bc, -0x1d70d6, -+ -0x1dc8f0, -0x1e210a, -0x1e7924, -0x1ed13e, -0x1f2958, -0x1f8172, -+ -0x1fd98c, -0x2031a6, -0x2089c0, -0x20e1da, -0x2139f4, -0x21920e, -+ -0x21ea28, -0x224242, -0x229a5c, -0x22f276, -0x234a90, -0x23a2aa, -+ -0x23fac4, -0x2452de, -0x24aaf8, -0x250312, -0x255b2c, -0x25b346, -+ -0x260b60, -0x26637a, -0x26bb94, -0x2713ae, -0x276bc8, -0x27c3e2, -+ -0x281bfc, -0x287416, -0x28cc30, -0x29244a, -0x297c64, -0x29d47e, -+ -0x2a2c98, -0x2a84b2, -0x2adccc, -0x2b34e6, -+ }; -+ -+ -+/* We assume that right shift corresponds to signed division by 2 with -+ * rounding towards minus infinity. This is correct for typical "arithmetic -+ * shift" instructions that shift in copies of the sign bit. But some -+ * C compilers implement >> with an unsigned shift. For these machines you -+ * must define RIGHT_SHIFT_IS_UNSIGNED. -+ * RIGHT_SHIFT provides a proper signed right shift of an INT32 quantity. -+ * It is only applied with constant shift counts. SHIFT_TEMPS must be -+ * included in the variables of any routine using RIGHT_SHIFT. -+ */ -+ -+#ifdef RIGHT_SHIFT_IS_UNSIGNED -+#define SHIFT_TEMPS INT32 shift_temp; -+#define RIGHT_SHIFT(x,shft) \ -+ ((shift_temp = (x)) < 0 ? \ -+ (shift_temp >> (shft)) | ((~((INT32) 0)) << (32-(shft))) : \ -+ (shift_temp >> (shft))) -+#else -+#define SHIFT_TEMPS -+#define RIGHT_SHIFT(x,shft) ((x) >> (shft)) -+#endif -+ -+ -+METHODDEF(void) -+ycc_rgb_convert_argb (j_decompress_ptr cinfo, -+ JSAMPIMAGE input_buf, JDIMENSION input_row, -+ JSAMPARRAY output_buf, int num_rows) -+{ -+ JDIMENSION num_cols = cinfo->output_width; -+ JSAMPLE * range_limit = cinfo->sample_range_limit; -+ -+ SHIFT_TEMPS -+ -+ /* This is used if we don't have SSE2 */ -+ -+ while (--num_rows >= 0) { -+ JSAMPROW inptr0 = input_buf[0][input_row]; -+ JSAMPROW inptr1 = input_buf[1][input_row]; -+ JSAMPROW inptr2 = input_buf[2][input_row]; -+ input_row++; -+ uint32_t *outptr = (uint32_t *) *output_buf++; -+ for (JDIMENSION col = 0; col < num_cols; col++) { -+ int y = GETJSAMPLE(inptr0[col]); -+ int cb = GETJSAMPLE(inptr1[col]); -+ int cr = GETJSAMPLE(inptr2[col]); -+ JSAMPLE * range_limit_y = range_limit + y; -+ /* Range-limiting is essential due to noise introduced by DCT losses. */ -+ outptr[col] = 0xFF000000 | -+ ( range_limit_y[Cr_r_tab[cr]] << 16 ) | -+ ( range_limit_y[((int) RIGHT_SHIFT(Cb_g_tab[cb] + Cr_g_tab[cr], SCALEBITS))] << 8 ) | -+ ( range_limit_y[Cb_b_tab[cb]] ); -+ } -+ } -+} -+#endif -+ -+ - ///*************** Inverted CMYK -> RGB conversion ************************* - /// Input is (Inverted) CMYK stored as 4 bytes per pixel. - /// Output is RGB stored as 3 bytes per pixel. diff --git a/www/firefox-esr/files/patch-sample-type b/www/firefox-esr/files/patch-sample-type deleted file mode 100644 index cf460a0f84d..00000000000 --- a/www/firefox-esr/files/patch-sample-type +++ /dev/null @@ -1,13 +0,0 @@ -# Let ports handle default sample type - ---- old-configure.in~ -+++ old-configure.in -@@ -5144,7 +5144,7 @@ dnl Use integers over floats for audio o - dnl (regarless of the CPU architecture, because audio - dnl backends for those platforms don't support floats. We also - dnl use integers on ARM with other OS, because it's more efficient. --if test "$OS_TARGET" = "Android" -o "$CPU_ARCH" = "arm"; then -+if test -n "$MOZ_INTEGER_SAMPLES"; then - MOZ_SAMPLE_TYPE_S16=1 - AC_DEFINE(MOZ_SAMPLE_TYPE_S16) - AC_SUBST(MOZ_SAMPLE_TYPE_S16) diff --git a/www/firefox-esr/files/patch-z-bug517422 b/www/firefox-esr/files/patch-z-bug517422 deleted file mode 100644 index 9b041089be3..00000000000 --- a/www/firefox-esr/files/patch-z-bug517422 +++ /dev/null @@ -1,496 +0,0 @@ -# Allow more config/external/ libs built against system-wide version. - -diff --git build/moz.configure/old.configure build/moz.configure/old.configure -index d0fe7accffe6..c46bdd023225 100644 ---- build/moz.configure/old.configure -+++ build/moz.configure/old.configure -@@ -285,7 +285,12 @@ def old_configure_options(*options): - '--with-system-libvpx', - '--with-system-nspr', - '--with-system-nss', -+ '--with-system-ogg', - '--with-system-png', -+ '--with-system-soundtouch', -+ '--with-system-theora', -+ '--with-system-tremor', -+ '--with-system-vorbis', - '--with-system-zlib', - '--with-thumb', - '--with-thumb-interwork', -diff --git config/external/moz.build config/external/moz.build -index 029ff8504795..2c3a40caa1ba 100644 ---- config/external/moz.build -+++ config/external/moz.build -@@ -23,12 +23,21 @@ external_dirs += ['modules/woff2'] - - external_dirs += ['modules/xz-embedded'] - --if CONFIG['MOZ_VORBIS']: -+if not CONFIG['MOZ_SYSTEM_OGG']: -+ external_dirs += ['media/libogg'] -+ -+if CONFIG['MOZ_VORBIS'] and not CONFIG['MOZ_SYSTEM_VORBIS']: - external_dirs += ['media/libvorbis'] - --if CONFIG['MOZ_TREMOR']: -+if CONFIG['MOZ_TREMOR'] and not CONFIG['MOZ_SYSTEM_TREMOR']: - external_dirs += ['media/libtremor'] - -+if not CONFIG['MOZ_SYSTEM_THEORA']: -+ external_dirs += ['media/libtheora'] -+ -+if not CONFIG['MOZ_SYSTEM_SOUNDTOUCH']: -+ external_dirs += ['media/libsoundtouch'] -+ - if CONFIG['MOZ_WEBM_ENCODER']: - external_dirs += ['media/libmkv'] - -@@ -51,11 +60,8 @@ external_dirs += [ - 'media/kiss_fft', - 'media/libcubeb', - 'media/libnestegg', -- 'media/libogg', - 'media/libopus', -- 'media/libtheora', - 'media/libspeex_resampler', -- 'media/libsoundtouch', - 'media/mp4parse-rust', - 'media/psshparser' - ] -diff --git config/system-headers.mozbuild config/system-headers.mozbuild -index 09d3db5ca8c0..c6533b84c470 100644 ---- config/system-headers.mozbuild -+++ config/system-headers.mozbuild -@@ -1325,6 +1325,28 @@ if CONFIG['MOZ_SYSTEM_HARFBUZZ']: - 'harfbuzz/hb.h', - ] - -+if CONFIG['MOZ_SYSTEM_OGG']: -+ system_headers += [ -+ 'ogg/ogg.h', -+ 'ogg/os_types.h', -+ ] -+ -+if CONFIG['MOZ_SYSTEM_THEORA']: -+ system_headers += [ -+ 'theora/theoradec.h', -+ ] -+ -+if CONFIG['MOZ_SYSTEM_VORBIS']: -+ system_headers += [ -+ 'vorbis/codec.h', -+ 'vorbis/vorbisenc.h', -+ ] -+ -+if CONFIG['MOZ_SYSTEM_TREMOR']: -+ system_headers += [ -+ 'tremor/ivorbiscodec.h', -+ ] -+ - if CONFIG['MOZ_SYSTEM_LIBVPX']: - system_headers += [ - 'vpx_mem/vpx_mem.h', -diff --git dom/media/AudioStream.cpp dom/media/AudioStream.cpp -index 93ecda4319af..ff674c64ea07 100644 ---- dom/media/AudioStream.cpp -+++ dom/media/AudioStream.cpp -@@ -121,7 +121,9 @@ AudioStream::AudioStream(DataSource& aSource) - : mMonitor("AudioStream") - , mChannels(0) - , mOutChannels(0) -+#ifndef MOZ_SYSTEM_SOUNDTOUCH - , mTimeStretcher(nullptr) -+#endif - , mDumpFile(nullptr) - , mState(INITIALIZED) - , mDataSource(aSource) -@@ -142,9 +144,11 @@ AudioStream::~AudioStream() - if (mDumpFile) { - fclose(mDumpFile); - } -+#ifndef MOZ_SYSTEM_SOUNDTOUCH - if (mTimeStretcher) { - soundtouch::destroySoundTouchObj(mTimeStretcher); - } -+#endif - #if defined(XP_WIN) - if (XRE_IsContentProcess()) { - audio::AudioNotificationReceiver::Unregister(this); -@@ -168,7 +172,11 @@ nsresult AudioStream::EnsureTimeStretcherInitializedUnlocked() - { - mMonitor.AssertCurrentThreadOwns(); - if (!mTimeStretcher) { -+#ifdef MOZ_SYSTEM_SOUNDTOUCH -+ mTimeStretcher = new soundtouch::SoundTouch(); -+#else - mTimeStretcher = soundtouch::createSoundTouchObj(); -+#endif - mTimeStretcher->setSampleRate(mAudioClock.GetInputRate()); - mTimeStretcher->setChannels(mOutChannels); - mTimeStretcher->setPitch(1.0); -diff --git dom/media/AudioStream.h dom/media/AudioStream.h -index 7dc1f60f95cc..67d402a4117f 100644 ---- dom/media/AudioStream.h -+++ dom/media/AudioStream.h -@@ -15,7 +15,11 @@ - #include "mozilla/TimeStamp.h" - #include "mozilla/UniquePtr.h" - #include "CubebUtils.h" -+#ifdef MOZ_SYSTEM_SOUNDTOUCH -+#include "soundtouch/SoundTouch.h" -+#else - #include "soundtouch/SoundTouchFactory.h" -+#endif - - #if defined(XP_WIN) - #include "mozilla/audio/AudioNotificationReceiver.h" -@@ -297,7 +301,11 @@ private: - uint32_t mChannels; - uint32_t mOutChannels; - AudioClock mAudioClock; -+#ifdef MOZ_SYSTEM_SOUNDTOUCH -+ nsAutoPtr mTimeStretcher; -+#else - soundtouch::SoundTouch* mTimeStretcher; -+#endif - - // Output file for dumping audio - FILE* mDumpFile; -diff --git dom/media/moz.build dom/media/moz.build -index 86b051c58d33..fb6186dce78b 100644 ---- dom/media/moz.build -+++ dom/media/moz.build -@@ -326,6 +326,21 @@ if CONFIG['MOZ_WEBRTC']: - - DEFINES['MOZILLA_INTERNAL_API'] = True - -+if CONFIG['MOZ_SYSTEM_OGG']: -+ CXXFLAGS += CONFIG['MOZ_OGG_CFLAGS'] -+ -+if CONFIG['MOZ_SYSTEM_THEORA']: -+ CXXFLAGS += CONFIG['MOZ_THEORA_CFLAGS'] -+ -+if CONFIG['MOZ_SYSTEM_VORBIS']: -+ CXXFLAGS += CONFIG['MOZ_VORBIS_CFLAGS'] -+ -+if CONFIG['MOZ_SYSTEM_TREMOR']: -+ CXXFLAGS += CONFIG['MOZ_TREMOR_CFLAGS'] -+ -+if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']: -+ CXXFLAGS += CONFIG['MOZ_SOUNDTOUCH_CFLAGS'] -+ - if CONFIG['MOZ_ANDROID_HLS_SUPPORT']: - DEFINES['MOZ_ANDROID_HLS_SUPPORT'] = True - -diff --git dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp -index 078f6ea5ef60..c600db067539 100644 ---- dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp -+++ dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp -@@ -15,9 +15,13 @@ - #include - #endif - -+#ifdef MOZ_SYSTEM_SOUNDTOUCH -+#include "nsXPCOMPrivate.h" // for XUL_DLL -+#else - // We use a known symbol located in lgpllibs to determine its location. - // soundtouch happens to be always included in lgpllibs - #include "soundtouch/SoundTouch.h" -+#endif - - namespace mozilla { - -@@ -64,6 +68,12 @@ FFVPXRuntimeLinker::Init() - - sLinkStatus = LinkStatus_FAILED; - -+#ifdef MOZ_SYSTEM_SOUNDTOUCH -+ // We retrieve the path of the XUL library as this is where mozavcodec and -+ // mozavutil libs are located. -+ char* path = -+ PR_GetLibraryFilePathname(XUL_DLL, (PRFuncPtr)&FFVPXRuntimeLinker::Init); -+#else - // We retrieve the path of the lgpllibs library as this is where mozavcodec - // and mozavutil libs are located. - PathString lgpllibsname = GetLibraryName(nullptr, "lgpllibs"); -@@ -73,6 +83,7 @@ FFVPXRuntimeLinker::Init() - PathString path = - GetLibraryFilePathname(lgpllibsname.get(), - (PRFuncPtr)&soundtouch::SoundTouch::getVersionId); -+#endif - if (path.IsEmpty()) { - return false; - } -diff --git media/libogg/README_MOZILLA media/libogg/README_MOZILLA -index 6213fdc7770c..ada799916a17 100644 ---- media/libogg/README_MOZILLA -+++ media/libogg/README_MOZILLA -@@ -6,3 +6,6 @@ package downloaded from xiph.org and copied using the update.sh script. - The int-types.patch address a bug that config_types.h generated from - Linux platform can't be used on OpenSolaris directly see Mozilla bug - 449754 -+ -+The in-tree copy may be omitted during build by --with-system-ogg. -+Keep version in old-configure.in in sync on updates. -diff --git media/libsoundtouch/README_MOZILLA media/libsoundtouch/README_MOZILLA -index dc0dbe8f6886..ea73b55e3e39 100644 ---- media/libsoundtouch/README_MOZILLA -+++ media/libsoundtouch/README_MOZILLA -@@ -6,3 +6,5 @@ The whole library is not used, only the relevant files are imported in the tree, - using the script `update.sh`. Some changes have been made to the files, using - the patch `moz-libsoundtouch.patch`. We also use a custom soundtouch_config.h. - -+The in-tree copy may be omitted during build by --with-system-soundtouch. -+Keep version in old-configure.in in sync on updates. -diff --git media/libsoundtouch/src/soundtouch_perms.h media/libsoundtouch/src/soundtouch_perms.h -index 0af2fe618311..10973564e7a4 100644 ---- media/libsoundtouch/src/soundtouch_perms.h -+++ media/libsoundtouch/src/soundtouch_perms.h -@@ -12,7 +12,9 @@ - - #pragma GCC visibility push(default) - #include "SoundTouch.h" -+#ifndef MOZ_SYSTEM_SOUNDTOUCH - #include "SoundTouchFactory.h" -+#endif - #pragma GCC visibility pop - - #endif // MOZILLA_SOUNDTOUCH_PERMS_H -diff --git media/libtheora/README_MOZILLA media/libtheora/README_MOZILLA -index d48dbfa6f63d..6f30f250220e 100644 ---- media/libtheora/README_MOZILLA -+++ media/libtheora/README_MOZILLA -@@ -3,3 +3,6 @@ using the update.sh script. The changes made were those applied by update.sh, - the addition/update of Makefile.in files for the Mozilla build system. - - The subversion revision used was r17578. -+ -+The in-tree copy may be omitted during build by --with-system-theora. -+Keep version in old-configure.in in sync on updates. -diff --git media/libtheora/moz.build media/libtheora/moz.build -index c7f85eebff95..aae7b814adb5 100644 ---- media/libtheora/moz.build -+++ media/libtheora/moz.build -@@ -21,6 +21,9 @@ FINAL_LIBRARY = 'gkmedias' - # The encoder is currently not included. - DEFINES['THEORA_DISABLE_ENCODE'] = True - -+if CONFIG['MOZ_SYSTEM_OGG']: -+ CFLAGS += CONFIG['MOZ_OGG_CFLAGS'] -+ - # Suppress warnings in third-party code. - if CONFIG['CC_TYPE'] in ('clang', 'clang-cl', 'gcc'): - CFLAGS += ['-Wno-type-limits'] -diff --git media/libtremor/README_MOZILLA media/libtremor/README_MOZILLA -index ee67b53a05c5..81c971773d55 100644 ---- media/libtremor/README_MOZILLA -+++ media/libtremor/README_MOZILLA -@@ -5,3 +5,6 @@ Makefile.in files for the Mozilla build system. - - The upstream release used was http://svn.xiph.org/trunk/Tremor/ - The subversion revision used was r17547. -+ -+The in-tree copy may be omitted during build by --with-system-tremor. -+Keep version in old-configure.in in sync on updates. -diff --git media/libtremor/moz.build media/libtremor/moz.build -index 83afc8e37c64..71ef159da3d7 100644 ---- media/libtremor/moz.build -+++ media/libtremor/moz.build -@@ -9,3 +9,5 @@ with Files('*'): - - DIRS += ['include/tremor', 'lib'] - -+if CONFIG['MOZ_SYSTEM_OGG']: -+ CFLAGS += CONFIG['MOZ_OGG_CFLAGS'] -diff --git media/libvorbis/README_MOZILLA media/libvorbis/README_MOZILLA -index 1211ac074b33..eb31084aed25 100644 ---- media/libvorbis/README_MOZILLA -+++ media/libvorbis/README_MOZILLA -@@ -8,3 +8,6 @@ from https://git.xiph.org/vorbis.git - - Some files are renamed during the copy to prevent clashes with object - file names with other Mozilla libraries. -+ -+The in-tree copy may be omitted during build by --with-system-vorbis. -+Keep version in old-configure.in in sync on updates. -diff --git media/libvorbis/moz.build media/libvorbis/moz.build -index adf393782cc9..923b76231107 100644 ---- media/libvorbis/moz.build -+++ media/libvorbis/moz.build -@@ -56,3 +56,6 @@ FINAL_LIBRARY = 'gkmedias' - # Suppress warnings in third-party code. - if CONFIG['CC_TYPE'] in ('clang', 'gcc'): - CFLAGS += ['-Wno-uninitialized'] -+ -+if CONFIG['MOZ_SYSTEM_OGG']: -+ CFLAGS += CONFIG['MOZ_OGG_CFLAGS'] -diff --git old-configure.in old-configure.in -index b614eef85c89..85f9099dba4d 100644 ---- old-configure.in -+++ old-configure.in -@@ -2627,6 +2627,111 @@ if test -n "$MOZ_APPLEMEDIA"; then - fi - fi # COMPILE_ENVIRONMENT - -+dnl ======================================================== -+dnl Check for libogg -+dnl ======================================================== -+ -+MOZ_ARG_WITH_BOOL(system-ogg, -+[ --with-system-ogg Use system libogg (located with pkgconfig)], -+MOZ_SYSTEM_OGG=1, -+MOZ_SYSTEM_OGG=) -+ -+if test -n "$MOZ_SYSTEM_OGG"; then -+ PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.3.3) -+ -+ _SAVE_LIBS=$LIBS -+ LIBS="$LIBS $MOZ_OGG_LIBS" -+ AC_CHECK_FUNC(ogg_set_mem_functions, [], -+ [AC_DEFINE(MOZ_OGG_NO_MEM_REPORTING)]) -+ LIBS=$_SAVE_LIBS -+fi -+ -+AC_SUBST(MOZ_SYSTEM_OGG) -+ -+dnl ======================================================== -+dnl Check for libvorbis -+dnl ======================================================== -+ -+MOZ_ARG_WITH_BOOL(system-vorbis, -+[ --with-system-vorbis Use system libvorbis (located with pkgconfig)], -+MOZ_SYSTEM_VORBIS=1, -+MOZ_SYSTEM_VORBIS=) -+ -+if test -n "$MOZ_SYSTEM_VORBIS"; then -+ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.6) -+fi -+ -+AC_SUBST(MOZ_SYSTEM_VORBIS) -+ -+dnl ======================================================== -+dnl Check for integer-only libvorbis aka tremor -+dnl ======================================================== -+ -+MOZ_ARG_WITH_BOOL(system-tremor, -+[ --with-system-tremor Use system libtremor (located with pkgconfig)], -+MOZ_SYSTEM_TREMOR=1, -+MOZ_SYSTEM_TREMOR=) -+ -+if test -n "$MOZ_SYSTEM_TREMOR"; then -+ PKG_CHECK_MODULES(MOZ_TREMOR, vorbisidec >= 1.2.1) -+fi -+ -+AC_SUBST(MOZ_SYSTEM_TREMOR) -+ -+dnl ======================================================== -+dnl Check for libtheora -+dnl ======================================================== -+ -+MOZ_ARG_WITH_BOOL(system-theora, -+[ --with-system-theora Use system libtheora (located with pkgconfig)], -+MOZ_SYSTEM_THEORA=1, -+MOZ_SYSTEM_THEORA=) -+ -+if test -n "$MOZ_SYSTEM_THEORA"; then -+ PKG_CHECK_MODULES(MOZ_THEORA, theora >= 1.2) -+fi -+ -+AC_SUBST(MOZ_SYSTEM_THEORA) -+ -+dnl ======================================================== -+dnl Check for libSoundTouch -+dnl ======================================================== -+ -+MOZ_ARG_WITH_BOOL(system-soundtouch, -+[ --with-system-soundtouch Use system libSoundTouch (located with pkgconfig)], -+MOZ_SYSTEM_SOUNDTOUCH=1, -+MOZ_SYSTEM_SOUNDTOUCH=) -+ -+if test -n "$MOZ_SYSTEM_SOUNDTOUCH"; then -+ PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.9.0) -+ -+ AC_LANG_SAVE -+ AC_LANG_CPLUSPLUS -+ _SAVE_CXXFLAGS=$CXXFLAGS -+ CXXFLAGS="$CXXFLAGS $MOZ_SOUNDTOUCH_CFLAGS" -+ AC_CACHE_CHECK(for soundtouch sample type, -+ ac_cv_soundtouch_sample_type, -+ [AC_TRY_COMPILE([#include -+ #ifndef SOUNDTOUCH_INTEGER_SAMPLES -+ #error soundtouch expects float samples -+ #endif], -+ [], -+ [ac_cv_soundtouch_sample_type=short], -+ [ac_cv_soundtouch_sample_type=float])]) -+ CXXFLAGS=$_SAVE_CXXFLAGS -+ AC_LANG_RESTORE -+ -+ if test \( -n "$MOZ_SAMPLE_TYPE_S16" -a "$ac_cv_soundtouch_sample_type" != short \) \ -+ -o \( -n "$MOZ_SAMPLE_TYPE_FLOAT32" -a "$ac_cv_soundtouch_sample_type" != float \) ; then -+ AC_MSG_ERROR([SoundTouch library is built with incompatible sample type. Either rebuild the library with/without --enable-integer-samples, chase default Mozilla sample type or remove --with-system-soundtouch.]) -+ fi -+fi -+ -+if test -n "$MOZ_SYSTEM_SOUNDTOUCH"; then -+ AC_DEFINE(MOZ_SYSTEM_SOUNDTOUCH) -+fi -+AC_SUBST(MOZ_SYSTEM_SOUNDTOUCH) -+ - dnl system libvpx Support - dnl ======================================================== - MOZ_ARG_WITH_BOOL(system-libvpx, -diff --git toolkit/library/moz.build toolkit/library/moz.build -index 079a575adec3..514d901195de 100644 ---- toolkit/library/moz.build -+++ toolkit/library/moz.build -@@ -240,6 +240,21 @@ if CONFIG['MOZ_SYSTEM_HARFBUZZ']: - if CONFIG['MOZ_SYSTEM_HUNSPELL']: - OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS'] - -+if CONFIG['MOZ_SYSTEM_OGG']: -+ OS_LIBS += CONFIG['MOZ_OGG_LIBS'] -+ -+if CONFIG['MOZ_SYSTEM_THEORA']: -+ OS_LIBS += CONFIG['MOZ_THEORA_LIBS'] -+ -+if CONFIG['MOZ_SYSTEM_VORBIS']: -+ OS_LIBS += CONFIG['MOZ_VORBIS_LIBS'] -+ -+if CONFIG['MOZ_SYSTEM_TREMOR']: -+ OS_LIBS += CONFIG['MOZ_TREMOR_LIBS'] -+ -+if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']: -+ OS_LIBS += CONFIG['MOZ_SOUNDTOUCH_LIBS'] -+ - if CONFIG['MOZ_SYSTEM_LIBEVENT']: - OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS'] - -diff --git xpcom/build/XPCOMInit.cpp xpcom/build/XPCOMInit.cpp -index c083ab4bc4f3..62b917043a2c 100644 ---- xpcom/build/XPCOMInit.cpp -+++ xpcom/build/XPCOMInit.cpp -@@ -132,7 +132,9 @@ extern nsresult nsStringInputStreamConstructor(nsISupports*, REFNSIID, void**); - - #include "mozilla/ipc/GeckoChildProcessHost.h" - -+#ifndef MOZ_OGG_NO_MEM_REPORTING - #include "ogg/ogg.h" -+#endif - #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING) - #if defined(HAVE_STDINT_H) - // mozilla-config.h defines HAVE_STDINT_H, and then it's defined *again* in -@@ -639,11 +641,13 @@ NS_InitXPCOM2(nsIServiceManager** aResult, - // this oddness. - mozilla::SetICUMemoryFunctions(); - -+#ifndef MOZ_OGG_NO_MEM_REPORTING - // Do the same for libogg. - ogg_set_mem_functions(OggReporter::CountingMalloc, - OggReporter::CountingCalloc, - OggReporter::CountingRealloc, - OggReporter::CountingFree); -+#endif - - #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING) - // And for VPX. diff --git a/www/firefox-esr/pkg-message b/www/firefox-esr/pkg-message index 350197ac33d..a947abccda5 100644 --- a/www/firefox-esr/pkg-message +++ b/www/firefox-esr/pkg-message @@ -1,7 +1,7 @@ ====================================================================== Some features available on other platforms are not implemented: -- Native audio (OSS backend is incomplete, doesn't support WebRTC) +- Native audio (requires OSS backend, feature parity with ALSA or PulseAudio) - Encrypted Media Extensions (requires Widevine CDM binary) - Process sandboxing (requires Capsicum backend) - Reduced memory usage (requires mozjemalloc) @@ -22,7 +22,7 @@ $ sysctl net.local.stream.recvspace=16384 To select non-default audio backend open about:config page and create media.cubeb.backend preference. Supported values are: alsa, jack, -pulse, pulse-rust, oss, sndio. Currently used backend can be inspected +pulse, pulse-rust, sndio. Currently used backend can be inspected on about:support page. ====================================================================== diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 2cd0d25f9ee..abad92f28d3 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -3,6 +3,7 @@ PORTNAME= firefox DISTVERSION= 63.0.3 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ @@ -27,12 +28,11 @@ BUILD_DEPENDS= nspr>=4.19:devel/nspr \ autoconf-2.13:devel/autoconf213 \ yasm:devel/yasm \ zip:archivers/zip -# soundtouch>=1.9.0:audio/soundtouch \ USE_GECKO= gecko CONFLICTS_INSTALL= firefox-esr MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= -cairo -hunspell -soundtouch +USE_MOZILLA= -hunspell USES= tar:xz @@ -45,7 +45,7 @@ FIREFOX_DESKTOP= ${MOZSRC}/taskcluster/docker/${MOZILLA}-snap/${MOZILLA}.desktop MOZ_OPTIONS= --enable-application=browser \ --enable-official-branding -OPTIONS_EXCLUDE= BUNDLED_CAIRO DTRACE +OPTIONS_EXCLUDE= DTRACE .include "${.CURDIR}/../../www/firefox/Makefile.options" diff --git a/www/firefox/Makefile.options b/www/firefox/Makefile.options index 694607dec0b..aebcfc58b17 100644 --- a/www/firefox/Makefile.options +++ b/www/firefox/Makefile.options @@ -1,12 +1,10 @@ # -*- makefile-bsdmake -*- -OPTIONS_DEFINE+= BUNDLED_CAIRO CANBERRA DBUS DEBUG DTRACE FFMPEG GCONF \ - INTEGER_SAMPLES LIBPROXY \ - OPTIMIZED_CFLAGS PROFILE TEST WAYLAND +OPTIONS_DEFINE+= CANBERRA DBUS DEBUG DTRACE FFMPEG GCONF \ + LIBPROXY OPTIMIZED_CFLAGS PROFILE TEST WAYLAND OPTIONS_DEFAULT+= DBUS FFMPEG GCONF OPTIMIZED_CFLAGS PROFILE WAYLAND \ - ${OPTIONS_MULTI_AUDIO:NSNDIO} \ - ${MACHINE_CPU:Msoftfp:C/.+/INTEGER_SAMPLES/} + ${OPTIONS_MULTI_AUDIO:NSNDIO} OPTIONS_MULTI+= AUDIO OPTIONS_MULTI_AUDIO= ALSA JACK PULSEAUDIO SNDIO @@ -25,9 +23,7 @@ OPTIONS_EXCLUDE+= DTRACE OPTIONS_DEFAULT_amd64+= DTRACE OPTIONS_DEFAULT_i386+= DTRACE -BUNDLED_CAIRO_DESC?= Use bundled fork of cairo-1.9.5 CANBERRA_DESC?= Sound theme alerts -INTEGER_SAMPLES_DESC?= Integer audio sample format LIBPROXY_DESC?= Proxy support via libproxy LIGHTNING_DESC?= Calendar extension RUST_DESC?= Build with components written in Rust language diff --git a/www/firefox/files/patch-bug1021761 b/www/firefox/files/patch-bug1021761 deleted file mode 100644 index a771d13a6cf..00000000000 --- a/www/firefox/files/patch-bug1021761 +++ /dev/null @@ -1,1268 +0,0 @@ -commit f9bcf9c81c4a -Author: Evgeniy Vodolazskiy -Date: Tue Sep 9 14:38:00 2014 -0700 - - Bug 1021761 - Make ALSA optional on Linux, allowing fallback to another backend. r=kinetik r=glandium ---- - media/libcubeb/gtest/moz.build | 1 - - media/libcubeb/src/cubeb_alsa.c | 228 +++++++++++++++++++++++++++++----------- - toolkit/library/moz.build | 3 - - 3 files changed, 168 insertions(+), 64 deletions(-) - -diff --git media/libcubeb/gtest/moz.build media/libcubeb/gtest/moz.build -index 558130188c2e..0cf157d41903 100644 ---- media/libcubeb/gtest/moz.build -+++ media/libcubeb/gtest/moz.build -@@ -72,7 +72,6 @@ elif CONFIG['OS_TARGET'] == 'OpenBSD': - 'sndio', - ] - else: -- OS_LIBS += CONFIG['MOZ_ALSA_LIBS'] - OS_LIBS += CONFIG['MOZ_PULSEAUDIO_LIBS'] - - if CONFIG['CC_TYPE'] in ('clang', 'gcc'): -diff --git media/libcubeb/src/cubeb_alsa.c media/libcubeb/src/cubeb_alsa.c -index bfd4d8f199d4..213c1eaa3d07 100644 ---- media/libcubeb/src/cubeb_alsa.c -+++ media/libcubeb/src/cubeb_alsa.c -@@ -12,6 +12,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -25,6 +26,52 @@ - - #define ALSA_PA_PLUGIN "ALSA <-> PulseAudio PCM I/O Plugin" - -+#ifdef DISABLE_LIBASOUND_DLOPEN -+#define WRAP(x) x -+#else -+#define WRAP(x) cubeb_##x -+#define MAKE_TYPEDEF(x) static typeof(x) * cubeb_##x -+MAKE_TYPEDEF(snd_config); -+MAKE_TYPEDEF(snd_config_add); -+MAKE_TYPEDEF(snd_config_copy); -+MAKE_TYPEDEF(snd_config_delete); -+MAKE_TYPEDEF(snd_config_get_id); -+MAKE_TYPEDEF(snd_config_get_string); -+MAKE_TYPEDEF(snd_config_imake_integer); -+MAKE_TYPEDEF(snd_config_search); -+MAKE_TYPEDEF(snd_config_search_definition); -+MAKE_TYPEDEF(snd_lib_error_set_handler); -+MAKE_TYPEDEF(snd_pcm_avail_update); -+MAKE_TYPEDEF(snd_pcm_close); -+MAKE_TYPEDEF(snd_pcm_delay); -+MAKE_TYPEDEF(snd_pcm_drain); -+MAKE_TYPEDEF(snd_pcm_frames_to_bytes); -+MAKE_TYPEDEF(snd_pcm_get_params); -+/* snd_pcm_hw_params_alloca is actually a macro */ -+/* MAKE_TYPEDEF(snd_pcm_hw_params_alloca); */ -+MAKE_TYPEDEF(snd_pcm_hw_params_sizeof); -+#define snd_pcm_hw_params_sizeof cubeb_snd_pcm_hw_params_sizeof -+MAKE_TYPEDEF(snd_pcm_hw_params_any); -+MAKE_TYPEDEF(snd_pcm_hw_params_get_channels_max); -+MAKE_TYPEDEF(snd_pcm_hw_params_get_rate); -+MAKE_TYPEDEF(snd_pcm_hw_params_set_rate_near); -+MAKE_TYPEDEF(snd_pcm_nonblock); -+MAKE_TYPEDEF(snd_pcm_open); -+MAKE_TYPEDEF(snd_pcm_open_lconf); -+MAKE_TYPEDEF(snd_pcm_pause); -+MAKE_TYPEDEF(snd_pcm_poll_descriptors); -+MAKE_TYPEDEF(snd_pcm_poll_descriptors_count); -+MAKE_TYPEDEF(snd_pcm_poll_descriptors_revents); -+MAKE_TYPEDEF(snd_pcm_readi); -+MAKE_TYPEDEF(snd_pcm_recover); -+MAKE_TYPEDEF(snd_pcm_set_params); -+MAKE_TYPEDEF(snd_pcm_start); -+MAKE_TYPEDEF(snd_pcm_state); -+MAKE_TYPEDEF(snd_pcm_writei); -+ -+#undef MAKE_TYPEDEF -+#endif -+ - /* ALSA is not thread-safe. snd_pcm_t instances are individually protected - by the owning cubeb_stream's mutex. snd_pcm_t creation and destruction - is not thread-safe until ALSA 1.0.24 (see alsa-lib.git commit 91c9c8f1), -@@ -65,6 +112,8 @@ struct cubeb { - workaround is not required. */ - snd_config_t * local_config; - int is_pa; -+ -+ void * libasound; - }; - - enum stream_state { -@@ -245,8 +294,8 @@ set_timeout(struct timeval * timeout, unsigned int ms) - static void - stream_buffer_decrement(cubeb_stream * stm, long count) - { -- char * bufremains = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, count); -- memmove(stm->buffer, bufremains, snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes - count)); -+ char * bufremains = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, count); -+ memmove(stm->buffer, bufremains, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes - count)); - stm->bufframes -= count; - } - -@@ -278,9 +327,9 @@ alsa_process_stream(cubeb_stream * stm) - /* Call _poll_descriptors_revents() even if we don't use it - to let underlying plugins clear null events. Otherwise poll() - may wake up again and again, producing unnecessary CPU usage. */ -- snd_pcm_poll_descriptors_revents(stm->pcm, stm->fds, stm->nfds, &revents); -+ WRAP(snd_pcm_poll_descriptors_revents)(stm->pcm, stm->fds, stm->nfds, &revents); - -- avail = snd_pcm_avail_update(stm->pcm); -+ avail = WRAP(snd_pcm_avail_update)(stm->pcm); - - /* Got null event? Bail and wait for another wakeup. */ - if (avail == 0) { -@@ -303,7 +352,7 @@ alsa_process_stream(cubeb_stream * stm) - // TODO: should it be marked as DRAINING? - } - -- got = snd_pcm_readi(stm->pcm, stm->buffer+stm->bufframes, avail); -+ got = WRAP(snd_pcm_readi)(stm->pcm, stm->buffer+stm->bufframes, avail); - - if (got < 0) { - avail = got; // the error handler below will recover us -@@ -347,7 +396,7 @@ alsa_process_stream(cubeb_stream * stm) - (!stm->other_stream || stm->other_stream->bufframes > 0)) { - long got = avail - stm->bufframes; - void * other_buffer = stm->other_stream ? stm->other_stream->buffer : NULL; -- char * buftail = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes); -+ char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes); - - /* Correct read size to the other stream available frames */ - if (stm->other_stream && got > (snd_pcm_sframes_t) stm->other_stream->bufframes) { -@@ -374,8 +423,8 @@ alsa_process_stream(cubeb_stream * stm) - long drain_frames = avail - stm->bufframes; - double drain_time = (double) drain_frames / stm->params.rate; - -- char * buftail = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes); -- memset(buftail, 0, snd_pcm_frames_to_bytes(stm->pcm, drain_frames)); -+ char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes); -+ memset(buftail, 0, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, drain_frames)); - stm->bufframes = avail; - - /* Mark as draining, unless we're waiting for capture */ -@@ -402,7 +451,7 @@ alsa_process_stream(cubeb_stream * stm) - } - } - -- wrote = snd_pcm_writei(stm->pcm, stm->buffer, avail); -+ wrote = WRAP(snd_pcm_writei)(stm->pcm, stm->buffer, avail); - if (wrote < 0) { - avail = wrote; // the error handler below will recover us - } else { -@@ -415,13 +464,13 @@ alsa_process_stream(cubeb_stream * stm) - - /* Got some error? Let's try to recover the stream. */ - if (avail < 0) { -- avail = snd_pcm_recover(stm->pcm, avail, 0); -+ avail = WRAP(snd_pcm_recover)(stm->pcm, avail, 0); - - /* Capture pcm must be started after initial setup/recover */ - if (avail >= 0 && - stm->stream_type == SND_PCM_STREAM_CAPTURE && -- snd_pcm_state(stm->pcm) == SND_PCM_STATE_PREPARED) { -- avail = snd_pcm_start(stm->pcm); -+ WRAP(snd_pcm_state)(stm->pcm) == SND_PCM_STATE_PREPARED) { -+ avail = WRAP(snd_pcm_start)(stm->pcm); - } - } - -@@ -537,26 +586,26 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm) - - slave_def = NULL; - -- r = snd_config_search(root_pcm, "slave", &slave_pcm); -+ r = WRAP(snd_config_search)(root_pcm, "slave", &slave_pcm); - if (r < 0) { - return NULL; - } - -- r = snd_config_get_string(slave_pcm, &string); -+ r = WRAP(snd_config_get_string)(slave_pcm, &string); - if (r >= 0) { -- r = snd_config_search_definition(lconf, "pcm_slave", string, &slave_def); -+ r = WRAP(snd_config_search_definition)(lconf, "pcm_slave", string, &slave_def); - if (r < 0) { - return NULL; - } - } - - do { -- r = snd_config_search(slave_def ? slave_def : slave_pcm, "pcm", &pcm); -+ r = WRAP(snd_config_search)(slave_def ? slave_def : slave_pcm, "pcm", &pcm); - if (r < 0) { - break; - } - -- r = snd_config_get_string(slave_def ? slave_def : slave_pcm, &string); -+ r = WRAP(snd_config_get_string)(slave_def ? slave_def : slave_pcm, &string); - if (r < 0) { - break; - } -@@ -565,7 +614,7 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm) - if (r < 0 || r > (int) sizeof(node_name)) { - break; - } -- r = snd_config_search(lconf, node_name, &pcm); -+ r = WRAP(snd_config_search)(lconf, node_name, &pcm); - if (r < 0) { - break; - } -@@ -574,7 +623,7 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm) - } while (0); - - if (slave_def) { -- snd_config_delete(slave_def); -+ WRAP(snd_config_delete)(slave_def); - } - - return NULL; -@@ -597,22 +646,22 @@ init_local_config_with_workaround(char const * pcm_name) - - lconf = NULL; - -- if (snd_config == NULL) { -+ if (*WRAP(snd_config) == NULL) { - return NULL; - } - -- r = snd_config_copy(&lconf, snd_config); -+ r = WRAP(snd_config_copy)(&lconf, *WRAP(snd_config)); - if (r < 0) { - return NULL; - } - - do { -- r = snd_config_search_definition(lconf, "pcm", pcm_name, &pcm_node); -+ r = WRAP(snd_config_search_definition)(lconf, "pcm", pcm_name, &pcm_node); - if (r < 0) { - break; - } - -- r = snd_config_get_id(pcm_node, &string); -+ r = WRAP(snd_config_get_id)(pcm_node, &string); - if (r < 0) { - break; - } -@@ -621,7 +670,7 @@ init_local_config_with_workaround(char const * pcm_name) - if (r < 0 || r > (int) sizeof(node_name)) { - break; - } -- r = snd_config_search(lconf, node_name, &pcm_node); -+ r = WRAP(snd_config_search)(lconf, node_name, &pcm_node); - if (r < 0) { - break; - } -@@ -632,12 +681,12 @@ init_local_config_with_workaround(char const * pcm_name) - } - - /* Fetch the PCM node's type, and bail out if it's not the PulseAudio plugin. */ -- r = snd_config_search(pcm_node, "type", &node); -+ r = WRAP(snd_config_search)(pcm_node, "type", &node); - if (r < 0) { - break; - } - -- r = snd_config_get_string(node, &string); -+ r = WRAP(snd_config_get_string)(node, &string); - if (r < 0) { - break; - } -@@ -648,18 +697,18 @@ init_local_config_with_workaround(char const * pcm_name) - - /* Don't clobber an explicit existing handle_underrun value, set it only - if it doesn't already exist. */ -- r = snd_config_search(pcm_node, "handle_underrun", &node); -+ r = WRAP(snd_config_search)(pcm_node, "handle_underrun", &node); - if (r != -ENOENT) { - break; - } - - /* Disable pcm_pulse's asynchronous underrun handling. */ -- r = snd_config_imake_integer(&node, "handle_underrun", 0); -+ r = WRAP(snd_config_imake_integer)(&node, "handle_underrun", 0); - if (r < 0) { - break; - } - -- r = snd_config_add(pcm_node, node); -+ r = WRAP(snd_config_add)(pcm_node, node); - if (r < 0) { - break; - } -@@ -667,7 +716,7 @@ init_local_config_with_workaround(char const * pcm_name) - return lconf; - } while (0); - -- snd_config_delete(lconf); -+ WRAP(snd_config_delete)(lconf); - - return NULL; - } -@@ -679,9 +728,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, char const * pcm_name, snd_pcm_stream_t s - - pthread_mutex_lock(&cubeb_alsa_mutex); - if (local_config) { -- r = snd_pcm_open_lconf(pcm, pcm_name, stream, SND_PCM_NONBLOCK, local_config); -+ r = WRAP(snd_pcm_open_lconf)(pcm, pcm_name, stream, SND_PCM_NONBLOCK, local_config); - } else { -- r = snd_pcm_open(pcm, pcm_name, stream, SND_PCM_NONBLOCK); -+ r = WRAP(snd_pcm_open)(pcm, pcm_name, stream, SND_PCM_NONBLOCK); - } - pthread_mutex_unlock(&cubeb_alsa_mutex); - -@@ -694,7 +743,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm) - int r; - - pthread_mutex_lock(&cubeb_alsa_mutex); -- r = snd_pcm_close(pcm); -+ r = WRAP(snd_pcm_close)(pcm); - pthread_mutex_unlock(&cubeb_alsa_mutex); - - return r; -@@ -757,12 +806,65 @@ alsa_init(cubeb ** context, char const * context_name) - pthread_attr_t attr; - snd_pcm_t * dummy; - -+ void * libasound = NULL; -+ -+#ifndef DISABLE_LIBASOUND_DLOPEN -+ libasound = dlopen("libasound.so", RTLD_LAZY); -+ if (!libasound) { -+ return CUBEB_ERROR; -+ } -+ -+#define LOAD(x) do { \ -+ cubeb_##x = dlsym(libasound, #x); \ -+ if (!cubeb_##x) { \ -+ dlclose(libasound); \ -+ return CUBEB_ERROR; \ -+ } \ -+ } while(0) -+ -+ LOAD(snd_config); -+ LOAD(snd_config_add); -+ LOAD(snd_config_copy); -+ LOAD(snd_config_delete); -+ LOAD(snd_config_get_id); -+ LOAD(snd_config_get_string); -+ LOAD(snd_config_imake_integer); -+ LOAD(snd_config_search); -+ LOAD(snd_config_search_definition); -+ LOAD(snd_lib_error_set_handler); -+ LOAD(snd_pcm_avail_update); -+ LOAD(snd_pcm_close); -+ LOAD(snd_pcm_delay); -+ LOAD(snd_pcm_drain); -+ LOAD(snd_pcm_frames_to_bytes); -+ LOAD(snd_pcm_get_params); -+ /* snd_pcm_hw_params_alloca is actually a macro */ -+ /* LOAD(snd_pcm_hw_params_alloca); */ -+ LOAD(snd_pcm_hw_params_sizeof); -+ LOAD(snd_pcm_hw_params_any); -+ LOAD(snd_pcm_hw_params_get_channels_max); -+ LOAD(snd_pcm_hw_params_get_rate); -+ LOAD(snd_pcm_hw_params_set_rate_near); -+ LOAD(snd_pcm_nonblock); -+ LOAD(snd_pcm_open); -+ LOAD(snd_pcm_open_lconf); -+ LOAD(snd_pcm_pause); -+ LOAD(snd_pcm_poll_descriptors); -+ LOAD(snd_pcm_poll_descriptors_count); -+ LOAD(snd_pcm_poll_descriptors_revents); -+ LOAD(snd_pcm_recover); -+ LOAD(snd_pcm_set_params); -+ LOAD(snd_pcm_state); -+ LOAD(snd_pcm_writei); -+ -+#undef LOAD -+#endif - assert(context); - *context = NULL; - - pthread_mutex_lock(&cubeb_alsa_mutex); - if (!cubeb_alsa_error_handler_set) { -- snd_lib_error_set_handler(silent_error_handler); -+ WRAP(snd_lib_error_set_handler)(silent_error_handler); - cubeb_alsa_error_handler_set = 1; - } - pthread_mutex_unlock(&cubeb_alsa_mutex); -@@ -770,6 +872,8 @@ alsa_init(cubeb ** context, char const * context_name) - ctx = calloc(1, sizeof(*ctx)); - assert(ctx); - -+ ctx->libasound = libasound; -+ - ctx->ops = &alsa_ops; - - r = pthread_mutex_init(&ctx->mutex, NULL); -@@ -819,7 +923,7 @@ alsa_init(cubeb ** context, char const * context_name) - config fails with EINVAL, the PA PCM is too old for this workaround. */ - if (r == -EINVAL) { - pthread_mutex_lock(&cubeb_alsa_mutex); -- snd_config_delete(ctx->local_config); -+ WRAP(snd_config_delete)(ctx->local_config); - pthread_mutex_unlock(&cubeb_alsa_mutex); - ctx->local_config = NULL; - } else if (r >= 0) { -@@ -859,9 +963,13 @@ alsa_destroy(cubeb * ctx) - pthread_mutex_destroy(&ctx->mutex); - free(ctx->fds); - -+ if (ctx->libasound) { -+ dlclose(ctx->libasound); -+ } -+ - if (ctx->local_config) { - pthread_mutex_lock(&cubeb_alsa_mutex); -- snd_config_delete(ctx->local_config); -+ WRAP(snd_config_delete)(ctx->local_config); - pthread_mutex_unlock(&cubeb_alsa_mutex); - } - -@@ -948,7 +1056,7 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream - return CUBEB_ERROR; - } - -- r = snd_pcm_nonblock(stm->pcm, 1); -+ r = WRAP(snd_pcm_nonblock)(stm->pcm, 1); - assert(r == 0); - - latency_us = latency_frames * 1e6 / stm->params.rate; -@@ -961,7 +1069,7 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream - latency_us = latency_us < min_latency ? min_latency: latency_us; - } - -- r = snd_pcm_set_params(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED, -+ r = WRAP(snd_pcm_set_params)(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED, - stm->params.channels, stm->params.rate, 1, - latency_us); - if (r < 0) { -@@ -969,20 +1077,20 @@ alsa_stream_init_single(cubeb * ctx, cubeb_stream ** stream, char const * stream - return CUBEB_ERROR_INVALID_FORMAT; - } - -- r = snd_pcm_get_params(stm->pcm, &stm->buffer_size, &period_size); -+ r = WRAP(snd_pcm_get_params)(stm->pcm, &stm->buffer_size, &period_size); - assert(r == 0); - - /* Double internal buffer size to have enough space when waiting for the other side of duplex connection */ - stm->buffer_size *= 2; -- stm->buffer = calloc(1, snd_pcm_frames_to_bytes(stm->pcm, stm->buffer_size)); -+ stm->buffer = calloc(1, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->buffer_size)); - assert(stm->buffer); - -- stm->nfds = snd_pcm_poll_descriptors_count(stm->pcm); -+ stm->nfds = WRAP(snd_pcm_poll_descriptors_count)(stm->pcm); - assert(stm->nfds > 0); - - stm->saved_fds = calloc(stm->nfds, sizeof(struct pollfd)); - assert(stm->saved_fds); -- r = snd_pcm_poll_descriptors(stm->pcm, stm->saved_fds, stm->nfds); -+ r = WRAP(snd_pcm_poll_descriptors)(stm->pcm, stm->saved_fds, stm->nfds); - assert((nfds_t) r == stm->nfds); - - if (alsa_register_stream(ctx, stm) != 0) { -@@ -1054,7 +1162,7 @@ alsa_stream_destroy(cubeb_stream * stm) - pthread_mutex_lock(&stm->mutex); - if (stm->pcm) { - if (stm->state == DRAINING) { -- snd_pcm_drain(stm->pcm); -+ WRAP(snd_pcm_drain)(stm->pcm); - } - alsa_locked_pcm_close(stm->pcm); - stm->pcm = NULL; -@@ -1100,12 +1208,12 @@ alsa_get_max_channel_count(cubeb * ctx, uint32_t * max_channels) - - assert(stm); - -- r = snd_pcm_hw_params_any(stm->pcm, hw_params); -+ r = WRAP(snd_pcm_hw_params_any)(stm->pcm, hw_params); - if (r < 0) { - return CUBEB_ERROR; - } - -- r = snd_pcm_hw_params_get_channels_max(hw_params, max_channels); -+ r = WRAP(snd_pcm_hw_params_get_channels_max)(hw_params, max_channels); - if (r < 0) { - return CUBEB_ERROR; - } -@@ -1126,34 +1234,34 @@ alsa_get_preferred_sample_rate(cubeb * ctx, uint32_t * rate) { - - /* get a pcm, disabling resampling, so we get a rate the - * hardware/dmix/pulse/etc. supports. */ -- r = snd_pcm_open(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK, SND_PCM_NO_AUTO_RESAMPLE); -+ r = WRAP(snd_pcm_open)(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK, SND_PCM_NO_AUTO_RESAMPLE); - if (r < 0) { - return CUBEB_ERROR; - } - -- r = snd_pcm_hw_params_any(pcm, hw_params); -+ r = WRAP(snd_pcm_hw_params_any)(pcm, hw_params); - if (r < 0) { -- snd_pcm_close(pcm); -+ WRAP(snd_pcm_close)(pcm); - return CUBEB_ERROR; - } - -- r = snd_pcm_hw_params_get_rate(hw_params, rate, &dir); -+ r = WRAP(snd_pcm_hw_params_get_rate)(hw_params, rate, &dir); - if (r >= 0) { - /* There is a default rate: use it. */ -- snd_pcm_close(pcm); -+ WRAP(snd_pcm_close)(pcm); - return CUBEB_OK; - } - - /* Use a common rate, alsa may adjust it based on hw/etc. capabilities. */ - *rate = 44100; - -- r = snd_pcm_hw_params_set_rate_near(pcm, hw_params, rate, NULL); -+ r = WRAP(snd_pcm_hw_params_set_rate_near)(pcm, hw_params, rate, NULL); - if (r < 0) { -- snd_pcm_close(pcm); -+ WRAP(snd_pcm_close)(pcm); - return CUBEB_ERROR; - } - -- snd_pcm_close(pcm); -+ WRAP(snd_pcm_close)(pcm); - - return CUBEB_OK; - } -@@ -1186,10 +1294,10 @@ alsa_stream_start(cubeb_stream * stm) - pthread_mutex_lock(&stm->mutex); - /* Capture pcm must be started after initial setup/recover */ - if (stm->stream_type == SND_PCM_STREAM_CAPTURE && -- snd_pcm_state(stm->pcm) == SND_PCM_STATE_PREPARED) { -- snd_pcm_start(stm->pcm); -+ WRAP(snd_pcm_state)(stm->pcm) == SND_PCM_STATE_PREPARED) { -+ WRAP(snd_pcm_start)(stm->pcm); - } -- snd_pcm_pause(stm->pcm, 0); -+ WRAP(snd_pcm_pause)(stm->pcm, 0); - gettimeofday(&stm->last_activity, NULL); - pthread_mutex_unlock(&stm->mutex); - -@@ -1229,7 +1337,7 @@ alsa_stream_stop(cubeb_stream * stm) - pthread_mutex_unlock(&ctx->mutex); - - pthread_mutex_lock(&stm->mutex); -- snd_pcm_pause(stm->pcm, 1); -+ WRAP(snd_pcm_pause)(stm->pcm, 1); - pthread_mutex_unlock(&stm->mutex); - - return CUBEB_OK; -@@ -1245,8 +1353,8 @@ alsa_stream_get_position(cubeb_stream * stm, uint64_t * position) - pthread_mutex_lock(&stm->mutex); - - delay = -1; -- if (snd_pcm_state(stm->pcm) != SND_PCM_STATE_RUNNING || -- snd_pcm_delay(stm->pcm, &delay) != 0) { -+ if (WRAP(snd_pcm_state)(stm->pcm) != SND_PCM_STATE_RUNNING || -+ WRAP(snd_pcm_delay)(stm->pcm, &delay) != 0) { - *position = stm->last_position; - pthread_mutex_unlock(&stm->mutex); - return CUBEB_OK; -@@ -1271,7 +1379,7 @@ alsa_stream_get_latency(cubeb_stream * stm, uint32_t * latency) - snd_pcm_sframes_t delay; - /* This function returns the delay in frames until a frame written using - snd_pcm_writei is sent to the DAC. The DAC delay should be < 1ms anyways. */ -- if (snd_pcm_delay(stm->pcm, &delay)) { -+ if (WRAP(snd_pcm_delay)(stm->pcm, &delay)) { - return CUBEB_ERROR; - } - -diff --git toolkit/library/moz.build toolkit/library/moz.build -index b0df6b98b91f..e06592daa265 100644 ---- toolkit/library/moz.build -+++ toolkit/library/moz.build -@@ -247,9 +247,6 @@ if CONFIG['MOZ_SYSTEM_LIBVPX']: - if not CONFIG['MOZ_TREE_PIXMAN']: - OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS'] - --if CONFIG['MOZ_ALSA']: -- OS_LIBS += CONFIG['MOZ_ALSA_LIBS'] -- - if CONFIG['HAVE_CLOCK_MONOTONIC']: - OS_LIBS += CONFIG['REALTIME_LIBS'] - - -commit 161bcd671217 -Author: Evgeniy Vodolazskiy -Date: Wed Sep 3 10:47:00 2014 -0700 - - Bug 1021761 - Add OSS backend to libcubeb, default but last on Linux. r=kinetik r=glandium ---- - build/moz.configure/old.configure | 1 + - dom/media/CubebUtils.cpp | 3 +- - media/libcubeb/AUTHORS | 1 + - media/libcubeb/src/cubeb.c | 10 + - media/libcubeb/src/cubeb_oss.c | 453 ++++++++++++++++++++++++++++++++++++++ - media/libcubeb/src/moz.build | 7 + - media/libcubeb/update.sh | 1 + - old-configure.in | 62 ++++++ - toolkit/library/moz.build | 3 + - 9 files changed, 540 insertions(+), 1 deletion(-) - -diff --git build/moz.configure/old.configure build/moz.configure/old.configure -index 17d0c5bf3420..3e6dbc16ca14 100644 ---- build/moz.configure/old.configure -+++ build/moz.configure/old.configure -@@ -259,6 +259,7 @@ def old_configure_options(*options): - '--with-nspr-prefix', - '--with-nss-exec-prefix', - '--with-nss-prefix', -+ '--with-oss', - '--with-qemu-exe', - '--with-sixgill', - '--with-soft-float', -diff --git dom/media/CubebUtils.cpp dom/media/CubebUtils.cpp -index 88063ed3a4d6..8613f86dbd16 100644 ---- dom/media/CubebUtils.cpp -+++ dom/media/CubebUtils.cpp -@@ -149,7 +149,8 @@ const char* AUDIOSTREAM_BACKEND_ID_STR[] = { - "sndio", - "opensl", - "audiotrack", -- "kai" -+ "kai", -+ "oss", - }; - /* Index for failures to create an audio stream the first time. */ - const int CUBEB_BACKEND_INIT_FAILURE_FIRST = -diff --git media/libcubeb/AUTHORS media/libcubeb/AUTHORS -index f0f9595227f2..e7e7048190ab 100644 ---- media/libcubeb/AUTHORS -+++ media/libcubeb/AUTHORS -@@ -4,6 +4,7 @@ Michael Wu - Paul Adenot - David Richards - Sebastien Alaiwan -+Evgeniy Vodolazskiy - KO Myung-Hun - Haakon Sporsheim - Alex Chronopoulos -diff --git media/libcubeb/src/cubeb.c media/libcubeb/src/cubeb.c -index bb35e0ce349f..e523d94108a3 100644 ---- media/libcubeb/src/cubeb.c -+++ media/libcubeb/src/cubeb.c -@@ -60,6 +60,9 @@ int audiotrack_init(cubeb ** context, char const * context_name); - #if defined(USE_KAI) - int kai_init(cubeb ** context, char const * context_name); - #endif -+#if defined(USE_OSS) -+int oss_init(cubeb ** context, char const * context_name); -+#endif - - static int - validate_stream_params(cubeb_stream_params * input_stream_params, -@@ -159,6 +162,10 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam - } else if (!strcmp(backend_name, "kai")) { - #if defined(USE_KAI) - init_oneshot = kai_init; -+#endif -+ } else if (!strcmp(backend_name, "oss")) { -+#if defined(USE_OSS) -+ init_oneshot = oss_init; - #endif - } else { - /* Already set */ -@@ -203,6 +210,9 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam - #endif - #if defined(USE_KAI) - kai_init, -+#endif -+#if defined(USE_OSS) -+ oss_init, - #endif - }; - int i; -diff --git media/libcubeb/src/cubeb_oss.c media/libcubeb/src/cubeb_oss.c -new file mode 100644 -index 000000000000..7d96168b9ea6 ---- /dev/null -+++ media/libcubeb/src/cubeb_oss.c -@@ -0,0 +1,453 @@ -+/* -+ * Copyright © 2014 Mozilla Foundation -+ * -+ * This program is made available under an ISC-style license. See the -+ * accompanying file LICENSE for details. -+ */ -+#if defined(HAVE_SYS_SOUNDCARD_H) -+#include -+#else -+#include -+#endif -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "cubeb/cubeb.h" -+#include "cubeb-internal.h" -+ -+#ifndef CUBEB_OSS_DEFAULT_OUTPUT -+#define CUBEB_OSS_DEFAULT_OUTPUT "/dev/dsp" -+#endif -+ -+#define OSS_BUFFER_SIZE 1024 -+ -+struct cubeb { -+ struct cubeb_ops const * ops; -+}; -+ -+struct cubeb_stream { -+ /* Note: Must match cubeb_stream layout in cubeb.c. */ -+ cubeb * context; -+ void * user_ptr; -+ /**/ -+ -+ cubeb_data_callback data_callback; -+ cubeb_state_callback state_callback; -+ float volume; -+ float panning; -+ -+ pthread_mutex_t state_mutex; -+ pthread_cond_t state_cond; -+ -+ int running; -+ int stopped; -+ int floating; -+ -+ /* These two vars are needed to support old versions of OSS */ -+ unsigned int position_bytes; -+ unsigned int last_position_bytes; -+ -+ uint64_t written_frags; /* The number of fragments written to /dev/dsp */ -+ uint64_t missed_frags; /* fragments output with stopped stream */ -+ -+ cubeb_stream_params params; -+ int fd; -+ pthread_t th; -+}; -+ -+static struct cubeb_ops const oss_ops; -+ -+int oss_init(cubeb ** context, char const * context_name) -+{ -+ cubeb* ctx = (cubeb*)malloc(sizeof(cubeb)); -+ ctx->ops = &oss_ops; -+ *context = ctx; -+ return CUBEB_OK; -+} -+ -+static void oss_destroy(cubeb *ctx) -+{ -+ free(ctx); -+} -+ -+static char const * oss_get_backend_id(cubeb * context) -+{ -+ static char oss_name[] = "oss"; -+ return oss_name; -+} -+ -+static int oss_get_max_channel_count(cubeb * ctx, uint32_t * max_channels) -+{ -+ *max_channels = 2; /* Let's support only stereo for now */ -+ return CUBEB_OK; -+} -+ -+static int oss_get_min_latency(cubeb * context, cubeb_stream_params params, -+ uint32_t * latency_frames) -+{ -+ (void)context; -+ /* 40ms is a big enough number to work ok */ -+ *latency_frames = 40 * params.rate / 1000; -+ return CUBEB_OK; -+} -+ -+static int oss_get_preferred_sample_rate(cubeb *context, uint32_t * rate) -+{ -+ /* 48000 seems a prefered choice for most audio devices -+ * and a good choice for OSS */ -+ *rate = 48000; -+ return CUBEB_OK; -+} -+ -+static void run_state_callback(cubeb_stream *stream, cubeb_state state) -+{ -+ if (stream->state_callback) { -+ stream->state_callback(stream, stream->user_ptr, state); -+ } -+} -+ -+static long run_data_callback(cubeb_stream *stream, void *buffer, long nframes) -+{ -+ long got = 0; -+ pthread_mutex_lock(&stream->state_mutex); -+ if (stream->data_callback && stream->running && !stream->stopped) { -+ pthread_mutex_unlock(&stream->state_mutex); -+ got = stream->data_callback(stream, stream->user_ptr, NULL, buffer, nframes); -+ } else { -+ pthread_mutex_unlock(&stream->state_mutex); -+ } -+ return got; -+} -+ -+static void apply_volume_int(int16_t* buffer, unsigned int n, -+ float volume, float panning) -+{ -+ float left = volume; -+ float right = volume; -+ unsigned int i; -+ int pan[2]; -+ if (panning<0) { -+ right *= (1+panning); -+ } else { -+ left *= (1-panning); -+ } -+ pan[0] = 128.0*left; -+ pan[1] = 128.0*right; -+ for(i=0; irunning) { -+ pthread_mutex_lock(&stream->state_mutex); -+ if (stream->stopped) { -+ pthread_mutex_unlock(&stream->state_mutex); -+ run_state_callback(stream, CUBEB_STATE_STOPPED); -+ pthread_mutex_lock(&stream->state_mutex); -+ while (stream->stopped) { -+ pthread_cond_wait(&stream->state_cond, &stream->state_mutex); -+ } -+ pthread_mutex_unlock(&stream->state_mutex); -+ run_state_callback(stream, CUBEB_STATE_STARTED); -+ continue; -+ } -+ pthread_mutex_unlock(&stream->state_mutex); -+ if (stream->floating) { -+ got = run_data_callback(stream, f_buffer, -+ OSS_BUFFER_SIZE/stream->params.channels); -+ apply_volume_float(f_buffer, got*stream->params.channels, -+ stream->volume, stream->panning); -+ for (i=0; i<((unsigned long)got)*stream->params.channels; i++) { -+ /* Clipping is prefered to overflow */ -+ if(f_buffer[i]>=1.0){ -+ f_buffer[i]=1.0; -+ } -+ if(f_buffer[i]<=-1.0){ -+ f_buffer[i]=-1.0; -+ } -+ /* One might think that multipling by 32767.0 is logical but results in clipping */ -+ buffer[i] = f_buffer[i]*32767.0; -+ } -+ } else { -+ got = run_data_callback(stream, buffer, -+ OSS_BUFFER_SIZE/stream->params.channels); -+ apply_volume_int(buffer, got*stream->params.channels, -+ stream->volume, stream->panning); -+ } -+ if (got<0) { -+ run_state_callback(stream, CUBEB_STATE_ERROR); -+ break; -+ } -+ if (!got) { -+ run_state_callback(stream, CUBEB_STATE_DRAINED); -+ } -+ if (got) { -+ size_t i = 0; -+ size_t s = got*stream->params.channels*sizeof(int16_t); -+ while (i < s) { -+ ssize_t n = write(stream->fd, ((char*)buffer) + i, s - i); -+ if (n<=0) { -+ run_state_callback(stream, CUBEB_STATE_ERROR); -+ break; -+ } -+ i+=n; -+ } -+ stream->written_frags+=got; -+ } -+ } -+ return NULL; -+} -+ -+static void oss_try_set_latency(cubeb_stream* stream, unsigned int latency) -+{ -+ unsigned int latency_bytes, n_frag; -+ int frag; -+ /* fragment size of 1024 is a good choice with good chances to be accepted */ -+ unsigned int frag_log=10; /* 2^frag_log = fragment size */ -+ latency_bytes = -+ latency*stream->params.rate*stream->params.channels*sizeof(uint16_t)/1000; -+ n_frag = latency_bytes>>frag_log; -+ frag = (n_frag<<16) | frag_log; -+ /* Even if this fails we wish to continue, not checking for errors */ -+ ioctl(stream->fd, SNDCTL_DSP_SETFRAGMENT, &frag); -+} -+ -+static int oss_stream_init(cubeb * context, cubeb_stream ** stm, -+ char const * stream_name, -+ cubeb_devid input_device, -+ cubeb_stream_params * input_stream_params, -+ cubeb_devid output_device, -+ cubeb_stream_params * output_stream_params, -+ unsigned int latency, -+ cubeb_data_callback data_callback, -+ cubeb_state_callback state_callback, void * user_ptr) -+{ -+ cubeb_stream* stream = (cubeb_stream*)malloc(sizeof(cubeb_stream)); -+ stream->context = context; -+ stream->data_callback = data_callback; -+ stream->state_callback = state_callback; -+ stream->user_ptr = user_ptr; -+ -+ assert(!input_stream_params && "not supported."); -+ if (input_device || output_device) { -+ /* Device selection not yet implemented. */ -+ return CUBEB_ERROR_DEVICE_UNAVAILABLE; -+ } -+ -+ if ((input_stream_params && input_stream_params->prefs & CUBEB_STREAM_PREF_LOOPBACK) || -+ (output_stream_params && output_stream_params->prefs & CUBEB_STREAM_PREF_LOOPBACK)) { -+ return CUBEB_ERROR_NOT_SUPPORTED; -+ } -+ -+ if ((stream->fd = open(CUBEB_OSS_DEFAULT_OUTPUT, O_WRONLY)) == -1) { -+ free(stream); -+ return CUBEB_ERROR; -+ } -+#define SET(what, to) do { unsigned int i = to; \ -+ int j = ioctl(stream->fd, what, &i); \ -+ if (j == -1 || i != to) { \ -+ close(stream->fd); \ -+ free(stream); \ -+ return CUBEB_ERROR_INVALID_FORMAT; } } while (0) -+ -+ stream->params = *output_stream_params; -+ stream->volume = 1.0; -+ stream->panning = 0.0; -+ -+ oss_try_set_latency(stream, latency); -+ -+ stream->floating = 0; -+ SET(SNDCTL_DSP_CHANNELS, stream->params.channels); -+ SET(SNDCTL_DSP_SPEED, stream->params.rate); -+ switch (stream->params.format) { -+ case CUBEB_SAMPLE_S16LE: -+ SET(SNDCTL_DSP_SETFMT, AFMT_S16_LE); -+ break; -+ case CUBEB_SAMPLE_S16BE: -+ SET(SNDCTL_DSP_SETFMT, AFMT_S16_BE); -+ break; -+ case CUBEB_SAMPLE_FLOAT32LE: -+ SET(SNDCTL_DSP_SETFMT, AFMT_S16_NE); -+ stream->floating = 1; -+ break; -+ default: -+ close(stream->fd); -+ free(stream); -+ return CUBEB_ERROR; -+ } -+ -+ -+ pthread_mutex_init(&stream->state_mutex, NULL); -+ pthread_cond_init(&stream->state_cond, NULL); -+ -+ stream->running = 1; -+ stream->stopped = 1; -+ stream->position_bytes = 0; -+ stream->last_position_bytes = 0; -+ stream->written_frags = 0; -+ stream->missed_frags = 0; -+ -+ pthread_create(&stream->th, NULL, writer, (void*)stream); -+ -+ *stm = stream; -+ -+ return CUBEB_OK; -+} -+ -+static void oss_stream_destroy(cubeb_stream * stream) -+{ -+ pthread_mutex_lock(&stream->state_mutex); -+ -+ stream->running = 0; -+ stream->stopped = 0; -+ pthread_cond_signal(&stream->state_cond); -+ -+ pthread_mutex_unlock(&stream->state_mutex); -+ -+ pthread_join(stream->th, NULL); -+ -+ pthread_mutex_destroy(&stream->state_mutex); -+ pthread_cond_destroy(&stream->state_cond); -+ close(stream->fd); -+ free(stream); -+} -+ -+static int oss_stream_get_latency(cubeb_stream * stream, uint32_t * latency) -+{ -+ if (ioctl(stream->fd, SNDCTL_DSP_GETODELAY, latency)==-1) { -+ return CUBEB_ERROR; -+ } -+ /* Convert latency from bytes to frames */ -+ *latency /= stream->params.channels*sizeof(int16_t); -+ return CUBEB_OK; -+} -+ -+ -+static int oss_stream_current_optr(cubeb_stream * stream, uint64_t * position) -+{ -+ count_info ci; -+ /* Unfortunately, this ioctl is only available in OSS 4.x */ -+#ifdef SNDCTL_DSP_CURRENT_OPTR -+ oss_count_t count; -+ if (ioctl(stream->fd, SNDCTL_DSP_CURRENT_OPTR, &count) != -1) { -+ *position = count.samples;// + count.fifo_samples; -+ return CUBEB_OK; -+ } -+#endif -+ /* Fall back to this ioctl in case the previous one fails */ -+ if (ioctl(stream->fd, SNDCTL_DSP_GETOPTR, &ci) == -1) { -+ return CUBEB_ERROR; -+ } -+ /* ci.bytes is only 32 bit and will start to wrap after arithmetic overflow */ -+ stream->position_bytes += ci.bytes - stream->last_position_bytes; -+ stream->last_position_bytes = ci.bytes; -+ *position = stream->position_bytes/stream->params.channels/sizeof(int16_t); -+ return CUBEB_OK; -+} -+ -+static int oss_stream_get_position(cubeb_stream * stream, uint64_t * position) -+{ -+ if ( oss_stream_current_optr(stream, position) == CUBEB_OK ){ -+ *position -= stream->missed_frags; -+ return CUBEB_OK; -+ } -+ /* If no correct method to get position works we resort to this */ -+ *position = stream->written_frags; -+ return CUBEB_OK; -+} -+ -+ -+static int oss_stream_start(cubeb_stream * stream) -+{ -+ pthread_mutex_lock(&stream->state_mutex); -+ if (stream->stopped) { -+ uint64_t ptr; -+ oss_stream_current_optr(stream, &ptr); -+ stream->missed_frags = ptr - stream->written_frags; -+ stream->stopped = 0; -+ pthread_cond_signal(&stream->state_cond); -+ } -+ pthread_mutex_unlock(&stream->state_mutex); -+ return CUBEB_OK; -+} -+ -+static int oss_stream_stop(cubeb_stream * stream) -+{ -+ pthread_mutex_lock(&stream->state_mutex); -+ stream->stopped = 1; -+ pthread_mutex_unlock(&stream->state_mutex); -+ return CUBEB_OK; -+} -+ -+int oss_stream_set_panning(cubeb_stream * stream, float panning) -+{ -+ if (stream->params.channels == 2) { -+ stream->panning=panning; -+ } -+ return CUBEB_OK; -+} -+ -+int oss_stream_set_volume(cubeb_stream * stream, float volume) -+{ -+ stream->volume=volume; -+ return CUBEB_OK; -+} -+ -+static struct cubeb_ops const oss_ops = { -+ .init = oss_init, -+ .get_backend_id = oss_get_backend_id, -+ .get_max_channel_count = oss_get_max_channel_count, -+ .get_min_latency = oss_get_min_latency, -+ .get_preferred_sample_rate = oss_get_preferred_sample_rate, -+ .enumerate_devices = NULL, -+ .device_collection_destroy = NULL, -+ .destroy = oss_destroy, -+ .stream_init = oss_stream_init, -+ .stream_destroy = oss_stream_destroy, -+ .stream_start = oss_stream_start, -+ .stream_stop = oss_stream_stop, -+ .stream_reset_default_device = NULL, -+ .stream_get_position = oss_stream_get_position, -+ .stream_get_latency = oss_stream_get_latency, -+ .stream_set_volume = oss_stream_set_volume, -+ .stream_set_panning = oss_stream_set_panning, -+ .stream_get_current_device = NULL, -+ .stream_device_destroy = NULL, -+ .stream_register_device_changed_callback = NULL, -+ .register_device_collection_changed = NULL -+}; -diff --git media/libcubeb/src/moz.build media/libcubeb/src/moz.build -index e1fea30ca417..a5b1100f1014 100644 ---- media/libcubeb/src/moz.build -+++ media/libcubeb/src/moz.build -@@ -23,6 +23,12 @@ if CONFIG['MOZ_ALSA']: - ] - DEFINES['USE_ALSA'] = True - -+if CONFIG['MOZ_OSS']: -+ SOURCES += [ -+ 'cubeb_oss.c', -+ ] -+ DEFINES['USE_OSS'] = True -+ - if CONFIG['MOZ_PULSEAUDIO'] or CONFIG['MOZ_JACK']: - SOURCES += [ - 'cubeb_resampler.cpp', -@@ -89,6 +95,7 @@ FINAL_LIBRARY = 'gkmedias' - - CFLAGS += CONFIG['MOZ_ALSA_CFLAGS'] - CFLAGS += CONFIG['MOZ_JACK_CFLAGS'] -+CFLAGS += CONFIG['MOZ_OSS_CFLAGS'] - CFLAGS += CONFIG['MOZ_PULSEAUDIO_CFLAGS'] - - # We allow warnings for third-party code that can be updated from upstream. -diff --git media/libcubeb/update.sh media/libcubeb/update.sh -index 0bb6345c9fa9..78a102dc47cb 100755 ---- media/libcubeb/update.sh -+++ media/libcubeb/update.sh -@@ -20,6 +20,7 @@ cp $1/src/cubeb_log.h src - cp $1/src/cubeb_mixer.cpp src - cp $1/src/cubeb_mixer.h src - cp $1/src/cubeb_opensl.c src -+cp $1/src/cubeb_oss.c src - cp $1/src/cubeb-jni.cpp src - cp $1/src/cubeb-jni.h src - cp $1/src/android/cubeb-output-latency.h src/android -diff --git old-configure.in old-configure.in -index 28e1a9e48d61..edacedcf6e5d 100644 ---- old-configure.in -+++ old-configure.in -@@ -2598,6 +2598,67 @@ MOZ_WEBM_ENCODER=1 - AC_DEFINE(MOZ_WEBM_ENCODER) - AC_SUBST(MOZ_WEBM_ENCODER) - -+dnl ================================== -+dnl = Check OSS availability -+dnl ================================== -+ -+dnl If using Linux, Solaris or BSDs, ensure that OSS is available -+case "$OS_TARGET" in -+Linux|SunOS|DragonFly|FreeBSD|NetBSD|GNU/kFreeBSD) -+ MOZ_OSS=1 -+ ;; -+esac -+ -+MOZ_ARG_WITH_STRING(oss, -+[ --with-oss[=PFX] Enable OpenSoundSystem support [installed at prefix PFX]], -+ OSSPREFIX=$withval) -+ -+if test -n "$OSSPREFIX"; then -+ if test "$OSSPREFIX" != "no"; then -+ MOZ_OSS=1 -+ else -+ MOZ_OSS= -+ fi -+fi -+ -+_SAVE_CFLAGS=$CFLAGS -+_SAVE_LIBS=$LIBS -+if test -n "$MOZ_OSS"; then -+ dnl Prefer 4Front implementation -+ AC_MSG_CHECKING([MOZ_OSS_CFLAGS]) -+ if test "$OSSPREFIX" != "yes"; then -+ oss_conf=${OSSPREFIX%/usr}/etc/oss.conf -+ if test -f "$oss_conf"; then -+ . "$oss_conf" -+ else -+ OSSLIBDIR=$OSSPREFIX/lib/oss -+ fi -+ if test -d "$OSSLIBDIR"; then -+ MOZ_OSS_CFLAGS="$MOZ_OSS_CFLAGS -I$OSSLIBDIR/include" -+ fi -+ fi -+ AC_MSG_RESULT([$MOZ_OSS_CFLAGS]) -+ -+ CFLAGS="$CFLAGS $MOZ_OSS_CFLAGS" -+ MOZ_CHECK_HEADERS(sys/soundcard.h soundcard.h) -+ -+ if test "$ac_cv_header_sys_soundcard_h" != "yes" -a \ -+ "$ac_cv_header_soundcard_h" != "yes"; then -+ AC_MSG_ERROR([Need OSS for Ogg, Wave or WebM decoding on $OS_TARGET. Disable with --without-oss.]) -+ fi -+ -+ dnl Assume NetBSD implementation over SunAudio -+ AC_CHECK_LIB(ossaudio, _oss_ioctl, -+ [AC_DEFINE_UNQUOTED(CUBEB_OSS_DEFAULT_OUTPUT, "/dev/sound") -+ MOZ_OSS_LIBS="$MOZ_OSS_LIBS -lossaudio"]) -+fi -+CFLAGS=$_SAVE_CFLAGS -+LIBS=$_SAVE_LIBS -+ -+AC_SUBST(MOZ_OSS) -+AC_SUBST_LIST(MOZ_OSS_CFLAGS) -+AC_SUBST_LIST(MOZ_OSS_LIBS) -+ - dnl ======================================================== - dnl NegotiateAuth - dnl ======================================================== -diff --git toolkit/library/moz.build toolkit/library/moz.build -index e06592daa265..ce016b96c2bc 100644 ---- toolkit/library/moz.build -+++ toolkit/library/moz.build -@@ -247,6 +247,9 @@ if CONFIG['MOZ_SYSTEM_LIBVPX']: - if not CONFIG['MOZ_TREE_PIXMAN']: - OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS'] - -+if CONFIG['MOZ_OSS']: -+ OS_LIBS += CONFIG['MOZ_OSS_LIBS'] -+ - if CONFIG['HAVE_CLOCK_MONOTONIC']: - OS_LIBS += CONFIG['REALTIME_LIBS'] - diff --git a/www/firefox/files/patch-bug991253 b/www/firefox/files/patch-bug991253 deleted file mode 100644 index c0b032ec1a8..00000000000 --- a/www/firefox/files/patch-bug991253 +++ /dev/null @@ -1,17 +0,0 @@ ---- extensions/spellcheck/hunspell/glue/mozHunspell.cpp~ -+++ extensions/spellcheck/hunspell/glue/mozHunspell.cpp -@@ -336,6 +336,14 @@ mozHunspell::LoadDictionaryList(bool aNotifyChildProcesses) - } - } - -+ // load system hunspell dictionaries -+ nsCOMPtr hunDir; -+ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), -+ true, getter_AddRefs(hunDir)); -+ if (hunDir) { -+ LoadDictionariesFromDir(hunDir); -+ } -+ - // find dictionaries from restartless extensions - for (int32_t i = 0; i < mDynamicDirectories.Count(); i++) { - LoadDictionariesFromDir(mDynamicDirectories[i]); diff --git a/www/firefox/files/patch-ijg-libjpeg b/www/firefox/files/patch-ijg-libjpeg deleted file mode 100644 index b6788adc0f8..00000000000 --- a/www/firefox/files/patch-ijg-libjpeg +++ /dev/null @@ -1,383 +0,0 @@ -# Partially revert bug 791305 to allow building with system IJG jpeg library - -diff --git old-configure.in configure.in -index f0aeb5d..1c01010 100644 ---- old-configure.in -+++ old-configure.in -@@ -4027,11 +4027,7 @@ if test "$MOZ_SYSTEM_JPEG" = 1; then - #include ], - [ #if JPEG_LIB_VERSION < $MOZJPEG - #error "Insufficient JPEG library version ($MOZJPEG required)." -- #endif -- #ifndef JCS_EXTENSIONS -- #error "libjpeg-turbo JCS_EXTENSIONS required" -- #endif -- ], -+ #endif ], - MOZ_SYSTEM_JPEG=1, - AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg])) - fi -diff --git image/decoders/nsJPEGDecoder.cpp image/decoders/nsJPEGDecoder.cpp -index 8fa8200..1d2a259 100644 ---- image/decoders/nsJPEGDecoder.cpp -+++ image/decoders/nsJPEGDecoder.cpp -@@ -21,13 +21,28 @@ - - extern "C" { - #include "iccjpeg.h" --} - -+#ifdef JCS_EXTENSIONS - #if MOZ_BIG_ENDIAN - #define MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB JCS_EXT_XRGB - #else - #define MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB JCS_EXT_BGRX - #endif -+#else -+/* Colorspace conversion (copied from jpegint.h) */ -+struct jpeg_color_deconverter { -+ JMETHOD(void, start_pass, (j_decompress_ptr cinfo)); -+ JMETHOD(void, color_convert, (j_decompress_ptr cinfo, -+ JSAMPIMAGE input_buf, JDIMENSION input_row, -+ JSAMPARRAY output_buf, int num_rows)); -+}; -+ -+METHODDEF(void) -+ycc_rgb_convert_argb (j_decompress_ptr cinfo, -+ JSAMPIMAGE input_buf, JDIMENSION input_row, -+ JSAMPARRAY output_buf, int num_rows); -+#endif -+} - - static void cmyk_convert_rgb(JSAMPROW row, JDIMENSION width); - -@@ -367,6 +382,7 @@ nsJPEGDecoder::WriteInternal(const char* - case JCS_GRAYSCALE: - case JCS_RGB: - case JCS_YCbCr: -+#ifdef JCS_EXTENSIONS - // if we're not color managing we can decode directly to - // MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB - if (mCMSMode != eCMSMode_All) { -@@ -375,6 +391,9 @@ nsJPEGDecoder::WriteInternal(const char* - } else { - mInfo.out_color_space = JCS_RGB; - } -+#else -+ mInfo.out_color_space = JCS_RGB; -+#endif - break; - case JCS_CMYK: - case JCS_YCCK: -@@ -448,6 +467,16 @@ nsJPEGDecoder::WriteInternal(const char* - return; // I/O suspension - } - -+#ifndef JCS_EXTENSIONS -+ /* Force to use our YCbCr to Packed RGB converter when possible */ -+ if (!mTransform && (mCMSMode != eCMSMode_All) && -+ mInfo.jpeg_color_space == JCS_YCbCr && mInfo.out_color_space == JCS_RGB) { -+ /* Special case for the most common case: transform from YCbCr direct into packed ARGB */ -+ mInfo.out_color_components = 4; /* Packed ARGB pixels are always 4 bytes...*/ -+ mInfo.cconvert->color_convert = ycc_rgb_convert_argb; -+ } -+#endif -+ - // If this is a progressive JPEG ... - mState = mInfo.buffered_image ? - JPEG_DECOMPRESS_PROGRESSIVE : JPEG_DECOMPRESS_SEQUENTIAL; -@@ -605,7 +633,11 @@ nsJPEGDecoder::OutputScanlines(bool* sus - uint32_t* imageRow = ((uint32_t*)mImageData) + - (mInfo.output_scanline * mInfo.output_width); - -+#ifdef JCS_EXTENSIONS - if (mInfo.out_color_space == MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB) { -+#else -+ if (mInfo.cconvert->color_convert == ycc_rgb_convert_argb) { -+#endif - // Special case: scanline will be directly converted into packed ARGB - if (jpeg_read_scanlines(&mInfo, (JSAMPARRAY)&imageRow, 1) != 1) { - *suspend = true; // suspend -@@ -920,6 +952,282 @@ term_source (j_decompress_ptr jd) - } // namespace mozilla - - -+#ifndef JCS_EXTENSIONS -+/**************** YCbCr -> Cairo's RGB24/ARGB32 conversion: most common case **************/ -+ -+/* -+ * YCbCr is defined per CCIR 601-1, except that Cb and Cr are -+ * normalized to the range 0..MAXJSAMPLE rather than -0.5 .. 0.5. -+ * The conversion equations to be implemented are therefore -+ * R = Y + 1.40200 * Cr -+ * G = Y - 0.34414 * Cb - 0.71414 * Cr -+ * B = Y + 1.77200 * Cb -+ * where Cb and Cr represent the incoming values less CENTERJSAMPLE. -+ * (These numbers are derived from TIFF 6.0 section 21, dated 3-June-92.) -+ * -+ * To avoid floating-point arithmetic, we represent the fractional constants -+ * as integers scaled up by 2^16 (about 4 digits precision); we have to divide -+ * the products by 2^16, with appropriate rounding, to get the correct answer. -+ * Notice that Y, being an integral input, does not contribute any fraction -+ * so it need not participate in the rounding. -+ * -+ * For even more speed, we avoid doing any multiplications in the inner loop -+ * by precalculating the constants times Cb and Cr for all possible values. -+ * For 8-bit JSAMPLEs this is very reasonable (only 256 entries per table); -+ * for 12-bit samples it is still acceptable. It's not very reasonable for -+ * 16-bit samples, but if you want lossless storage you shouldn't be changing -+ * colorspace anyway. -+ * The Cr=>R and Cb=>B values can be rounded to integers in advance; the -+ * values for the G calculation are left scaled up, since we must add them -+ * together before rounding. -+ */ -+ -+#define SCALEBITS 16 /* speediest right-shift on some machines */ -+ -+/* Use static tables for color processing. */ -+/* Four tables, each 256 entries of 4 bytes totals 4K which is not bad... */ -+ -+const int Cr_r_tab[(MAXJSAMPLE+1) * sizeof(int)] ={ -+ -0xb3, -0xb2, -0xb1, -0xaf, -0xae, -0xac, -+ -0xab, -0xaa, -0xa8, -0xa7, -0xa5, -0xa4, -+ -0xa3, -0xa1, -0xa0, -0x9e, -0x9d, -0x9c, -+ -0x9a, -0x99, -0x97, -0x96, -0x95, -0x93, -+ -0x92, -0x90, -0x8f, -0x8e, -0x8c, -0x8b, -+ -0x89, -0x88, -0x87, -0x85, -0x84, -0x82, -+ -0x81, -0x80, -0x7e, -0x7d, -0x7b, -0x7a, -+ -0x79, -0x77, -0x76, -0x74, -0x73, -0x72, -+ -0x70, -0x6f, -0x6d, -0x6c, -0x6b, -0x69, -+ -0x68, -0x66, -0x65, -0x64, -0x62, -0x61, -+ -0x5f, -0x5e, -0x5d, -0x5b, -0x5a, -0x58, -+ -0x57, -0x56, -0x54, -0x53, -0x51, -0x50, -+ -0x4f, -0x4d, -0x4c, -0x4a, -0x49, -0x48, -+ -0x46, -0x45, -0x43, -0x42, -0x40, -0x3f, -+ -0x3e, -0x3c, -0x3b, -0x39, -0x38, -0x37, -+ -0x35, -0x34, -0x32, -0x31, -0x30, -0x2e, -+ -0x2d, -0x2b, -0x2a, -0x29, -0x27, -0x26, -+ -0x24, -0x23, -0x22, -0x20, -0x1f, -0x1d, -+ -0x1c, -0x1b, -0x19, -0x18, -0x16, -0x15, -+ -0x14, -0x12, -0x11, -0x0f, -0x0e, -0x0d, -+ -0x0b, -0x0a, -0x08, -0x07, -0x06, -0x04, -+ -0x03, -0x01, 0x00, 0x01, 0x03, 0x04, -+ 0x06, 0x07, 0x08, 0x0a, 0x0b, 0x0d, -+ 0x0e, 0x0f, 0x11, 0x12, 0x14, 0x15, -+ 0x16, 0x18, 0x19, 0x1b, 0x1c, 0x1d, -+ 0x1f, 0x20, 0x22, 0x23, 0x24, 0x26, -+ 0x27, 0x29, 0x2a, 0x2b, 0x2d, 0x2e, -+ 0x30, 0x31, 0x32, 0x34, 0x35, 0x37, -+ 0x38, 0x39, 0x3b, 0x3c, 0x3e, 0x3f, -+ 0x40, 0x42, 0x43, 0x45, 0x46, 0x48, -+ 0x49, 0x4a, 0x4c, 0x4d, 0x4f, 0x50, -+ 0x51, 0x53, 0x54, 0x56, 0x57, 0x58, -+ 0x5a, 0x5b, 0x5d, 0x5e, 0x5f, 0x61, -+ 0x62, 0x64, 0x65, 0x66, 0x68, 0x69, -+ 0x6b, 0x6c, 0x6d, 0x6f, 0x70, 0x72, -+ 0x73, 0x74, 0x76, 0x77, 0x79, 0x7a, -+ 0x7b, 0x7d, 0x7e, 0x80, 0x81, 0x82, -+ 0x84, 0x85, 0x87, 0x88, 0x89, 0x8b, -+ 0x8c, 0x8e, 0x8f, 0x90, 0x92, 0x93, -+ 0x95, 0x96, 0x97, 0x99, 0x9a, 0x9c, -+ 0x9d, 0x9e, 0xa0, 0xa1, 0xa3, 0xa4, -+ 0xa5, 0xa7, 0xa8, 0xaa, 0xab, 0xac, -+ 0xae, 0xaf, 0xb1, 0xb2, -+ }; -+ -+const int Cb_b_tab[(MAXJSAMPLE+1) * sizeof(int)] ={ -+ -0xe3, -0xe1, -0xdf, -0xde, -0xdc, -0xda, -+ -0xd8, -0xd6, -0xd5, -0xd3, -0xd1, -0xcf, -+ -0xce, -0xcc, -0xca, -0xc8, -0xc6, -0xc5, -+ -0xc3, -0xc1, -0xbf, -0xbe, -0xbc, -0xba, -+ -0xb8, -0xb7, -0xb5, -0xb3, -0xb1, -0xaf, -+ -0xae, -0xac, -0xaa, -0xa8, -0xa7, -0xa5, -+ -0xa3, -0xa1, -0x9f, -0x9e, -0x9c, -0x9a, -+ -0x98, -0x97, -0x95, -0x93, -0x91, -0x90, -+ -0x8e, -0x8c, -0x8a, -0x88, -0x87, -0x85, -+ -0x83, -0x81, -0x80, -0x7e, -0x7c, -0x7a, -+ -0x78, -0x77, -0x75, -0x73, -0x71, -0x70, -+ -0x6e, -0x6c, -0x6a, -0x69, -0x67, -0x65, -+ -0x63, -0x61, -0x60, -0x5e, -0x5c, -0x5a, -+ -0x59, -0x57, -0x55, -0x53, -0x52, -0x50, -+ -0x4e, -0x4c, -0x4a, -0x49, -0x47, -0x45, -+ -0x43, -0x42, -0x40, -0x3e, -0x3c, -0x3a, -+ -0x39, -0x37, -0x35, -0x33, -0x32, -0x30, -+ -0x2e, -0x2c, -0x2b, -0x29, -0x27, -0x25, -+ -0x23, -0x22, -0x20, -0x1e, -0x1c, -0x1b, -+ -0x19, -0x17, -0x15, -0x13, -0x12, -0x10, -+ -0x0e, -0x0c, -0x0b, -0x09, -0x07, -0x05, -+ -0x04, -0x02, 0x00, 0x02, 0x04, 0x05, -+ 0x07, 0x09, 0x0b, 0x0c, 0x0e, 0x10, -+ 0x12, 0x13, 0x15, 0x17, 0x19, 0x1b, -+ 0x1c, 0x1e, 0x20, 0x22, 0x23, 0x25, -+ 0x27, 0x29, 0x2b, 0x2c, 0x2e, 0x30, -+ 0x32, 0x33, 0x35, 0x37, 0x39, 0x3a, -+ 0x3c, 0x3e, 0x40, 0x42, 0x43, 0x45, -+ 0x47, 0x49, 0x4a, 0x4c, 0x4e, 0x50, -+ 0x52, 0x53, 0x55, 0x57, 0x59, 0x5a, -+ 0x5c, 0x5e, 0x60, 0x61, 0x63, 0x65, -+ 0x67, 0x69, 0x6a, 0x6c, 0x6e, 0x70, -+ 0x71, 0x73, 0x75, 0x77, 0x78, 0x7a, -+ 0x7c, 0x7e, 0x80, 0x81, 0x83, 0x85, -+ 0x87, 0x88, 0x8a, 0x8c, 0x8e, 0x90, -+ 0x91, 0x93, 0x95, 0x97, 0x98, 0x9a, -+ 0x9c, 0x9e, 0x9f, 0xa1, 0xa3, 0xa5, -+ 0xa7, 0xa8, 0xaa, 0xac, 0xae, 0xaf, -+ 0xb1, 0xb3, 0xb5, 0xb7, 0xb8, 0xba, -+ 0xbc, 0xbe, 0xbf, 0xc1, 0xc3, 0xc5, -+ 0xc6, 0xc8, 0xca, 0xcc, 0xce, 0xcf, -+ 0xd1, 0xd3, 0xd5, 0xd6, 0xd8, 0xda, -+ 0xdc, 0xde, 0xdf, 0xe1, -+ }; -+ -+const int Cr_g_tab[(MAXJSAMPLE+1) * sizeof(int)] ={ -+ 0x5b6900, 0x5ab22e, 0x59fb5c, 0x59448a, 0x588db8, 0x57d6e6, -+ 0x572014, 0x566942, 0x55b270, 0x54fb9e, 0x5444cc, 0x538dfa, -+ 0x52d728, 0x522056, 0x516984, 0x50b2b2, 0x4ffbe0, 0x4f450e, -+ 0x4e8e3c, 0x4dd76a, 0x4d2098, 0x4c69c6, 0x4bb2f4, 0x4afc22, -+ 0x4a4550, 0x498e7e, 0x48d7ac, 0x4820da, 0x476a08, 0x46b336, -+ 0x45fc64, 0x454592, 0x448ec0, 0x43d7ee, 0x43211c, 0x426a4a, -+ 0x41b378, 0x40fca6, 0x4045d4, 0x3f8f02, 0x3ed830, 0x3e215e, -+ 0x3d6a8c, 0x3cb3ba, 0x3bfce8, 0x3b4616, 0x3a8f44, 0x39d872, -+ 0x3921a0, 0x386ace, 0x37b3fc, 0x36fd2a, 0x364658, 0x358f86, -+ 0x34d8b4, 0x3421e2, 0x336b10, 0x32b43e, 0x31fd6c, 0x31469a, -+ 0x308fc8, 0x2fd8f6, 0x2f2224, 0x2e6b52, 0x2db480, 0x2cfdae, -+ 0x2c46dc, 0x2b900a, 0x2ad938, 0x2a2266, 0x296b94, 0x28b4c2, -+ 0x27fdf0, 0x27471e, 0x26904c, 0x25d97a, 0x2522a8, 0x246bd6, -+ 0x23b504, 0x22fe32, 0x224760, 0x21908e, 0x20d9bc, 0x2022ea, -+ 0x1f6c18, 0x1eb546, 0x1dfe74, 0x1d47a2, 0x1c90d0, 0x1bd9fe, -+ 0x1b232c, 0x1a6c5a, 0x19b588, 0x18feb6, 0x1847e4, 0x179112, -+ 0x16da40, 0x16236e, 0x156c9c, 0x14b5ca, 0x13fef8, 0x134826, -+ 0x129154, 0x11da82, 0x1123b0, 0x106cde, 0x0fb60c, 0x0eff3a, -+ 0x0e4868, 0x0d9196, 0x0cdac4, 0x0c23f2, 0x0b6d20, 0x0ab64e, -+ 0x09ff7c, 0x0948aa, 0x0891d8, 0x07db06, 0x072434, 0x066d62, -+ 0x05b690, 0x04ffbe, 0x0448ec, 0x03921a, 0x02db48, 0x022476, -+ 0x016da4, 0x00b6d2, 0x000000, -0x00b6d2, -0x016da4, -0x022476, -+ -0x02db48, -0x03921a, -0x0448ec, -0x04ffbe, -0x05b690, -0x066d62, -+ -0x072434, -0x07db06, -0x0891d8, -0x0948aa, -0x09ff7c, -0x0ab64e, -+ -0x0b6d20, -0x0c23f2, -0x0cdac4, -0x0d9196, -0x0e4868, -0x0eff3a, -+ -0x0fb60c, -0x106cde, -0x1123b0, -0x11da82, -0x129154, -0x134826, -+ -0x13fef8, -0x14b5ca, -0x156c9c, -0x16236e, -0x16da40, -0x179112, -+ -0x1847e4, -0x18feb6, -0x19b588, -0x1a6c5a, -0x1b232c, -0x1bd9fe, -+ -0x1c90d0, -0x1d47a2, -0x1dfe74, -0x1eb546, -0x1f6c18, -0x2022ea, -+ -0x20d9bc, -0x21908e, -0x224760, -0x22fe32, -0x23b504, -0x246bd6, -+ -0x2522a8, -0x25d97a, -0x26904c, -0x27471e, -0x27fdf0, -0x28b4c2, -+ -0x296b94, -0x2a2266, -0x2ad938, -0x2b900a, -0x2c46dc, -0x2cfdae, -+ -0x2db480, -0x2e6b52, -0x2f2224, -0x2fd8f6, -0x308fc8, -0x31469a, -+ -0x31fd6c, -0x32b43e, -0x336b10, -0x3421e2, -0x34d8b4, -0x358f86, -+ -0x364658, -0x36fd2a, -0x37b3fc, -0x386ace, -0x3921a0, -0x39d872, -+ -0x3a8f44, -0x3b4616, -0x3bfce8, -0x3cb3ba, -0x3d6a8c, -0x3e215e, -+ -0x3ed830, -0x3f8f02, -0x4045d4, -0x40fca6, -0x41b378, -0x426a4a, -+ -0x43211c, -0x43d7ee, -0x448ec0, -0x454592, -0x45fc64, -0x46b336, -+ -0x476a08, -0x4820da, -0x48d7ac, -0x498e7e, -0x4a4550, -0x4afc22, -+ -0x4bb2f4, -0x4c69c6, -0x4d2098, -0x4dd76a, -0x4e8e3c, -0x4f450e, -+ -0x4ffbe0, -0x50b2b2, -0x516984, -0x522056, -0x52d728, -0x538dfa, -+ -0x5444cc, -0x54fb9e, -0x55b270, -0x566942, -0x572014, -0x57d6e6, -+ -0x588db8, -0x59448a, -0x59fb5c, -0x5ab22e, -+ }; -+ -+const int Cb_g_tab[(MAXJSAMPLE+1) * sizeof(int)] ={ -+ 0x2c8d00, 0x2c34e6, 0x2bdccc, 0x2b84b2, 0x2b2c98, 0x2ad47e, -+ 0x2a7c64, 0x2a244a, 0x29cc30, 0x297416, 0x291bfc, 0x28c3e2, -+ 0x286bc8, 0x2813ae, 0x27bb94, 0x27637a, 0x270b60, 0x26b346, -+ 0x265b2c, 0x260312, 0x25aaf8, 0x2552de, 0x24fac4, 0x24a2aa, -+ 0x244a90, 0x23f276, 0x239a5c, 0x234242, 0x22ea28, 0x22920e, -+ 0x2239f4, 0x21e1da, 0x2189c0, 0x2131a6, 0x20d98c, 0x208172, -+ 0x202958, 0x1fd13e, 0x1f7924, 0x1f210a, 0x1ec8f0, 0x1e70d6, -+ 0x1e18bc, 0x1dc0a2, 0x1d6888, 0x1d106e, 0x1cb854, 0x1c603a, -+ 0x1c0820, 0x1bb006, 0x1b57ec, 0x1affd2, 0x1aa7b8, 0x1a4f9e, -+ 0x19f784, 0x199f6a, 0x194750, 0x18ef36, 0x18971c, 0x183f02, -+ 0x17e6e8, 0x178ece, 0x1736b4, 0x16de9a, 0x168680, 0x162e66, -+ 0x15d64c, 0x157e32, 0x152618, 0x14cdfe, 0x1475e4, 0x141dca, -+ 0x13c5b0, 0x136d96, 0x13157c, 0x12bd62, 0x126548, 0x120d2e, -+ 0x11b514, 0x115cfa, 0x1104e0, 0x10acc6, 0x1054ac, 0x0ffc92, -+ 0x0fa478, 0x0f4c5e, 0x0ef444, 0x0e9c2a, 0x0e4410, 0x0debf6, -+ 0x0d93dc, 0x0d3bc2, 0x0ce3a8, 0x0c8b8e, 0x0c3374, 0x0bdb5a, -+ 0x0b8340, 0x0b2b26, 0x0ad30c, 0x0a7af2, 0x0a22d8, 0x09cabe, -+ 0x0972a4, 0x091a8a, 0x08c270, 0x086a56, 0x08123c, 0x07ba22, -+ 0x076208, 0x0709ee, 0x06b1d4, 0x0659ba, 0x0601a0, 0x05a986, -+ 0x05516c, 0x04f952, 0x04a138, 0x04491e, 0x03f104, 0x0398ea, -+ 0x0340d0, 0x02e8b6, 0x02909c, 0x023882, 0x01e068, 0x01884e, -+ 0x013034, 0x00d81a, 0x008000, 0x0027e6, -0x003034, -0x00884e, -+ -0x00e068, -0x013882, -0x01909c, -0x01e8b6, -0x0240d0, -0x0298ea, -+ -0x02f104, -0x03491e, -0x03a138, -0x03f952, -0x04516c, -0x04a986, -+ -0x0501a0, -0x0559ba, -0x05b1d4, -0x0609ee, -0x066208, -0x06ba22, -+ -0x07123c, -0x076a56, -0x07c270, -0x081a8a, -0x0872a4, -0x08cabe, -+ -0x0922d8, -0x097af2, -0x09d30c, -0x0a2b26, -0x0a8340, -0x0adb5a, -+ -0x0b3374, -0x0b8b8e, -0x0be3a8, -0x0c3bc2, -0x0c93dc, -0x0cebf6, -+ -0x0d4410, -0x0d9c2a, -0x0df444, -0x0e4c5e, -0x0ea478, -0x0efc92, -+ -0x0f54ac, -0x0facc6, -0x1004e0, -0x105cfa, -0x10b514, -0x110d2e, -+ -0x116548, -0x11bd62, -0x12157c, -0x126d96, -0x12c5b0, -0x131dca, -+ -0x1375e4, -0x13cdfe, -0x142618, -0x147e32, -0x14d64c, -0x152e66, -+ -0x158680, -0x15de9a, -0x1636b4, -0x168ece, -0x16e6e8, -0x173f02, -+ -0x17971c, -0x17ef36, -0x184750, -0x189f6a, -0x18f784, -0x194f9e, -+ -0x19a7b8, -0x19ffd2, -0x1a57ec, -0x1ab006, -0x1b0820, -0x1b603a, -+ -0x1bb854, -0x1c106e, -0x1c6888, -0x1cc0a2, -0x1d18bc, -0x1d70d6, -+ -0x1dc8f0, -0x1e210a, -0x1e7924, -0x1ed13e, -0x1f2958, -0x1f8172, -+ -0x1fd98c, -0x2031a6, -0x2089c0, -0x20e1da, -0x2139f4, -0x21920e, -+ -0x21ea28, -0x224242, -0x229a5c, -0x22f276, -0x234a90, -0x23a2aa, -+ -0x23fac4, -0x2452de, -0x24aaf8, -0x250312, -0x255b2c, -0x25b346, -+ -0x260b60, -0x26637a, -0x26bb94, -0x2713ae, -0x276bc8, -0x27c3e2, -+ -0x281bfc, -0x287416, -0x28cc30, -0x29244a, -0x297c64, -0x29d47e, -+ -0x2a2c98, -0x2a84b2, -0x2adccc, -0x2b34e6, -+ }; -+ -+ -+/* We assume that right shift corresponds to signed division by 2 with -+ * rounding towards minus infinity. This is correct for typical "arithmetic -+ * shift" instructions that shift in copies of the sign bit. But some -+ * C compilers implement >> with an unsigned shift. For these machines you -+ * must define RIGHT_SHIFT_IS_UNSIGNED. -+ * RIGHT_SHIFT provides a proper signed right shift of an INT32 quantity. -+ * It is only applied with constant shift counts. SHIFT_TEMPS must be -+ * included in the variables of any routine using RIGHT_SHIFT. -+ */ -+ -+#ifdef RIGHT_SHIFT_IS_UNSIGNED -+#define SHIFT_TEMPS INT32 shift_temp; -+#define RIGHT_SHIFT(x,shft) \ -+ ((shift_temp = (x)) < 0 ? \ -+ (shift_temp >> (shft)) | ((~((INT32) 0)) << (32-(shft))) : \ -+ (shift_temp >> (shft))) -+#else -+#define SHIFT_TEMPS -+#define RIGHT_SHIFT(x,shft) ((x) >> (shft)) -+#endif -+ -+ -+METHODDEF(void) -+ycc_rgb_convert_argb (j_decompress_ptr cinfo, -+ JSAMPIMAGE input_buf, JDIMENSION input_row, -+ JSAMPARRAY output_buf, int num_rows) -+{ -+ JDIMENSION num_cols = cinfo->output_width; -+ JSAMPLE * range_limit = cinfo->sample_range_limit; -+ -+ SHIFT_TEMPS -+ -+ /* This is used if we don't have SSE2 */ -+ -+ while (--num_rows >= 0) { -+ JSAMPROW inptr0 = input_buf[0][input_row]; -+ JSAMPROW inptr1 = input_buf[1][input_row]; -+ JSAMPROW inptr2 = input_buf[2][input_row]; -+ input_row++; -+ uint32_t *outptr = (uint32_t *) *output_buf++; -+ for (JDIMENSION col = 0; col < num_cols; col++) { -+ int y = GETJSAMPLE(inptr0[col]); -+ int cb = GETJSAMPLE(inptr1[col]); -+ int cr = GETJSAMPLE(inptr2[col]); -+ JSAMPLE * range_limit_y = range_limit + y; -+ /* Range-limiting is essential due to noise introduced by DCT losses. */ -+ outptr[col] = 0xFF000000 | -+ ( range_limit_y[Cr_r_tab[cr]] << 16 ) | -+ ( range_limit_y[((int) RIGHT_SHIFT(Cb_g_tab[cb] + Cr_g_tab[cr], SCALEBITS))] << 8 ) | -+ ( range_limit_y[Cb_b_tab[cb]] ); -+ } -+ } -+} -+#endif -+ -+ - ///*************** Inverted CMYK -> RGB conversion ************************* - /// Input is (Inverted) CMYK stored as 4 bytes per pixel. - /// Output is RGB stored as 3 bytes per pixel. diff --git a/www/firefox/files/patch-sample-type b/www/firefox/files/patch-sample-type deleted file mode 100644 index 9444b9dbbde..00000000000 --- a/www/firefox/files/patch-sample-type +++ /dev/null @@ -1,22 +0,0 @@ -# Let ports handle default sample type - ---- toolkit/moz.configure~ -+++ toolkit/moz.configure -@@ -419,12 +419,11 @@ set_config('MOZ_FMP4', fmp4) - set_define('MOZ_FMP4', fmp4) - add_old_configure_assignment('MOZ_FMP4', fmp4) - --@depends(target) --def sample_type_is_s16(target): -- # Use integers over floats for audio on Android regardless of the CPU -- # architecture, because audio backends for Android don't support floats. -- # We also use integers on ARM because it's more efficient. -- if target.os == 'Android' or target.cpu == 'arm': -+option(env='MOZ_INTEGER_SAMPLES', help='Enable signed 16-bit audio samples') -+@depends('MOZ_INTEGER_SAMPLES') -+def sample_type_is_s16(value): -+ enabled = bool(value) -+ if enabled: - return True - - @depends(sample_type_is_s16) diff --git a/www/firefox/files/patch-z-bug517422 b/www/firefox/files/patch-z-bug517422 deleted file mode 100644 index a58e6a1afaa..00000000000 --- a/www/firefox/files/patch-z-bug517422 +++ /dev/null @@ -1,496 +0,0 @@ -# Allow more config/external/ libs built against system-wide version. - -diff --git build/moz.configure/old.configure build/moz.configure/old.configure -index d0fe7accffe6..c46bdd023225 100644 ---- build/moz.configure/old.configure -+++ build/moz.configure/old.configure -@@ -285,7 +285,12 @@ def old_configure_options(*options): - '--with-system-libvpx', - '--with-system-nspr', - '--with-system-nss', -+ '--with-system-ogg', - '--with-system-png', -+ '--with-system-soundtouch', -+ '--with-system-theora', -+ '--with-system-tremor', -+ '--with-system-vorbis', - '--with-system-zlib', - '--with-thumb', - '--with-thumb-interwork', -diff --git config/external/moz.build config/external/moz.build -index 029ff8504795..2c3a40caa1ba 100644 ---- config/external/moz.build -+++ config/external/moz.build -@@ -23,12 +23,21 @@ external_dirs += ['modules/woff2'] - - external_dirs += ['modules/xz-embedded'] - --if CONFIG['MOZ_VORBIS']: -+if not CONFIG['MOZ_SYSTEM_OGG']: -+ external_dirs += ['media/libogg'] -+ -+if CONFIG['MOZ_VORBIS'] and not CONFIG['MOZ_SYSTEM_VORBIS']: - external_dirs += ['media/libvorbis'] - --if CONFIG['MOZ_TREMOR']: -+if CONFIG['MOZ_TREMOR'] and not CONFIG['MOZ_SYSTEM_TREMOR']: - external_dirs += ['media/libtremor'] - -+if not CONFIG['MOZ_SYSTEM_THEORA']: -+ external_dirs += ['media/libtheora'] -+ -+if not CONFIG['MOZ_SYSTEM_SOUNDTOUCH']: -+ external_dirs += ['media/libsoundtouch'] -+ - if CONFIG['MOZ_WEBM_ENCODER']: - external_dirs += ['media/libmkv'] - -@@ -51,11 +60,8 @@ external_dirs += [ - 'media/kiss_fft', - 'media/libcubeb', - 'media/libnestegg', -- 'media/libogg', - 'media/libopus', -- 'media/libtheora', - 'media/libspeex_resampler', -- 'media/libsoundtouch', - 'media/mp4parse-rust', - 'media/psshparser' - ] -diff --git config/system-headers.mozbuild config/system-headers.mozbuild -index 09d3db5ca8c0..c6533b84c470 100644 ---- config/system-headers.mozbuild -+++ config/system-headers.mozbuild -@@ -1325,6 +1325,28 @@ if CONFIG['MOZ_SYSTEM_HARFBUZZ']: - 'harfbuzz/hb.h', - ] - -+if CONFIG['MOZ_SYSTEM_OGG']: -+ system_headers += [ -+ 'ogg/ogg.h', -+ 'ogg/os_types.h', -+ ] -+ -+if CONFIG['MOZ_SYSTEM_THEORA']: -+ system_headers += [ -+ 'theora/theoradec.h', -+ ] -+ -+if CONFIG['MOZ_SYSTEM_VORBIS']: -+ system_headers += [ -+ 'vorbis/codec.h', -+ 'vorbis/vorbisenc.h', -+ ] -+ -+if CONFIG['MOZ_SYSTEM_TREMOR']: -+ system_headers += [ -+ 'tremor/ivorbiscodec.h', -+ ] -+ - if CONFIG['MOZ_SYSTEM_LIBVPX']: - system_headers += [ - 'vpx_mem/vpx_mem.h', -diff --git dom/media/AudioStream.cpp dom/media/AudioStream.cpp -index 93ecda4319af..ff674c64ea07 100644 ---- dom/media/AudioStream.cpp -+++ dom/media/AudioStream.cpp -@@ -121,7 +121,9 @@ AudioStream::AudioStream(DataSource& aSource) - : mMonitor("AudioStream") - , mChannels(0) - , mOutChannels(0) -+#ifndef MOZ_SYSTEM_SOUNDTOUCH - , mTimeStretcher(nullptr) -+#endif - , mDumpFile(nullptr) - , mState(INITIALIZED) - , mDataSource(aSource) -@@ -142,9 +144,11 @@ AudioStream::~AudioStream() - if (mDumpFile) { - fclose(mDumpFile); - } -+#ifndef MOZ_SYSTEM_SOUNDTOUCH - if (mTimeStretcher) { - soundtouch::destroySoundTouchObj(mTimeStretcher); - } -+#endif - #if defined(XP_WIN) - if (XRE_IsContentProcess()) { - audio::AudioNotificationReceiver::Unregister(this); -@@ -168,7 +172,11 @@ nsresult AudioStream::EnsureTimeStretcherInitializedUnlocked() - { - mMonitor.AssertCurrentThreadOwns(); - if (!mTimeStretcher) { -+#ifdef MOZ_SYSTEM_SOUNDTOUCH -+ mTimeStretcher = new soundtouch::SoundTouch(); -+#else - mTimeStretcher = soundtouch::createSoundTouchObj(); -+#endif - mTimeStretcher->setSampleRate(mAudioClock.GetInputRate()); - mTimeStretcher->setChannels(mOutChannels); - mTimeStretcher->setPitch(1.0); -diff --git dom/media/AudioStream.h dom/media/AudioStream.h -index 7dc1f60f95cc..67d402a4117f 100644 ---- dom/media/AudioStream.h -+++ dom/media/AudioStream.h -@@ -16,7 +16,11 @@ - #include "nsAutoPtr.h" - #include "nsCOMPtr.h" - #include "nsThreadUtils.h" -+#ifdef MOZ_SYSTEM_SOUNDTOUCH -+#include "soundtouch/SoundTouch.h" -+#else - #include "soundtouch/SoundTouchFactory.h" -+#endif - - #if defined(XP_WIN) - #include "mozilla/audio/AudioNotificationReceiver.h" -@@ -297,7 +301,11 @@ private: - uint32_t mChannels; - uint32_t mOutChannels; - AudioClock mAudioClock; -+#ifdef MOZ_SYSTEM_SOUNDTOUCH -+ nsAutoPtr mTimeStretcher; -+#else - soundtouch::SoundTouch* mTimeStretcher; -+#endif - - // Output file for dumping audio - FILE* mDumpFile; -diff --git dom/media/moz.build dom/media/moz.build -index 86b051c58d33..fb6186dce78b 100644 ---- dom/media/moz.build -+++ dom/media/moz.build -@@ -326,6 +326,21 @@ if CONFIG['MOZ_WEBRTC']: - - DEFINES['MOZILLA_INTERNAL_API'] = True - -+if CONFIG['MOZ_SYSTEM_OGG']: -+ CXXFLAGS += CONFIG['MOZ_OGG_CFLAGS'] -+ -+if CONFIG['MOZ_SYSTEM_THEORA']: -+ CXXFLAGS += CONFIG['MOZ_THEORA_CFLAGS'] -+ -+if CONFIG['MOZ_SYSTEM_VORBIS']: -+ CXXFLAGS += CONFIG['MOZ_VORBIS_CFLAGS'] -+ -+if CONFIG['MOZ_SYSTEM_TREMOR']: -+ CXXFLAGS += CONFIG['MOZ_TREMOR_CFLAGS'] -+ -+if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']: -+ CXXFLAGS += CONFIG['MOZ_SOUNDTOUCH_CFLAGS'] -+ - if CONFIG['MOZ_ANDROID_HLS_SUPPORT']: - DEFINES['MOZ_ANDROID_HLS_SUPPORT'] = True - -diff --git dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp -index 078f6ea5ef60..c600db067539 100644 ---- dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp -+++ dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp -@@ -15,9 +15,13 @@ - #include - #endif - -+#ifdef MOZ_SYSTEM_SOUNDTOUCH -+#include "nsXPCOMPrivate.h" // for XUL_DLL -+#else - // We use a known symbol located in lgpllibs to determine its location. - // soundtouch happens to be always included in lgpllibs - #include "soundtouch/SoundTouch.h" -+#endif - - namespace mozilla { - -@@ -64,6 +68,12 @@ FFVPXRuntimeLinker::Init() - - sLinkStatus = LinkStatus_FAILED; - -+#ifdef MOZ_SYSTEM_SOUNDTOUCH -+ // We retrieve the path of the XUL library as this is where mozavcodec and -+ // mozavutil libs are located. -+ char* path = -+ PR_GetLibraryFilePathname(XUL_DLL, (PRFuncPtr)&FFVPXRuntimeLinker::Init); -+#else - // We retrieve the path of the lgpllibs library as this is where mozavcodec - // and mozavutil libs are located. - PathString lgpllibsname = GetLibraryName(nullptr, "lgpllibs"); -@@ -73,6 +83,7 @@ FFVPXRuntimeLinker::Init() - PathString path = - GetLibraryFilePathname(lgpllibsname.get(), - (PRFuncPtr)&soundtouch::SoundTouch::getVersionId); -+#endif - if (path.IsEmpty()) { - return false; - } -diff --git media/libogg/README_MOZILLA media/libogg/README_MOZILLA -index 6213fdc7770c..ada799916a17 100644 ---- media/libogg/README_MOZILLA -+++ media/libogg/README_MOZILLA -@@ -6,3 +6,6 @@ package downloaded from xiph.org and copied using the update.sh script. - The int-types.patch address a bug that config_types.h generated from - Linux platform can't be used on OpenSolaris directly see Mozilla bug - 449754 -+ -+The in-tree copy may be omitted during build by --with-system-ogg. -+Keep version in old-configure.in in sync on updates. -diff --git media/libsoundtouch/README_MOZILLA media/libsoundtouch/README_MOZILLA -index dc0dbe8f6886..ea73b55e3e39 100644 ---- media/libsoundtouch/README_MOZILLA -+++ media/libsoundtouch/README_MOZILLA -@@ -6,3 +6,5 @@ The whole library is not used, only the relevant files are imported in the tree, - using the script `update.sh`. Some changes have been made to the files, using - the patch `moz-libsoundtouch.patch`. We also use a custom soundtouch_config.h. - -+The in-tree copy may be omitted during build by --with-system-soundtouch. -+Keep version in old-configure.in in sync on updates. -diff --git media/libsoundtouch/src/soundtouch_perms.h media/libsoundtouch/src/soundtouch_perms.h -index 0af2fe618311..10973564e7a4 100644 ---- media/libsoundtouch/src/soundtouch_perms.h -+++ media/libsoundtouch/src/soundtouch_perms.h -@@ -12,7 +12,9 @@ - - #pragma GCC visibility push(default) - #include "SoundTouch.h" -+#ifndef MOZ_SYSTEM_SOUNDTOUCH - #include "SoundTouchFactory.h" -+#endif - #pragma GCC visibility pop - - #endif // MOZILLA_SOUNDTOUCH_PERMS_H -diff --git media/libtheora/README_MOZILLA media/libtheora/README_MOZILLA -index d48dbfa6f63d..6f30f250220e 100644 ---- media/libtheora/README_MOZILLA -+++ media/libtheora/README_MOZILLA -@@ -3,3 +3,6 @@ using the update.sh script. The changes made were those applied by update.sh, - the addition/update of Makefile.in files for the Mozilla build system. - - The subversion revision used was r17578. -+ -+The in-tree copy may be omitted during build by --with-system-theora. -+Keep version in old-configure.in in sync on updates. -diff --git media/libtheora/moz.build media/libtheora/moz.build -index c7f85eebff95..aae7b814adb5 100644 ---- media/libtheora/moz.build -+++ media/libtheora/moz.build -@@ -21,6 +21,9 @@ FINAL_LIBRARY = 'gkmedias' - # The encoder is currently not included. - DEFINES['THEORA_DISABLE_ENCODE'] = True - -+if CONFIG['MOZ_SYSTEM_OGG']: -+ CFLAGS += CONFIG['MOZ_OGG_CFLAGS'] -+ - # Suppress warnings in third-party code. - if CONFIG['CC_TYPE'] in ('clang', 'clang-cl', 'gcc'): - CFLAGS += ['-Wno-type-limits'] -diff --git media/libtremor/README_MOZILLA media/libtremor/README_MOZILLA -index ee67b53a05c5..81c971773d55 100644 ---- media/libtremor/README_MOZILLA -+++ media/libtremor/README_MOZILLA -@@ -5,3 +5,6 @@ Makefile.in files for the Mozilla build system. - - The upstream release used was http://svn.xiph.org/trunk/Tremor/ - The subversion revision used was r17547. -+ -+The in-tree copy may be omitted during build by --with-system-tremor. -+Keep version in old-configure.in in sync on updates. -diff --git media/libtremor/moz.build media/libtremor/moz.build -index 83afc8e37c64..71ef159da3d7 100644 ---- media/libtremor/moz.build -+++ media/libtremor/moz.build -@@ -9,3 +9,5 @@ with Files('*'): - - DIRS += ['include/tremor', 'lib'] - -+if CONFIG['MOZ_SYSTEM_OGG']: -+ CFLAGS += CONFIG['MOZ_OGG_CFLAGS'] -diff --git media/libvorbis/README_MOZILLA media/libvorbis/README_MOZILLA -index 1211ac074b33..eb31084aed25 100644 ---- media/libvorbis/README_MOZILLA -+++ media/libvorbis/README_MOZILLA -@@ -8,3 +8,6 @@ from https://git.xiph.org/vorbis.git - - Some files are renamed during the copy to prevent clashes with object - file names with other Mozilla libraries. -+ -+The in-tree copy may be omitted during build by --with-system-vorbis. -+Keep version in old-configure.in in sync on updates. -diff --git media/libvorbis/moz.build media/libvorbis/moz.build -index adf393782cc9..923b76231107 100644 ---- media/libvorbis/moz.build -+++ media/libvorbis/moz.build -@@ -56,3 +56,6 @@ FINAL_LIBRARY = 'gkmedias' - # Suppress warnings in third-party code. - if CONFIG['CC_TYPE'] in ('clang', 'gcc'): - CFLAGS += ['-Wno-uninitialized'] -+ -+if CONFIG['MOZ_SYSTEM_OGG']: -+ CFLAGS += CONFIG['MOZ_OGG_CFLAGS'] -diff --git old-configure.in old-configure.in -index b614eef85c89..85f9099dba4d 100644 ---- old-configure.in -+++ old-configure.in -@@ -2627,6 +2627,111 @@ if test -n "$MOZ_APPLEMEDIA"; then - fi - fi # COMPILE_ENVIRONMENT - -+dnl ======================================================== -+dnl Check for libogg -+dnl ======================================================== -+ -+MOZ_ARG_WITH_BOOL(system-ogg, -+[ --with-system-ogg Use system libogg (located with pkgconfig)], -+MOZ_SYSTEM_OGG=1, -+MOZ_SYSTEM_OGG=) -+ -+if test -n "$MOZ_SYSTEM_OGG"; then -+ PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.3.3) -+ -+ _SAVE_LIBS=$LIBS -+ LIBS="$LIBS $MOZ_OGG_LIBS" -+ AC_CHECK_FUNC(ogg_set_mem_functions, [], -+ [AC_DEFINE(MOZ_OGG_NO_MEM_REPORTING)]) -+ LIBS=$_SAVE_LIBS -+fi -+ -+AC_SUBST(MOZ_SYSTEM_OGG) -+ -+dnl ======================================================== -+dnl Check for libvorbis -+dnl ======================================================== -+ -+MOZ_ARG_WITH_BOOL(system-vorbis, -+[ --with-system-vorbis Use system libvorbis (located with pkgconfig)], -+MOZ_SYSTEM_VORBIS=1, -+MOZ_SYSTEM_VORBIS=) -+ -+if test -n "$MOZ_SYSTEM_VORBIS"; then -+ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.6) -+fi -+ -+AC_SUBST(MOZ_SYSTEM_VORBIS) -+ -+dnl ======================================================== -+dnl Check for integer-only libvorbis aka tremor -+dnl ======================================================== -+ -+MOZ_ARG_WITH_BOOL(system-tremor, -+[ --with-system-tremor Use system libtremor (located with pkgconfig)], -+MOZ_SYSTEM_TREMOR=1, -+MOZ_SYSTEM_TREMOR=) -+ -+if test -n "$MOZ_SYSTEM_TREMOR"; then -+ PKG_CHECK_MODULES(MOZ_TREMOR, vorbisidec >= 1.2.1) -+fi -+ -+AC_SUBST(MOZ_SYSTEM_TREMOR) -+ -+dnl ======================================================== -+dnl Check for libtheora -+dnl ======================================================== -+ -+MOZ_ARG_WITH_BOOL(system-theora, -+[ --with-system-theora Use system libtheora (located with pkgconfig)], -+MOZ_SYSTEM_THEORA=1, -+MOZ_SYSTEM_THEORA=) -+ -+if test -n "$MOZ_SYSTEM_THEORA"; then -+ PKG_CHECK_MODULES(MOZ_THEORA, theora >= 1.2) -+fi -+ -+AC_SUBST(MOZ_SYSTEM_THEORA) -+ -+dnl ======================================================== -+dnl Check for libSoundTouch -+dnl ======================================================== -+ -+MOZ_ARG_WITH_BOOL(system-soundtouch, -+[ --with-system-soundtouch Use system libSoundTouch (located with pkgconfig)], -+MOZ_SYSTEM_SOUNDTOUCH=1, -+MOZ_SYSTEM_SOUNDTOUCH=) -+ -+if test -n "$MOZ_SYSTEM_SOUNDTOUCH"; then -+ PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.9.0) -+ -+ AC_LANG_SAVE -+ AC_LANG_CPLUSPLUS -+ _SAVE_CXXFLAGS=$CXXFLAGS -+ CXXFLAGS="$CXXFLAGS $MOZ_SOUNDTOUCH_CFLAGS" -+ AC_CACHE_CHECK(for soundtouch sample type, -+ ac_cv_soundtouch_sample_type, -+ [AC_TRY_COMPILE([#include -+ #ifndef SOUNDTOUCH_INTEGER_SAMPLES -+ #error soundtouch expects float samples -+ #endif], -+ [], -+ [ac_cv_soundtouch_sample_type=short], -+ [ac_cv_soundtouch_sample_type=float])]) -+ CXXFLAGS=$_SAVE_CXXFLAGS -+ AC_LANG_RESTORE -+ -+ if test \( -n "$MOZ_SAMPLE_TYPE_S16" -a "$ac_cv_soundtouch_sample_type" != short \) \ -+ -o \( -n "$MOZ_SAMPLE_TYPE_FLOAT32" -a "$ac_cv_soundtouch_sample_type" != float \) ; then -+ AC_MSG_ERROR([SoundTouch library is built with incompatible sample type. Either rebuild the library with/without --enable-integer-samples, chase default Mozilla sample type or remove --with-system-soundtouch.]) -+ fi -+fi -+ -+if test -n "$MOZ_SYSTEM_SOUNDTOUCH"; then -+ AC_DEFINE(MOZ_SYSTEM_SOUNDTOUCH) -+fi -+AC_SUBST(MOZ_SYSTEM_SOUNDTOUCH) -+ - dnl system libvpx Support - dnl ======================================================== - MOZ_ARG_WITH_BOOL(system-libvpx, -diff --git toolkit/library/moz.build toolkit/library/moz.build -index 079a575adec3..514d901195de 100644 ---- toolkit/library/moz.build -+++ toolkit/library/moz.build -@@ -240,6 +240,21 @@ if CONFIG['MOZ_SYSTEM_HARFBUZZ']: - if CONFIG['MOZ_SYSTEM_HUNSPELL']: - OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS'] - -+if CONFIG['MOZ_SYSTEM_OGG']: -+ OS_LIBS += CONFIG['MOZ_OGG_LIBS'] -+ -+if CONFIG['MOZ_SYSTEM_THEORA']: -+ OS_LIBS += CONFIG['MOZ_THEORA_LIBS'] -+ -+if CONFIG['MOZ_SYSTEM_VORBIS']: -+ OS_LIBS += CONFIG['MOZ_VORBIS_LIBS'] -+ -+if CONFIG['MOZ_SYSTEM_TREMOR']: -+ OS_LIBS += CONFIG['MOZ_TREMOR_LIBS'] -+ -+if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']: -+ OS_LIBS += CONFIG['MOZ_SOUNDTOUCH_LIBS'] -+ - if CONFIG['MOZ_SYSTEM_LIBEVENT']: - OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS'] - -diff --git xpcom/build/XPCOMInit.cpp xpcom/build/XPCOMInit.cpp -index c083ab4bc4f3..62b917043a2c 100644 ---- xpcom/build/XPCOMInit.cpp -+++ xpcom/build/XPCOMInit.cpp -@@ -132,7 +132,9 @@ extern nsresult nsStringInputStreamConstructor(nsISupports*, REFNSIID, void**); - - #include "mozilla/ipc/GeckoChildProcessHost.h" - -+#ifndef MOZ_OGG_NO_MEM_REPORTING - #include "ogg/ogg.h" -+#endif - #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING) - #if defined(HAVE_STDINT_H) - // mozilla-config.h defines HAVE_STDINT_H, and then it's defined *again* in -@@ -639,11 +641,13 @@ NS_InitXPCOM2(nsIServiceManager** aResult, - // this oddness. - mozilla::SetICUMemoryFunctions(); - -+#ifndef MOZ_OGG_NO_MEM_REPORTING - // Do the same for libogg. - ogg_set_mem_functions(OggReporter::CountingMalloc, - OggReporter::CountingCalloc, - OggReporter::CountingRealloc, - OggReporter::CountingFree); -+#endif - - #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING) - // And for VPX. diff --git a/www/firefox/pkg-message b/www/firefox/pkg-message index 1210f5390de..3fbe3335734 100644 --- a/www/firefox/pkg-message +++ b/www/firefox/pkg-message @@ -1,7 +1,7 @@ ====================================================================== Some features available on other platforms are not implemented: -- Native audio (OSS backend is incomplete, doesn't support WebRTC) +- Native audio (requires OSS backend, feature parity with ALSA or PulseAudio) - Encrypted Media Extensions (requires Widevine CDM binary) - Process sandboxing (requires Capsicum backend) - Reduced memory usage (requires mozjemalloc) @@ -23,7 +23,7 @@ $ sysctl net.local.stream.recvspace=16384 To select non-default audio backend open about:config page and create media.cubeb.backend preference. Supported values are: alsa, jack, -pulse, pulse-rust, oss, sndio. Currently used backend can be inspected +pulse, pulse-rust, sndio. Currently used backend can be inspected on about:support page. ====================================================================== diff --git a/www/flashplayer/Makefile b/www/flashplayer/Makefile index 47f3474cc43..fd705aa6b02 100644 --- a/www/flashplayer/Makefile +++ b/www/flashplayer/Makefile @@ -2,7 +2,7 @@ PORTNAME= flashplayer PORTVERSION= 31.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www multimedia DISTFILES= diff --git a/www/linux-flashplayer/Makefile b/www/linux-flashplayer/Makefile index 8b5bafbc42b..f8ed25fab20 100644 --- a/www/linux-flashplayer/Makefile +++ b/www/linux-flashplayer/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= flashplayer -PORTVERSION= 31.0.0.148 +PORTVERSION= 31.0.0.153 CATEGORIES= www multimedia linux MASTER_SITES= https://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION}/ PKGNAMEPREFIX= linux- diff --git a/www/linux-flashplayer/distinfo b/www/linux-flashplayer/distinfo index d46be63aaef..6b57e20ee91 100644 --- a/www/linux-flashplayer/distinfo +++ b/www/linux-flashplayer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1542149803 -SHA256 (flashplayer/31.0.0.148/flash_player_npapi_linux.i386.tar.gz) = c27a78954c1bc83a668b00ecf6fbf61ca79f2e0656b9dd88ec52ebf67606d00f -SIZE (flashplayer/31.0.0.148/flash_player_npapi_linux.i386.tar.gz) = 8529825 +TIMESTAMP = 1542741577 +SHA256 (flashplayer/31.0.0.153/flash_player_npapi_linux.i386.tar.gz) = 478cf3011bcb0eebc87b08a718f07ca4aeff48f1ce5b15615da452df8793bb6b +SIZE (flashplayer/31.0.0.153/flash_player_npapi_linux.i386.tar.gz) = 8529821 diff --git a/www/node/Makefile b/www/node/Makefile index 3d865cc7612..3543244d348 100644 --- a/www/node/Makefile +++ b/www/node/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= node -PORTVERSION= 11.1.0 +PORTVERSION= 11.2.0 DISTVERSIONPREFIX= v CATEGORIES= www MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/ diff --git a/www/node/distinfo b/www/node/distinfo index 602e0d42ce6..c96d45b4d32 100644 --- a/www/node/distinfo +++ b/www/node/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1541169092 -SHA256 (node-v11.1.0.tar.gz) = 3f53b5ac25b2d36ad538267083c0e603d9236867a936c22a9116d95fa10c60d5 -SIZE (node-v11.1.0.tar.gz) = 36334066 +TIMESTAMP = 1542730979 +SHA256 (node-v11.2.0.tar.gz) = 2766fea693bc7a4750feef16d3c109df44d4319d4763678d60a5e8f177d0fa9e +SIZE (node-v11.2.0.tar.gz) = 36508574 diff --git a/www/node8/Makefile b/www/node8/Makefile index 46db714f250..92cf747be52 100644 --- a/www/node8/Makefile +++ b/www/node8/Makefile @@ -1,9 +1,8 @@ # $FreeBSD$ PORTNAME= node -PORTVERSION= 8.12.0 +PORTVERSION= 8.13.0 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/ PKGNAMESUFFIX= 8 diff --git a/www/node8/distinfo b/www/node8/distinfo index 62549e1502c..f8444a09b1f 100644 --- a/www/node8/distinfo +++ b/www/node8/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1536784572 -SHA256 (node-v8.12.0.tar.gz) = b4797843136edd9195c28221a1680ae52c29d867fc5fc1c99f7d6e2f2126a67b -SIZE (node-v8.12.0.tar.gz) = 30393516 +TIMESTAMP = 1542741882 +SHA256 (node-v8.13.0.tar.gz) = 9ba06fe4da9539721281bba4e21be0cd31546c4f47bbdccc21a9fca243e75083 +SIZE (node-v8.13.0.tar.gz) = 30577771 diff --git a/www/palemoon/Makefile b/www/palemoon/Makefile index 5113ffa80aa..ea5a9b88cf2 100644 --- a/www/palemoon/Makefile +++ b/www/palemoon/Makefile @@ -4,7 +4,7 @@ PORTNAME= palemoon DISTVERSION= 27.9.4 DISTVERSIONSUFFIX=_Release -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www ipv6 MAINTAINER= lichray@gmail.com @@ -30,7 +30,7 @@ GH_PROJECT= Pale-Moon USE_GECKO= gecko USE_HARDENING= pie:off MOZ_PKGCONFIG_FILES= # empty -USE_MOZILLA= -soundtouch +USE_MOZILLA= # empty PM_ICON= ${PORTNAME}.png PM_ICON_SRC= ${PREFIX}/lib/${PORTNAME}/browser/icons/mozicon128.png @@ -40,8 +40,8 @@ MOZ_OPTIONS= --enable-application=browser \ --enable-jemalloc \ --enable-jemalloc-lib -OPTIONS_DEFAULT= BUNDLED_CAIRO GTK2 -OPTIONS_EXCLUDE= DTRACE INTEGER_SAMPLES JACK TEST WAYLAND +OPTIONS_DEFAULT= GTK2 +OPTIONS_EXCLUDE= DTRACE JACK TEST WAYLAND .include "${.CURDIR}/../../www/firefox/Makefile.options" diff --git a/www/py-django-redis/Makefile b/www/py-django-redis/Makefile index 0ccdbe0ea37..aa4d5845a75 100644 --- a/www/py-django-redis/Makefile +++ b/www/py-django-redis/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= django-redis -PORTVERSION= 4.9.0 -PORTREVISION= 2 +PORTVERSION= 4.10.0 CATEGORIES= www databases MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -22,6 +21,7 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fakeredis>=0:databases/py-fakeredis@${PY_FL USES= python USE_PYTHON= distutils autoplist + NO_ARCH= yes do-test: build diff --git a/www/py-django-redis/distinfo b/www/py-django-redis/distinfo index 76686f8224f..ff2379b9015 100644 --- a/www/py-django-redis/distinfo +++ b/www/py-django-redis/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1520018740 -SHA256 (django-redis-4.9.0.tar.gz) = 15b47faef6aefaa3f47135a2aeb67372da300e4a4cf06809c66ab392686a2155 -SIZE (django-redis-4.9.0.tar.gz) = 48816 +TIMESTAMP = 1542739813 +SHA256 (django-redis-4.10.0.tar.gz) = af0b393864e91228dd30d8c85b5c44d670b5524cb161b7f9e41acc98b6e5ace7 +SIZE (django-redis-4.10.0.tar.gz) = 59208 diff --git a/www/py-python-digitalocean/Makefile b/www/py-python-digitalocean/Makefile index 74b2ecb99a7..82bbcb89e43 100644 --- a/www/py-python-digitalocean/Makefile +++ b/www/py-python-digitalocean/Makefile @@ -3,6 +3,7 @@ PORTNAME= python-digitalocean PORTVERSION= 1.14.0 +DISTVERSIONPREFIX= v CATEGORIES= www python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,7 +17,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${PY_FLAVOR} USE_GITHUB= yes GH_ACCOUNT= koalalorenzo -GH_TAGNAME= v${PORTVERSION} USES= python USE_PYTHON= distutils autoplist diff --git a/www/py-python-digitalocean/distinfo b/www/py-python-digitalocean/distinfo index 447a4eb1810..e43bfdee5de 100644 --- a/www/py-python-digitalocean/distinfo +++ b/www/py-python-digitalocean/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1542425016 -SHA256 (koalalorenzo-python-digitalocean-1.14.0-v1.14.0_GH0.tar.gz) = f5f833ba1f00f36958b76ceb00cd29a1de5ba2f79e26f7c269fa59a501a4247e -SIZE (koalalorenzo-python-digitalocean-1.14.0-v1.14.0_GH0.tar.gz) = 50405 +TIMESTAMP = 1542789325 +SHA256 (koalalorenzo-python-digitalocean-v1.14.0_GH0.tar.gz) = f5f833ba1f00f36958b76ceb00cd29a1de5ba2f79e26f7c269fa59a501a4247e +SIZE (koalalorenzo-python-digitalocean-v1.14.0_GH0.tar.gz) = 50405 diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index 7532e75ca59..f318bbf655e 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -3,7 +3,7 @@ PORTNAME= seamonkey DISTVERSION= 2.49.4 -PORTREVISION= 15 +PORTREVISION= 18 MOZILLA_VER= 52 # above + 3 CATEGORIES?= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ @@ -27,7 +27,6 @@ BUILD_DEPENDS= nspr>=4.13.1:devel/nspr \ autoconf-2.13:devel/autoconf213 \ yasm:devel/yasm \ zip:archivers/zip -# soundtouch>=1.9.0:audio/soundtouch \ LIB_DEPENDS= libv4l2.so:multimedia/libv4l @@ -38,7 +37,7 @@ MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome MOZ_OPTIONS+= --enable-application=suite -USE_MOZILLA= -soundtouch +USE_MOZILLA= # empty MOZ_PKGCONFIG_FILES= USE_HARDENING= pie:off relro:off diff --git a/www/seamonkey/files/patch-bug1021761 b/www/seamonkey/files/patch-bug1021761 deleted file mode 100644 index fda170e0e3d..00000000000 --- a/www/seamonkey/files/patch-bug1021761 +++ /dev/null @@ -1,1157 +0,0 @@ -diff --git build/moz.configure/old.configure build/moz.configure/old.configure -index b95dd2b..4cbefd5 100644 ---- mozilla/build/moz.configure/old.configure -+++ mozilla/build/moz.configure/old.configure -@@ -305,6 +305,7 @@ def old_configure_options(*options): - '--with-nspr-prefix', - '--with-nss-exec-prefix', - '--with-nss-prefix', -+ '--with-oss', - '--with-pthreads', - '--with-qemu-exe', - '--with-servo', -diff --git old-configure.in configure.in -index 48e60c0..ec08417 100644 ---- mozilla/old-configure.in -+++ mozilla/old-configure.in -@@ -5591,6 +5591,67 @@ fi - AC_SUBST(MOZ_WEBM_ENCODER) - - dnl ================================== -+dnl = Check OSS availability -+dnl ================================== -+ -+dnl If using Linux, Solaris or BSDs, ensure that OSS is available -+case "$OS_TARGET" in -+Linux|SunOS|DragonFly|FreeBSD|NetBSD|GNU/kFreeBSD) -+ MOZ_OSS=1 -+ ;; -+esac -+ -+MOZ_ARG_WITH_STRING(oss, -+[ --with-oss[=PFX] Enable OpenSoundSystem support [installed at prefix PFX]], -+ OSSPREFIX=$withval) -+ -+if test -n "$OSSPREFIX"; then -+ if test "$OSSPREFIX" != "no"; then -+ MOZ_OSS=1 -+ else -+ MOZ_OSS= -+ fi -+fi -+ -+_SAVE_CFLAGS=$CFLAGS -+_SAVE_LIBS=$LIBS -+if test -n "$MOZ_OSS"; then -+ dnl Prefer 4Front implementation -+ AC_MSG_CHECKING([MOZ_OSS_CFLAGS]) -+ if test "$OSSPREFIX" != "yes"; then -+ oss_conf=${OSSPREFIX%/usr}/etc/oss.conf -+ if test -f "$oss_conf"; then -+ . "$oss_conf" -+ else -+ OSSLIBDIR=$OSSPREFIX/lib/oss -+ fi -+ if test -d "$OSSLIBDIR"; then -+ MOZ_OSS_CFLAGS="$MOZ_OSS_CFLAGS -I$OSSLIBDIR/include" -+ fi -+ fi -+ AC_MSG_RESULT([$MOZ_OSS_CFLAGS]) -+ -+ CFLAGS="$CFLAGS $MOZ_OSS_CFLAGS" -+ MOZ_CHECK_HEADERS(sys/soundcard.h soundcard.h) -+ -+ if test "$ac_cv_header_sys_soundcard_h" != "yes" -a \ -+ "$ac_cv_header_soundcard_h" != "yes"; then -+ AC_MSG_ERROR([Need OSS for Ogg, Wave or WebM decoding on $OS_TARGET. Disable with --without-oss.]) -+ fi -+ -+ dnl Assume NetBSD implementation over SunAudio -+ AC_CHECK_LIB(ossaudio, _oss_ioctl, -+ [AC_DEFINE_UNQUOTED(CUBEB_OSS_DEFAULT_OUTPUT, "/dev/sound") -+ MOZ_OSS_LIBS="$MOZ_OSS_LIBS -lossaudio"]) -+fi -+CFLAGS=$_SAVE_CFLAGS -+LIBS=$_SAVE_LIBS -+ -+AC_SUBST(MOZ_OSS) -+AC_SUBST_LIST(MOZ_OSS_CFLAGS) -+AC_SUBST_LIST(MOZ_OSS_LIBS) -+ -+dnl ================================== - dnl = Check alsa availability on Linux - dnl ================================== - -diff --git media/libcubeb/AUTHORS media/libcubeb/AUTHORS -index b441e8a..950d9e5 100644 ---- mozilla/media/libcubeb/AUTHORS -+++ mozilla/media/libcubeb/AUTHORS -@@ -4,3 +4,4 @@ Michael Wu - Paul Adenot - David Richards - Sebastien Alaiwan -+Evgeniy Vodolazskiy -diff --git media/libcubeb/src/cubeb.c media/libcubeb/src/cubeb.c -index 9c3adcc..45d765b 100644 ---- mozilla/media/libcubeb/src/cubeb.c -+++ mozilla/media/libcubeb/src/cubeb.c -@@ -54,6 +54,9 @@ int opensl_init(cubeb ** context, char const * context_name); - #if defined(USE_AUDIOTRACK) - int audiotrack_init(cubeb ** context, char const * context_name); - #endif -+#if defined(USE_OSS) -+int oss_init(cubeb ** context, char const * context_name); -+#endif - - int - validate_stream_params(cubeb_stream_params stream_params) -@@ -120,6 +123,9 @@ cubeb_init(cubeb ** context, char const * context_name) - #if defined(USE_AUDIOTRACK) - audiotrack_init, - #endif -+#if defined(USE_OSS) -+ oss_init, -+#endif - }; - int i; - -diff --git media/libcubeb/src/cubeb_alsa.c media/libcubeb/src/cubeb_alsa.c -index a962553..1f780f4 100644 ---- mozilla/media/libcubeb/src/cubeb_alsa.c -+++ mozilla/media/libcubeb/src/cubeb_alsa.c -@@ -11,6 +11,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -24,6 +25,50 @@ - - #define ALSA_PA_PLUGIN "ALSA <-> PulseAudio PCM I/O Plugin" - -+#ifdef DISABLE_LIBASOUND_DLOPEN -+#define WRAP(x) x -+#else -+#define WRAP(x) cubeb_##x -+#define MAKE_TYPEDEF(x) static typeof(x) * cubeb_##x -+MAKE_TYPEDEF(snd_config); -+MAKE_TYPEDEF(snd_config_add); -+MAKE_TYPEDEF(snd_config_copy); -+MAKE_TYPEDEF(snd_config_delete); -+MAKE_TYPEDEF(snd_config_get_id); -+MAKE_TYPEDEF(snd_config_get_string); -+MAKE_TYPEDEF(snd_config_imake_integer); -+MAKE_TYPEDEF(snd_config_search); -+MAKE_TYPEDEF(snd_config_search_definition); -+MAKE_TYPEDEF(snd_lib_error_set_handler); -+MAKE_TYPEDEF(snd_pcm_avail_update); -+MAKE_TYPEDEF(snd_pcm_close); -+MAKE_TYPEDEF(snd_pcm_delay); -+MAKE_TYPEDEF(snd_pcm_drain); -+MAKE_TYPEDEF(snd_pcm_frames_to_bytes); -+MAKE_TYPEDEF(snd_pcm_get_params); -+/* snd_pcm_hw_params_alloca is actually a macro */ -+/* MAKE_TYPEDEF(snd_pcm_hw_params_alloca); */ -+MAKE_TYPEDEF(snd_pcm_hw_params_sizeof); -+#define snd_pcm_hw_params_sizeof cubeb_snd_pcm_hw_params_sizeof -+MAKE_TYPEDEF(snd_pcm_hw_params_any); -+MAKE_TYPEDEF(snd_pcm_hw_params_get_channels_max); -+MAKE_TYPEDEF(snd_pcm_hw_params_get_rate); -+MAKE_TYPEDEF(snd_pcm_hw_params_set_rate_near); -+MAKE_TYPEDEF(snd_pcm_nonblock); -+MAKE_TYPEDEF(snd_pcm_open); -+MAKE_TYPEDEF(snd_pcm_open_lconf); -+MAKE_TYPEDEF(snd_pcm_pause); -+MAKE_TYPEDEF(snd_pcm_poll_descriptors); -+MAKE_TYPEDEF(snd_pcm_poll_descriptors_count); -+MAKE_TYPEDEF(snd_pcm_poll_descriptors_revents); -+MAKE_TYPEDEF(snd_pcm_recover); -+MAKE_TYPEDEF(snd_pcm_set_params); -+MAKE_TYPEDEF(snd_pcm_state); -+MAKE_TYPEDEF(snd_pcm_writei); -+ -+#undef MAKE_TYPEDEF -+#endif -+ - /* ALSA is not thread-safe. snd_pcm_t instances are individually protected - by the owning cubeb_stream's mutex. snd_pcm_t creation and destruction - is not thread-safe until ALSA 1.0.24 (see alsa-lib.git commit 91c9c8f1), -@@ -64,6 +109,8 @@ struct cubeb { - workaround is not required. */ - snd_config_t * local_config; - int is_pa; -+ -+ void * libasound; - }; - - enum stream_state { -@@ -260,10 +307,10 @@ alsa_refill_stream(cubeb_stream * stm) - - pthread_mutex_lock(&stm->mutex); - -- avail = snd_pcm_avail_update(stm->pcm); -+ avail = WRAP(snd_pcm_avail_update)(stm->pcm); - if (avail < 0) { -- snd_pcm_recover(stm->pcm, avail, 1); -- avail = snd_pcm_avail_update(stm->pcm); -+ WRAP(snd_pcm_recover)(stm->pcm, avail, 1); -+ avail = WRAP(snd_pcm_avail_update)(stm->pcm); - } - - /* Failed to recover from an xrun, this stream must be broken. */ -@@ -286,7 +333,7 @@ alsa_refill_stream(cubeb_stream * stm) - return RUNNING; - } - -- p = calloc(1, snd_pcm_frames_to_bytes(stm->pcm, avail)); -+ p = calloc(1, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, avail)); - assert(p); - - pthread_mutex_unlock(&stm->mutex); -@@ -312,10 +359,10 @@ alsa_refill_stream(cubeb_stream * stm) - b[i] *= stm->volume; - } - } -- wrote = snd_pcm_writei(stm->pcm, p, got); -+ wrote = WRAP(snd_pcm_writei)(stm->pcm, p, got); - if (wrote < 0) { -- snd_pcm_recover(stm->pcm, wrote, 1); -- wrote = snd_pcm_writei(stm->pcm, p, got); -+ WRAP(snd_pcm_recover)(stm->pcm, wrote, 1); -+ wrote = WRAP(snd_pcm_writei)(stm->pcm, p, got); - } - assert(wrote >= 0 && wrote == got); - stm->write_position += wrote; -@@ -342,7 +389,7 @@ alsa_refill_stream(cubeb_stream * stm) - - /* Fill the remaining buffer with silence to guarantee one full period - has been written. */ -- snd_pcm_writei(stm->pcm, (char *) p + got, avail - got); -+ WRAP(snd_pcm_writei)(stm->pcm, (char *) p + got, avail - got); - - set_timeout(&stm->drain_timeout, buffer_time * 1000); - -@@ -453,26 +500,26 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm) - - slave_def = NULL; - -- r = snd_config_search(root_pcm, "slave", &slave_pcm); -+ r = WRAP(snd_config_search)(root_pcm, "slave", &slave_pcm); - if (r < 0) { - return NULL; - } - -- r = snd_config_get_string(slave_pcm, &string); -+ r = WRAP(snd_config_get_string)(slave_pcm, &string); - if (r >= 0) { -- r = snd_config_search_definition(lconf, "pcm_slave", string, &slave_def); -+ r = WRAP(snd_config_search_definition)(lconf, "pcm_slave", string, &slave_def); - if (r < 0) { - return NULL; - } - } - - do { -- r = snd_config_search(slave_def ? slave_def : slave_pcm, "pcm", &pcm); -+ r = WRAP(snd_config_search)(slave_def ? slave_def : slave_pcm, "pcm", &pcm); - if (r < 0) { - break; - } - -- r = snd_config_get_string(slave_def ? slave_def : slave_pcm, &string); -+ r = WRAP(snd_config_get_string)(slave_def ? slave_def : slave_pcm, &string); - if (r < 0) { - break; - } -@@ -481,7 +528,7 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm) - if (r < 0 || r > (int) sizeof(node_name)) { - break; - } -- r = snd_config_search(lconf, node_name, &pcm); -+ r = WRAP(snd_config_search)(lconf, node_name, &pcm); - if (r < 0) { - break; - } -@@ -490,7 +537,7 @@ get_slave_pcm_node(snd_config_t * lconf, snd_config_t * root_pcm) - } while (0); - - if (slave_def) { -- snd_config_delete(slave_def); -+ WRAP(snd_config_delete)(slave_def); - } - - return NULL; -@@ -513,22 +560,22 @@ init_local_config_with_workaround(char const * pcm_name) - - lconf = NULL; - -- if (snd_config == NULL) { -+ if (*WRAP(snd_config) == NULL) { - return NULL; - } - -- r = snd_config_copy(&lconf, snd_config); -+ r = WRAP(snd_config_copy)(&lconf, *WRAP(snd_config)); - if (r < 0) { - return NULL; - } - - do { -- r = snd_config_search_definition(lconf, "pcm", pcm_name, &pcm_node); -+ r = WRAP(snd_config_search_definition)(lconf, "pcm", pcm_name, &pcm_node); - if (r < 0) { - break; - } - -- r = snd_config_get_id(pcm_node, &string); -+ r = WRAP(snd_config_get_id)(pcm_node, &string); - if (r < 0) { - break; - } -@@ -537,7 +584,7 @@ init_local_config_with_workaround(char const * pcm_name) - if (r < 0 || r > (int) sizeof(node_name)) { - break; - } -- r = snd_config_search(lconf, node_name, &pcm_node); -+ r = WRAP(snd_config_search)(lconf, node_name, &pcm_node); - if (r < 0) { - break; - } -@@ -548,12 +595,12 @@ init_local_config_with_workaround(char const * pcm_name) - } - - /* Fetch the PCM node's type, and bail out if it's not the PulseAudio plugin. */ -- r = snd_config_search(pcm_node, "type", &node); -+ r = WRAP(snd_config_search)(pcm_node, "type", &node); - if (r < 0) { - break; - } - -- r = snd_config_get_string(node, &string); -+ r = WRAP(snd_config_get_string)(node, &string); - if (r < 0) { - break; - } -@@ -564,18 +611,18 @@ init_local_config_with_workaround(char const * pcm_name) - - /* Don't clobber an explicit existing handle_underrun value, set it only - if it doesn't already exist. */ -- r = snd_config_search(pcm_node, "handle_underrun", &node); -+ r = WRAP(snd_config_search)(pcm_node, "handle_underrun", &node); - if (r != -ENOENT) { - break; - } - - /* Disable pcm_pulse's asynchronous underrun handling. */ -- r = snd_config_imake_integer(&node, "handle_underrun", 0); -+ r = WRAP(snd_config_imake_integer)(&node, "handle_underrun", 0); - if (r < 0) { - break; - } - -- r = snd_config_add(pcm_node, node); -+ r = WRAP(snd_config_add)(pcm_node, node); - if (r < 0) { - break; - } -@@ -583,7 +630,7 @@ init_local_config_with_workaround(char const * pcm_name) - return lconf; - } while (0); - -- snd_config_delete(lconf); -+ WRAP(snd_config_delete)(lconf); - - return NULL; - } -@@ -595,9 +642,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, snd_pcm_stream_t stream, snd_config_t * l - - pthread_mutex_lock(&cubeb_alsa_mutex); - if (local_config) { -- r = snd_pcm_open_lconf(pcm, CUBEB_ALSA_PCM_NAME, stream, SND_PCM_NONBLOCK, local_config); -+ r = WRAP(snd_pcm_open_lconf)(pcm, CUBEB_ALSA_PCM_NAME, stream, SND_PCM_NONBLOCK, local_config); - } else { -- r = snd_pcm_open(pcm, CUBEB_ALSA_PCM_NAME, stream, SND_PCM_NONBLOCK); -+ r = WRAP(snd_pcm_open)(pcm, CUBEB_ALSA_PCM_NAME, stream, SND_PCM_NONBLOCK); - } - pthread_mutex_unlock(&cubeb_alsa_mutex); - -@@ -610,7 +657,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm) - int r; - - pthread_mutex_lock(&cubeb_alsa_mutex); -- r = snd_pcm_close(pcm); -+ r = WRAP(snd_pcm_close)(pcm); - pthread_mutex_unlock(&cubeb_alsa_mutex); - - return r; -@@ -667,12 +714,65 @@ alsa_init(cubeb ** context, char const * context_name) - pthread_attr_t attr; - snd_pcm_t * dummy; - -+ void * libasound = NULL; -+ -+#ifndef DISABLE_LIBASOUND_DLOPEN -+ libasound = dlopen("libasound.so", RTLD_LAZY); -+ if (!libasound) { -+ return CUBEB_ERROR; -+ } -+ -+#define LOAD(x) do { \ -+ cubeb_##x = dlsym(libasound, #x); \ -+ if (!cubeb_##x) { \ -+ dlclose(libasound); \ -+ return CUBEB_ERROR; \ -+ } \ -+ } while(0) -+ -+ LOAD(snd_config); -+ LOAD(snd_config_add); -+ LOAD(snd_config_copy); -+ LOAD(snd_config_delete); -+ LOAD(snd_config_get_id); -+ LOAD(snd_config_get_string); -+ LOAD(snd_config_imake_integer); -+ LOAD(snd_config_search); -+ LOAD(snd_config_search_definition); -+ LOAD(snd_lib_error_set_handler); -+ LOAD(snd_pcm_avail_update); -+ LOAD(snd_pcm_close); -+ LOAD(snd_pcm_delay); -+ LOAD(snd_pcm_drain); -+ LOAD(snd_pcm_frames_to_bytes); -+ LOAD(snd_pcm_get_params); -+ /* snd_pcm_hw_params_alloca is actually a macro */ -+ /* LOAD(snd_pcm_hw_params_alloca); */ -+ LOAD(snd_pcm_hw_params_sizeof); -+ LOAD(snd_pcm_hw_params_any); -+ LOAD(snd_pcm_hw_params_get_channels_max); -+ LOAD(snd_pcm_hw_params_get_rate); -+ LOAD(snd_pcm_hw_params_set_rate_near); -+ LOAD(snd_pcm_nonblock); -+ LOAD(snd_pcm_open); -+ LOAD(snd_pcm_open_lconf); -+ LOAD(snd_pcm_pause); -+ LOAD(snd_pcm_poll_descriptors); -+ LOAD(snd_pcm_poll_descriptors_count); -+ LOAD(snd_pcm_poll_descriptors_revents); -+ LOAD(snd_pcm_recover); -+ LOAD(snd_pcm_set_params); -+ LOAD(snd_pcm_state); -+ LOAD(snd_pcm_writei); -+ -+#undef LOAD -+#endif - assert(context); - *context = NULL; - - pthread_mutex_lock(&cubeb_alsa_mutex); - if (!cubeb_alsa_error_handler_set) { -- snd_lib_error_set_handler(silent_error_handler); -+ WRAP(snd_lib_error_set_handler)(silent_error_handler); - cubeb_alsa_error_handler_set = 1; - } - pthread_mutex_unlock(&cubeb_alsa_mutex); -@@ -680,6 +780,8 @@ alsa_init(cubeb ** context, char const * context_name) - ctx = calloc(1, sizeof(*ctx)); - assert(ctx); - -+ ctx->libasound = libasound; -+ - ctx->ops = &alsa_ops; - - r = pthread_mutex_init(&ctx->mutex, NULL); -@@ -729,7 +831,7 @@ alsa_init(cubeb ** context, char const * context_name) - config fails with EINVAL, the PA PCM is too old for this workaround. */ - if (r == -EINVAL) { - pthread_mutex_lock(&cubeb_alsa_mutex); -- snd_config_delete(ctx->local_config); -+ WRAP(snd_config_delete)(ctx->local_config); - pthread_mutex_unlock(&cubeb_alsa_mutex); - ctx->local_config = NULL; - } else if (r >= 0) { -@@ -768,9 +870,13 @@ alsa_destroy(cubeb * ctx) - pthread_mutex_destroy(&ctx->mutex); - free(ctx->fds); - -+ if (ctx->libasound) { -+ dlclose(ctx->libasound); -+ } -+ - if (ctx->local_config) { - pthread_mutex_lock(&cubeb_alsa_mutex); -- snd_config_delete(ctx->local_config); -+ WRAP(snd_config_delete)(ctx->local_config); - pthread_mutex_unlock(&cubeb_alsa_mutex); - } - -@@ -838,7 +944,7 @@ alsa_stream_init(cubeb * ctx, cubeb_stream ** stream, char const * stream_name, - return CUBEB_ERROR; - } - -- r = snd_pcm_nonblock(stm->pcm, 1); -+ r = WRAP(snd_pcm_nonblock)(stm->pcm, 1); - assert(r == 0); - - latency_us = latency_frames * 1e6 / stm->params.rate; -@@ -855,7 +961,7 @@ alsa_stream_init(cubeb * ctx, cubeb_stre - latency_us = latency_us < min_latency ? min_latency: latency_us; - } - -- r = snd_pcm_set_params(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED, -+ r = WRAP(snd_pcm_set_params)(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED, - stm->params.channels, stm->params.rate, 1, - latency_us); - if (r < 0) { -@@ -867,15 +973,15 @@ alsa_stream_init(cubeb * ctx, cubeb_stre - return CUBEB_ERROR_INVALID_FORMAT; - } - -- r = snd_pcm_get_params(stm->pcm, &stm->buffer_size, &period_size); -+ r = WRAP(snd_pcm_get_params)(stm->pcm, &stm->buffer_size, &period_size); - assert(r == 0); - -- stm->nfds = snd_pcm_poll_descriptors_count(stm->pcm); -+ stm->nfds = WRAP(snd_pcm_poll_descriptors_count)(stm->pcm); - assert(stm->nfds > 0); - - stm->saved_fds = calloc(stm->nfds, sizeof(struct pollfd)); - assert(stm->saved_fds); -- r = snd_pcm_poll_descriptors(stm->pcm, stm->saved_fds, stm->nfds); -+ r = WRAP(snd_pcm_poll_descriptors)(stm->pcm, stm->saved_fds, stm->nfds); - assert((nfds_t) r == stm->nfds); - - r = pthread_cond_init(&stm->cond, NULL); -@@ -895,7 +1001,7 @@ alsa_stream_destroy(cubeb_stream * stm) - pthread_mutex_lock(&stm->mutex); - if (stm->pcm) { - if (stm->state == DRAINING) { -- snd_pcm_drain(stm->pcm); -+ WRAP(snd_pcm_drain)(stm->pcm); - } - alsa_locked_pcm_close(stm->pcm); - stm->pcm = NULL; -@@ -938,12 +1044,12 @@ alsa_get_max_channel_count(cubeb * ctx, uint32_t * max_channels) - return CUBEB_ERROR; - } - -- r = snd_pcm_hw_params_any(stm->pcm, hw_params); -+ r = WRAP(snd_pcm_hw_params_any)(stm->pcm, hw_params); - if (r < 0) { - return CUBEB_ERROR; - } - -- r = snd_pcm_hw_params_get_channels_max(hw_params, max_channels); -+ r = WRAP(snd_pcm_hw_params_get_channels_max)(hw_params, max_channels); - if (r < 0) { - return CUBEB_ERROR; - } -@@ -969,34 +1075,34 @@ alsa_get_preferred_sample_rate(cubeb * c - - /* get a pcm, disabling resampling, so we get a rate the - * hardware/dmix/pulse/etc. supports. */ -- r = snd_pcm_open(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK, SND_PCM_NO_AUTO_RESAMPLE); -+ r = WRAP(snd_pcm_open)(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK, SND_PCM_NO_AUTO_RESAMPLE); - if (r < 0) { - return CUBEB_ERROR; - } - -- r = snd_pcm_hw_params_any(pcm, hw_params); -+ r = WRAP(snd_pcm_hw_params_any)(pcm, hw_params); - if (r < 0) { -- snd_pcm_close(pcm); -+ WRAP(snd_pcm_close)(pcm); - return CUBEB_ERROR; - } - -- r = snd_pcm_hw_params_get_rate(hw_params, rate, &dir); -+ r = WRAP(snd_pcm_hw_params_get_rate)(hw_params, rate, &dir); - if (r >= 0) { - /* There is a default rate: use it. */ -- snd_pcm_close(pcm); -+ WRAP(snd_pcm_close)(pcm); - return CUBEB_OK; - } - - /* Use a common rate, alsa may adjust it based on hw/etc. capabilities. */ - *rate = 44100; - -- r = snd_pcm_hw_params_set_rate_near(pcm, hw_params, rate, NULL); -+ r = WRAP(snd_pcm_hw_params_set_rate_near)(pcm, hw_params, rate, NULL); - if (r < 0) { -- snd_pcm_close(pcm); -+ WRAP(snd_pcm_close)(pcm); - return CUBEB_ERROR; - } - -- snd_pcm_close(pcm); -+ WRAP(snd_pcm_close)(pcm); - - return CUBEB_OK; - } -@@ -1013,7 +1119,7 @@ alsa_stream_start(cubeb_stream * stm) - ctx = stm->context; - - pthread_mutex_lock(&stm->mutex); -- snd_pcm_pause(stm->pcm, 0); -+ WRAP(snd_pcm_pause)(stm->pcm, 0); - gettimeofday(&stm->last_activity, NULL); - pthread_mutex_unlock(&stm->mutex); - -@@ -1047,7 +1153,7 @@ alsa_stream_stop(cubeb_stream * stm) - pthread_mutex_unlock(&ctx->mutex); - - pthread_mutex_lock(&stm->mutex); -- snd_pcm_pause(stm->pcm, 1); -+ WRAP(snd_pcm_pause)(stm->pcm, 1); - pthread_mutex_unlock(&stm->mutex); - - return CUBEB_OK; -@@ -1063,8 +1169,8 @@ alsa_stream_get_position(cubeb_stream * stm, uint64_t * position) - pthread_mutex_lock(&stm->mutex); - - delay = -1; -- if (snd_pcm_state(stm->pcm) != SND_PCM_STATE_RUNNING || -- snd_pcm_delay(stm->pcm, &delay) != 0) { -+ if (WRAP(snd_pcm_state)(stm->pcm) != SND_PCM_STATE_RUNNING || -+ WRAP(snd_pcm_delay)(stm->pcm, &delay) != 0) { - *position = stm->last_position; - pthread_mutex_unlock(&stm->mutex); - return CUBEB_OK; -@@ -1089,7 +1195,7 @@ alsa_stream_get_latency(cubeb_stream * stm, uint32_t * latency) - snd_pcm_sframes_t delay; - /* This function returns the delay in frames until a frame written using - snd_pcm_writei is sent to the DAC. The DAC delay should be < 1ms anyways. */ -- if (snd_pcm_delay(stm->pcm, &delay)) { -+ if (WRAP(snd_pcm_delay)(stm->pcm, &delay)) { - return CUBEB_ERROR; - } - -diff --git media/libcubeb/src/cubeb_oss.c media/libcubeb/src/cubeb_oss.c -new file mode 100644 -index 0000000..5e38e27 ---- /dev/null -+++ mozilla/media/libcubeb/src/cubeb_oss.c -@@ -0,0 +1,442 @@ -+/* -+ * Copyright © 2014 Mozilla Foundation -+ * -+ * This program is made available under an ISC-style license. See the -+ * accompanying file LICENSE for details. -+ */ -+#if defined(HAVE_SYS_SOUNDCARD_H) -+#include -+#else -+#include -+#endif -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "cubeb/cubeb.h" -+#include "cubeb-internal.h" -+ -+#ifndef CUBEB_OSS_DEFAULT_OUTPUT -+#define CUBEB_OSS_DEFAULT_OUTPUT "/dev/dsp" -+#endif -+ -+#define OSS_BUFFER_SIZE 1024 -+ -+struct cubeb { -+ struct cubeb_ops const * ops; -+}; -+ -+struct cubeb_stream { -+ cubeb * context; -+ -+ cubeb_data_callback data_callback; -+ cubeb_state_callback state_callback; -+ void * user_ptr; -+ float volume; -+ float panning; -+ -+ pthread_mutex_t state_mutex; -+ pthread_cond_t state_cond; -+ -+ int running; -+ int stopped; -+ int floating; -+ -+ /* These two vars are needed to support old versions of OSS */ -+ unsigned int position_bytes; -+ unsigned int last_position_bytes; -+ -+ uint64_t written_frags; /* The number of fragments written to /dev/dsp */ -+ uint64_t missed_frags; /* fragments output with stopped stream */ -+ -+ cubeb_stream_params params; -+ int fd; -+ pthread_t th; -+}; -+ -+static struct cubeb_ops const oss_ops; -+ -+int oss_init(cubeb ** context, char const * context_name) -+{ -+ cubeb* ctx = (cubeb*)malloc(sizeof(cubeb)); -+ ctx->ops = &oss_ops; -+ *context = ctx; -+ return CUBEB_OK; -+} -+ -+static void oss_destroy(cubeb *ctx) -+{ -+ free(ctx); -+} -+ -+static char const * oss_get_backend_id(cubeb * context) -+{ -+ static char oss_name[] = "oss"; -+ return oss_name; -+} -+ -+static int oss_get_max_channel_count(cubeb * ctx, uint32_t * max_channels) -+{ -+ *max_channels = 2; /* Let's support only stereo for now */ -+ return CUBEB_OK; -+} -+ -+static int oss_get_min_latency(cubeb * context, cubeb_stream_params params, -+ uint32_t * latency_ms) -+{ -+ /* 40ms is a big enough number to work ok */ -+ *latency_ms = 40; -+ return CUBEB_OK; -+} -+ -+static int oss_get_preferred_sample_rate(cubeb *context, uint32_t * rate) -+{ -+ /* 48000 seems a prefered choice for most audio devices -+ * and a good choice for OSS */ -+ *rate = 48000; -+ return CUBEB_OK; -+} -+ -+static void run_state_callback(cubeb_stream *stream, cubeb_state state) -+{ -+ if (stream->state_callback) { -+ stream->state_callback(stream, stream->user_ptr, state); -+ } -+} -+ -+static long run_data_callback(cubeb_stream *stream, void *buffer, long nframes) -+{ -+ long got = 0; -+ pthread_mutex_lock(&stream->state_mutex); -+ if (stream->data_callback && stream->running && !stream->stopped) { -+ pthread_mutex_unlock(&stream->state_mutex); -+ got = stream->data_callback(stream, stream->user_ptr, NULL, buffer, nframes); -+ } else { -+ pthread_mutex_unlock(&stream->state_mutex); -+ } -+ return got; -+} -+ -+static void apply_volume_int(int16_t* buffer, unsigned int n, -+ float volume, float panning) -+{ -+ float left = volume; -+ float right = volume; -+ unsigned int i; -+ int pan[2]; -+ if (panning<0) { -+ right *= (1+panning); -+ } else { -+ left *= (1-panning); -+ } -+ pan[0] = 128.0*left; -+ pan[1] = 128.0*right; -+ for(i=0; irunning) { -+ pthread_mutex_lock(&stream->state_mutex); -+ if (stream->stopped) { -+ pthread_mutex_unlock(&stream->state_mutex); -+ run_state_callback(stream, CUBEB_STATE_STOPPED); -+ pthread_mutex_lock(&stream->state_mutex); -+ while (stream->stopped) { -+ pthread_cond_wait(&stream->state_cond, &stream->state_mutex); -+ } -+ pthread_mutex_unlock(&stream->state_mutex); -+ run_state_callback(stream, CUBEB_STATE_STARTED); -+ continue; -+ } -+ pthread_mutex_unlock(&stream->state_mutex); -+ if (stream->floating) { -+ got = run_data_callback(stream, f_buffer, -+ OSS_BUFFER_SIZE/stream->params.channels); -+ apply_volume_float(f_buffer, got*stream->params.channels, -+ stream->volume, stream->panning); -+ for (i=0; i<((unsigned long)got)*stream->params.channels; i++) { -+ /* Clipping is prefered to overflow */ -+ if(f_buffer[i]>=1.0){ -+ f_buffer[i]=1.0; -+ } -+ if(f_buffer[i]<=-1.0){ -+ f_buffer[i]=-1.0; -+ } -+ /* One might think that multipling by 32767.0 is logical but results in clipping */ -+ buffer[i] = f_buffer[i]*32767.0; -+ } -+ } else { -+ got = run_data_callback(stream, buffer, -+ OSS_BUFFER_SIZE/stream->params.channels); -+ apply_volume_int(buffer, got*stream->params.channels, -+ stream->volume, stream->panning); -+ } -+ if (got<0) { -+ run_state_callback(stream, CUBEB_STATE_ERROR); -+ break; -+ } -+ if (!got) { -+ run_state_callback(stream, CUBEB_STATE_DRAINED); -+ } -+ if (got) { -+ size_t i = 0; -+ size_t s = got*stream->params.channels*sizeof(int16_t); -+ while (i < s) { -+ ssize_t n = write(stream->fd, ((char*)buffer) + i, s - i); -+ if (n<=0) { -+ run_state_callback(stream, CUBEB_STATE_ERROR); -+ break; -+ } -+ i+=n; -+ } -+ stream->written_frags+=got; -+ } -+ } -+ return NULL; -+} -+ -+static void oss_try_set_latency(cubeb_stream* stream, unsigned int latency) -+{ -+ unsigned int latency_bytes, n_frag; -+ int frag; -+ /* fragment size of 1024 is a good choice with good chances to be accepted */ -+ unsigned int frag_size=1024; -+ unsigned int frag_log=10; /* 2^frag_log = frag_size */ -+ latency_bytes = -+ latency*stream->params.rate*stream->params.channels*sizeof(uint16_t)/1000; -+ n_frag = latency_bytes>>frag_log; -+ frag = (n_frag<<16) | frag_log; -+ /* Even if this fails we wish to continue, not checking for errors */ -+ ioctl(stream->fd, SNDCTL_DSP_SETFRAGMENT, &frag); -+} -+ -+static int oss_stream_init(cubeb * context, cubeb_stream ** stm, -+ char const * stream_name, -+ cubeb_devid input_device, -+ cubeb_stream_params * input_stream_params, -+ cubeb_devid output_device, -+ cubeb_stream_params * output_stream_params, -+ unsigned int latency, -+ cubeb_data_callback data_callback, -+ cubeb_state_callback state_callback, void * user_ptr) -+{ -+ cubeb_stream* stream = (cubeb_stream*)malloc(sizeof(cubeb_stream)); -+ stream->context = context; -+ stream->data_callback = data_callback; -+ stream->state_callback = state_callback; -+ stream->user_ptr = user_ptr; -+ -+ assert(!input_stream_params && "not supported."); -+ if (input_device || output_device) { -+ /* Device selection not yet implemented. */ -+ return CUBEB_ERROR_DEVICE_UNAVAILABLE; -+ } -+ -+ if ((stream->fd = open(CUBEB_OSS_DEFAULT_OUTPUT, O_WRONLY)) == -1) { -+ free(stream); -+ return CUBEB_ERROR; -+ } -+#define SET(what, to) do { unsigned int i = to; \ -+ int j = ioctl(stream->fd, what, &i); \ -+ if (j == -1 || i != to) { \ -+ close(stream->fd); \ -+ free(stream); \ -+ return CUBEB_ERROR_INVALID_FORMAT; } } while (0) -+ -+ stream->params = *output_stream_params; -+ stream->volume = 1.0; -+ stream->panning = 0.0; -+ -+ oss_try_set_latency(stream, latency); -+ -+ stream->floating = 0; -+ SET(SNDCTL_DSP_CHANNELS, stream->params.channels); -+ SET(SNDCTL_DSP_SPEED, stream->params.rate); -+ switch (stream->params.format) { -+ case CUBEB_SAMPLE_S16LE: -+ SET(SNDCTL_DSP_SETFMT, AFMT_S16_LE); -+ break; -+ case CUBEB_SAMPLE_S16BE: -+ SET(SNDCTL_DSP_SETFMT, AFMT_S16_BE); -+ break; -+ case CUBEB_SAMPLE_FLOAT32LE: -+ SET(SNDCTL_DSP_SETFMT, AFMT_S16_NE); -+ stream->floating = 1; -+ break; -+ default: -+ close(stream->fd); -+ free(stream); -+ return CUBEB_ERROR; -+ } -+ -+ -+ pthread_mutex_init(&stream->state_mutex, NULL); -+ pthread_cond_init(&stream->state_cond, NULL); -+ -+ stream->running = 1; -+ stream->stopped = 1; -+ stream->position_bytes = 0; -+ stream->last_position_bytes = 0; -+ stream->written_frags = 0; -+ stream->missed_frags = 0; -+ -+ pthread_create(&stream->th, NULL, writer, (void*)stream); -+ -+ *stm = stream; -+ -+ return CUBEB_OK; -+} -+ -+static void oss_stream_destroy(cubeb_stream * stream) -+{ -+ pthread_mutex_lock(&stream->state_mutex); -+ -+ stream->running = 0; -+ stream->stopped = 0; -+ pthread_cond_signal(&stream->state_cond); -+ -+ pthread_mutex_unlock(&stream->state_mutex); -+ -+ pthread_join(stream->th, NULL); -+ -+ pthread_mutex_destroy(&stream->state_mutex); -+ pthread_cond_destroy(&stream->state_cond); -+ close(stream->fd); -+ free(stream); -+} -+ -+static int oss_stream_get_latency(cubeb_stream * stream, uint32_t * latency) -+{ -+ if (ioctl(stream->fd, SNDCTL_DSP_GETODELAY, latency)==-1) { -+ return CUBEB_ERROR; -+ } -+ /* Convert latency from bytes to frames */ -+ *latency /= stream->params.channels*sizeof(int16_t); -+ return CUBEB_OK; -+} -+ -+ -+static int oss_stream_current_optr(cubeb_stream * stream, uint64_t * position) -+{ -+ count_info ci; -+ /* Unfortunately, this ioctl is only available in OSS 4.x */ -+#ifdef SNDCTL_DSP_CURRENT_OPTR -+ oss_count_t count; -+ if (ioctl(stream->fd, SNDCTL_DSP_CURRENT_OPTR, &count) != -1) { -+ *position = count.samples;// + count.fifo_samples; -+ return CUBEB_OK; -+ } -+#endif -+ /* Fall back to this ioctl in case the previous one fails */ -+ if (ioctl(stream->fd, SNDCTL_DSP_GETOPTR, &ci) == -1) { -+ return CUBEB_ERROR; -+ } -+ /* ci.bytes is only 32 bit and will start to wrap after arithmetic overflow */ -+ stream->position_bytes += ci.bytes - stream->last_position_bytes; -+ stream->last_position_bytes = ci.bytes; -+ *position = stream->position_bytes/stream->params.channels/sizeof(int16_t); -+ return CUBEB_OK; -+} -+ -+static int oss_stream_get_position(cubeb_stream * stream, uint64_t * position) -+{ -+ if ( oss_stream_current_optr(stream, position) == CUBEB_OK ){ -+ *position -= stream->missed_frags; -+ return CUBEB_OK; -+ } -+ /* If no correct method to get position works we resort to this */ -+ *position = stream->written_frags; -+ return CUBEB_OK; -+} -+ -+ -+static int oss_stream_start(cubeb_stream * stream) -+{ -+ pthread_mutex_lock(&stream->state_mutex); -+ if (stream->stopped) { -+ uint64_t ptr; -+ oss_stream_current_optr(stream, &ptr); -+ stream->missed_frags = ptr - stream->written_frags; -+ stream->stopped = 0; -+ pthread_cond_signal(&stream->state_cond); -+ } -+ pthread_mutex_unlock(&stream->state_mutex); -+ return CUBEB_OK; -+} -+ -+static int oss_stream_stop(cubeb_stream * stream) -+{ -+ pthread_mutex_lock(&stream->state_mutex); -+ stream->stopped = 1; -+ pthread_mutex_unlock(&stream->state_mutex); -+ return CUBEB_OK; -+} -+ -+int oss_stream_set_panning(cubeb_stream * stream, float panning) -+{ -+ if (stream->params.channels == 2) { -+ stream->panning=panning; -+ } -+ return CUBEB_OK; -+} -+ -+int oss_stream_set_volume(cubeb_stream * stream, float volume) -+{ -+ stream->volume=volume; -+ return CUBEB_OK; -+} -+ -+static struct cubeb_ops const oss_ops = { -+ .init = oss_init, -+ .get_backend_id = oss_get_backend_id, -+ .get_max_channel_count = oss_get_max_channel_count, -+ .get_min_latency = oss_get_min_latency, -+ .get_preferred_sample_rate = oss_get_preferred_sample_rate, -+ .destroy = oss_destroy, -+ .stream_init = oss_stream_init, -+ .stream_destroy = oss_stream_destroy, -+ .stream_start = oss_stream_start, -+ .stream_stop = oss_stream_stop, -+ .stream_get_position = oss_stream_get_position, -+ .stream_get_latency = oss_stream_get_latency, -+ .stream_set_volume = oss_stream_set_volume, -+ .stream_set_panning = oss_stream_set_panning, -+ .stream_get_current_device = NULL, -+ .stream_device_destroy = NULL, -+ .stream_register_device_changed_callback = NULL -+}; -diff --git media/libcubeb/src/moz.build media/libcubeb/src/moz.build -index 8b7a0dd..31212ce 100644 ---- mozilla/media/libcubeb/src/moz.build -+++ mozilla/media/libcubeb/src/moz.build -@@ -17,6 +17,12 @@ if CONFIG['MOZ_ALSA']: - ] - DEFINES['USE_ALSA'] = True - -+if CONFIG['MOZ_OSS']: -+ SOURCES += [ -+ 'cubeb_oss.c', -+ ] -+ DEFINES['USE_OSS'] = True -+ - if CONFIG['MOZ_PULSEAUDIO']: - SOURCES += [ - 'cubeb_pulse.c', -@@ -75,5 +81,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - - FAIL_ON_WARNINGS = True - -+CFLAGS += CONFIG['MOZ_OSS_CFLAGS'] - CFLAGS += CONFIG['MOZ_ALSA_CFLAGS'] - CFLAGS += CONFIG['MOZ_PULSEAUDIO_CFLAGS'] - -diff --git media/libcubeb/tests/moz.build media/libcubeb/tests/moz.build -index 1b17c7b..48b56c2 100644 ---- mozilla/media/libcubeb/tests/moz.build -+++ mozilla/media/libcubeb/tests/moz.build -@@ -73,7 +73,6 @@ elif CONFIG['OS_TARGET'] == 'OpenBSD': - 'sndio', - ] - else: -- OS_LIBS += CONFIG['MOZ_ALSA_LIBS'] - OS_LIBS += CONFIG['MOZ_PULSEAUDIO_LIBS'] - - if CONFIG['GNU_CXX']: -diff --git media/libcubeb/update.sh media/libcubeb/update.sh -index a96badd..2f9585e 100755 ---- mozilla/media/libcubeb/update.sh -+++ mozilla/media/libcubeb/update.sh -@@ -16,6 +16,7 @@ cp $1/src/cubeb_audiounit.cpp src - cp $1/src/cubeb_osx_run_loop.h src - cp $1/src/cubeb_jack.cpp src - cp $1/src/cubeb_opensl.c src -+cp $1/src/cubeb_oss.c src - cp $1/src/cubeb_panner.cpp src - cp $1/src/cubeb_panner.h src - cp $1/src/cubeb_pulse.c src -diff --git media/webrtc/signaling/test/common.build media/webrtc/signaling/test/common.build -index 991f03f..3d99eb5 100644 ---- mozilla/media/webrtc/signaling/test/common.build -+++ mozilla/media/webrtc/signaling/test/common.build -@@ -102,8 +102,8 @@ USE_LIBS += ['mozglue'] - OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS'] - OS_LIBS += CONFIG['REALTIME_LIBS'] - --if CONFIG['MOZ_ALSA']: -- OS_LIBS += CONFIG['MOZ_ALSA_LIBS'] -+if CONFIG['MOZ_OSS']: -+ OS_LIBS += CONFIG['MOZ_OSS_LIBS'] - - if CONFIG['MOZ_SYSTEM_JPEG']: - OS_LIBS += CONFIG['MOZ_JPEG_LIBS'] -diff --git toolkit/library/moz.build toolkit/library/moz.build -index e191f13..4fb268a 100644 ---- mozilla/toolkit/library/moz.build -+++ mozilla/toolkit/library/moz.build -@@ -234,8 +234,8 @@ if CONFIG['MOZ_SYSTEM_LIBVPX']: - if not CONFIG['MOZ_TREE_PIXMAN']: - OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS'] - --if CONFIG['MOZ_ALSA']: -- OS_LIBS += CONFIG['MOZ_ALSA_LIBS'] -+if CONFIG['MOZ_OSS']: -+ OS_LIBS += CONFIG['MOZ_OSS_LIBS'] - - if CONFIG['HAVE_CLOCK_MONOTONIC']: - OS_LIBS += CONFIG['REALTIME_LIBS'] diff --git a/www/seamonkey/files/patch-ijg-libjpeg b/www/seamonkey/files/patch-ijg-libjpeg deleted file mode 100644 index 1d0010dbb93..00000000000 --- a/www/seamonkey/files/patch-ijg-libjpeg +++ /dev/null @@ -1,383 +0,0 @@ -# Partially revert bug 791305 to allow building with system IJG jpeg library - -diff --git old-configure.in configure.in -index f0aeb5d..1c01010 100644 ---- mozilla/old-configure.in -+++ mozilla/old-configure.in -@@ -4027,11 +4027,7 @@ if test "$MOZ_SYSTEM_JPEG" = 1; then - #include ], - [ #if JPEG_LIB_VERSION < $MOZJPEG - #error "Insufficient JPEG library version ($MOZJPEG required)." -- #endif -- #ifndef JCS_EXTENSIONS -- #error "libjpeg-turbo JCS_EXTENSIONS required" -- #endif -- ], -+ #endif ], - MOZ_SYSTEM_JPEG=1, - AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg])) - fi -diff --git image/decoders/nsJPEGDecoder.cpp image/decoders/nsJPEGDecoder.cpp -index 8fa8200..1d2a259 100644 ---- mozilla/image/decoders/nsJPEGDecoder.cpp -+++ mozilla/image/decoders/nsJPEGDecoder.cpp -@@ -21,13 +21,28 @@ - - extern "C" { - #include "iccjpeg.h" --} - -+#ifdef JCS_EXTENSIONS - #if MOZ_BIG_ENDIAN - #define MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB JCS_EXT_XRGB - #else - #define MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB JCS_EXT_BGRX - #endif -+#else -+/* Colorspace conversion (copied from jpegint.h) */ -+struct jpeg_color_deconverter { -+ JMETHOD(void, start_pass, (j_decompress_ptr cinfo)); -+ JMETHOD(void, color_convert, (j_decompress_ptr cinfo, -+ JSAMPIMAGE input_buf, JDIMENSION input_row, -+ JSAMPARRAY output_buf, int num_rows)); -+}; -+ -+METHODDEF(void) -+ycc_rgb_convert_argb (j_decompress_ptr cinfo, -+ JSAMPIMAGE input_buf, JDIMENSION input_row, -+ JSAMPARRAY output_buf, int num_rows); -+#endif -+} - - static void cmyk_convert_rgb(JSAMPROW row, JDIMENSION width); - -@@ -367,6 +382,7 @@ nsJPEGDecoder::WriteInternal(const char* - case JCS_GRAYSCALE: - case JCS_RGB: - case JCS_YCbCr: -+#ifdef JCS_EXTENSIONS - // if we're not color managing we can decode directly to - // MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB - if (mCMSMode != eCMSMode_All) { -@@ -375,6 +391,9 @@ nsJPEGDecoder::WriteInternal(const char* - } else { - mInfo.out_color_space = JCS_RGB; - } -+#else -+ mInfo.out_color_space = JCS_RGB; -+#endif - break; - case JCS_CMYK: - case JCS_YCCK: -@@ -448,6 +467,16 @@ nsJPEGDecoder::WriteInternal(const char* - return; // I/O suspension - } - -+#ifndef JCS_EXTENSIONS -+ /* Force to use our YCbCr to Packed RGB converter when possible */ -+ if (!mTransform && (mCMSMode != eCMSMode_All) && -+ mInfo.jpeg_color_space == JCS_YCbCr && mInfo.out_color_space == JCS_RGB) { -+ /* Special case for the most common case: transform from YCbCr direct into packed ARGB */ -+ mInfo.out_color_components = 4; /* Packed ARGB pixels are always 4 bytes...*/ -+ mInfo.cconvert->color_convert = ycc_rgb_convert_argb; -+ } -+#endif -+ - // If this is a progressive JPEG ... - mState = mInfo.buffered_image ? - JPEG_DECOMPRESS_PROGRESSIVE : JPEG_DECOMPRESS_SEQUENTIAL; -@@ -605,7 +633,11 @@ nsJPEGDecoder::OutputScanlines(bool* sus - uint32_t* imageRow = ((uint32_t*)mImageData) + - (mInfo.output_scanline * mInfo.output_width); - -+#ifdef JCS_EXTENSIONS - if (mInfo.out_color_space == MOZ_JCS_EXT_NATIVE_ENDIAN_XRGB) { -+#else -+ if (mInfo.cconvert->color_convert == ycc_rgb_convert_argb) { -+#endif - // Special case: scanline will be directly converted into packed ARGB - if (jpeg_read_scanlines(&mInfo, (JSAMPARRAY)&imageRow, 1) != 1) { - *suspend = true; // suspend -@@ -920,6 +952,282 @@ term_source (j_decompress_ptr jd) - } // namespace mozilla - - -+#ifndef JCS_EXTENSIONS -+/**************** YCbCr -> Cairo's RGB24/ARGB32 conversion: most common case **************/ -+ -+/* -+ * YCbCr is defined per CCIR 601-1, except that Cb and Cr are -+ * normalized to the range 0..MAXJSAMPLE rather than -0.5 .. 0.5. -+ * The conversion equations to be implemented are therefore -+ * R = Y + 1.40200 * Cr -+ * G = Y - 0.34414 * Cb - 0.71414 * Cr -+ * B = Y + 1.77200 * Cb -+ * where Cb and Cr represent the incoming values less CENTERJSAMPLE. -+ * (These numbers are derived from TIFF 6.0 section 21, dated 3-June-92.) -+ * -+ * To avoid floating-point arithmetic, we represent the fractional constants -+ * as integers scaled up by 2^16 (about 4 digits precision); we have to divide -+ * the products by 2^16, with appropriate rounding, to get the correct answer. -+ * Notice that Y, being an integral input, does not contribute any fraction -+ * so it need not participate in the rounding. -+ * -+ * For even more speed, we avoid doing any multiplications in the inner loop -+ * by precalculating the constants times Cb and Cr for all possible values. -+ * For 8-bit JSAMPLEs this is very reasonable (only 256 entries per table); -+ * for 12-bit samples it is still acceptable. It's not very reasonable for -+ * 16-bit samples, but if you want lossless storage you shouldn't be changing -+ * colorspace anyway. -+ * The Cr=>R and Cb=>B values can be rounded to integers in advance; the -+ * values for the G calculation are left scaled up, since we must add them -+ * together before rounding. -+ */ -+ -+#define SCALEBITS 16 /* speediest right-shift on some machines */ -+ -+/* Use static tables for color processing. */ -+/* Four tables, each 256 entries of 4 bytes totals 4K which is not bad... */ -+ -+const int Cr_r_tab[(MAXJSAMPLE+1) * sizeof(int)] ={ -+ -0xb3, -0xb2, -0xb1, -0xaf, -0xae, -0xac, -+ -0xab, -0xaa, -0xa8, -0xa7, -0xa5, -0xa4, -+ -0xa3, -0xa1, -0xa0, -0x9e, -0x9d, -0x9c, -+ -0x9a, -0x99, -0x97, -0x96, -0x95, -0x93, -+ -0x92, -0x90, -0x8f, -0x8e, -0x8c, -0x8b, -+ -0x89, -0x88, -0x87, -0x85, -0x84, -0x82, -+ -0x81, -0x80, -0x7e, -0x7d, -0x7b, -0x7a, -+ -0x79, -0x77, -0x76, -0x74, -0x73, -0x72, -+ -0x70, -0x6f, -0x6d, -0x6c, -0x6b, -0x69, -+ -0x68, -0x66, -0x65, -0x64, -0x62, -0x61, -+ -0x5f, -0x5e, -0x5d, -0x5b, -0x5a, -0x58, -+ -0x57, -0x56, -0x54, -0x53, -0x51, -0x50, -+ -0x4f, -0x4d, -0x4c, -0x4a, -0x49, -0x48, -+ -0x46, -0x45, -0x43, -0x42, -0x40, -0x3f, -+ -0x3e, -0x3c, -0x3b, -0x39, -0x38, -0x37, -+ -0x35, -0x34, -0x32, -0x31, -0x30, -0x2e, -+ -0x2d, -0x2b, -0x2a, -0x29, -0x27, -0x26, -+ -0x24, -0x23, -0x22, -0x20, -0x1f, -0x1d, -+ -0x1c, -0x1b, -0x19, -0x18, -0x16, -0x15, -+ -0x14, -0x12, -0x11, -0x0f, -0x0e, -0x0d, -+ -0x0b, -0x0a, -0x08, -0x07, -0x06, -0x04, -+ -0x03, -0x01, 0x00, 0x01, 0x03, 0x04, -+ 0x06, 0x07, 0x08, 0x0a, 0x0b, 0x0d, -+ 0x0e, 0x0f, 0x11, 0x12, 0x14, 0x15, -+ 0x16, 0x18, 0x19, 0x1b, 0x1c, 0x1d, -+ 0x1f, 0x20, 0x22, 0x23, 0x24, 0x26, -+ 0x27, 0x29, 0x2a, 0x2b, 0x2d, 0x2e, -+ 0x30, 0x31, 0x32, 0x34, 0x35, 0x37, -+ 0x38, 0x39, 0x3b, 0x3c, 0x3e, 0x3f, -+ 0x40, 0x42, 0x43, 0x45, 0x46, 0x48, -+ 0x49, 0x4a, 0x4c, 0x4d, 0x4f, 0x50, -+ 0x51, 0x53, 0x54, 0x56, 0x57, 0x58, -+ 0x5a, 0x5b, 0x5d, 0x5e, 0x5f, 0x61, -+ 0x62, 0x64, 0x65, 0x66, 0x68, 0x69, -+ 0x6b, 0x6c, 0x6d, 0x6f, 0x70, 0x72, -+ 0x73, 0x74, 0x76, 0x77, 0x79, 0x7a, -+ 0x7b, 0x7d, 0x7e, 0x80, 0x81, 0x82, -+ 0x84, 0x85, 0x87, 0x88, 0x89, 0x8b, -+ 0x8c, 0x8e, 0x8f, 0x90, 0x92, 0x93, -+ 0x95, 0x96, 0x97, 0x99, 0x9a, 0x9c, -+ 0x9d, 0x9e, 0xa0, 0xa1, 0xa3, 0xa4, -+ 0xa5, 0xa7, 0xa8, 0xaa, 0xab, 0xac, -+ 0xae, 0xaf, 0xb1, 0xb2, -+ }; -+ -+const int Cb_b_tab[(MAXJSAMPLE+1) * sizeof(int)] ={ -+ -0xe3, -0xe1, -0xdf, -0xde, -0xdc, -0xda, -+ -0xd8, -0xd6, -0xd5, -0xd3, -0xd1, -0xcf, -+ -0xce, -0xcc, -0xca, -0xc8, -0xc6, -0xc5, -+ -0xc3, -0xc1, -0xbf, -0xbe, -0xbc, -0xba, -+ -0xb8, -0xb7, -0xb5, -0xb3, -0xb1, -0xaf, -+ -0xae, -0xac, -0xaa, -0xa8, -0xa7, -0xa5, -+ -0xa3, -0xa1, -0x9f, -0x9e, -0x9c, -0x9a, -+ -0x98, -0x97, -0x95, -0x93, -0x91, -0x90, -+ -0x8e, -0x8c, -0x8a, -0x88, -0x87, -0x85, -+ -0x83, -0x81, -0x80, -0x7e, -0x7c, -0x7a, -+ -0x78, -0x77, -0x75, -0x73, -0x71, -0x70, -+ -0x6e, -0x6c, -0x6a, -0x69, -0x67, -0x65, -+ -0x63, -0x61, -0x60, -0x5e, -0x5c, -0x5a, -+ -0x59, -0x57, -0x55, -0x53, -0x52, -0x50, -+ -0x4e, -0x4c, -0x4a, -0x49, -0x47, -0x45, -+ -0x43, -0x42, -0x40, -0x3e, -0x3c, -0x3a, -+ -0x39, -0x37, -0x35, -0x33, -0x32, -0x30, -+ -0x2e, -0x2c, -0x2b, -0x29, -0x27, -0x25, -+ -0x23, -0x22, -0x20, -0x1e, -0x1c, -0x1b, -+ -0x19, -0x17, -0x15, -0x13, -0x12, -0x10, -+ -0x0e, -0x0c, -0x0b, -0x09, -0x07, -0x05, -+ -0x04, -0x02, 0x00, 0x02, 0x04, 0x05, -+ 0x07, 0x09, 0x0b, 0x0c, 0x0e, 0x10, -+ 0x12, 0x13, 0x15, 0x17, 0x19, 0x1b, -+ 0x1c, 0x1e, 0x20, 0x22, 0x23, 0x25, -+ 0x27, 0x29, 0x2b, 0x2c, 0x2e, 0x30, -+ 0x32, 0x33, 0x35, 0x37, 0x39, 0x3a, -+ 0x3c, 0x3e, 0x40, 0x42, 0x43, 0x45, -+ 0x47, 0x49, 0x4a, 0x4c, 0x4e, 0x50, -+ 0x52, 0x53, 0x55, 0x57, 0x59, 0x5a, -+ 0x5c, 0x5e, 0x60, 0x61, 0x63, 0x65, -+ 0x67, 0x69, 0x6a, 0x6c, 0x6e, 0x70, -+ 0x71, 0x73, 0x75, 0x77, 0x78, 0x7a, -+ 0x7c, 0x7e, 0x80, 0x81, 0x83, 0x85, -+ 0x87, 0x88, 0x8a, 0x8c, 0x8e, 0x90, -+ 0x91, 0x93, 0x95, 0x97, 0x98, 0x9a, -+ 0x9c, 0x9e, 0x9f, 0xa1, 0xa3, 0xa5, -+ 0xa7, 0xa8, 0xaa, 0xac, 0xae, 0xaf, -+ 0xb1, 0xb3, 0xb5, 0xb7, 0xb8, 0xba, -+ 0xbc, 0xbe, 0xbf, 0xc1, 0xc3, 0xc5, -+ 0xc6, 0xc8, 0xca, 0xcc, 0xce, 0xcf, -+ 0xd1, 0xd3, 0xd5, 0xd6, 0xd8, 0xda, -+ 0xdc, 0xde, 0xdf, 0xe1, -+ }; -+ -+const int Cr_g_tab[(MAXJSAMPLE+1) * sizeof(int)] ={ -+ 0x5b6900, 0x5ab22e, 0x59fb5c, 0x59448a, 0x588db8, 0x57d6e6, -+ 0x572014, 0x566942, 0x55b270, 0x54fb9e, 0x5444cc, 0x538dfa, -+ 0x52d728, 0x522056, 0x516984, 0x50b2b2, 0x4ffbe0, 0x4f450e, -+ 0x4e8e3c, 0x4dd76a, 0x4d2098, 0x4c69c6, 0x4bb2f4, 0x4afc22, -+ 0x4a4550, 0x498e7e, 0x48d7ac, 0x4820da, 0x476a08, 0x46b336, -+ 0x45fc64, 0x454592, 0x448ec0, 0x43d7ee, 0x43211c, 0x426a4a, -+ 0x41b378, 0x40fca6, 0x4045d4, 0x3f8f02, 0x3ed830, 0x3e215e, -+ 0x3d6a8c, 0x3cb3ba, 0x3bfce8, 0x3b4616, 0x3a8f44, 0x39d872, -+ 0x3921a0, 0x386ace, 0x37b3fc, 0x36fd2a, 0x364658, 0x358f86, -+ 0x34d8b4, 0x3421e2, 0x336b10, 0x32b43e, 0x31fd6c, 0x31469a, -+ 0x308fc8, 0x2fd8f6, 0x2f2224, 0x2e6b52, 0x2db480, 0x2cfdae, -+ 0x2c46dc, 0x2b900a, 0x2ad938, 0x2a2266, 0x296b94, 0x28b4c2, -+ 0x27fdf0, 0x27471e, 0x26904c, 0x25d97a, 0x2522a8, 0x246bd6, -+ 0x23b504, 0x22fe32, 0x224760, 0x21908e, 0x20d9bc, 0x2022ea, -+ 0x1f6c18, 0x1eb546, 0x1dfe74, 0x1d47a2, 0x1c90d0, 0x1bd9fe, -+ 0x1b232c, 0x1a6c5a, 0x19b588, 0x18feb6, 0x1847e4, 0x179112, -+ 0x16da40, 0x16236e, 0x156c9c, 0x14b5ca, 0x13fef8, 0x134826, -+ 0x129154, 0x11da82, 0x1123b0, 0x106cde, 0x0fb60c, 0x0eff3a, -+ 0x0e4868, 0x0d9196, 0x0cdac4, 0x0c23f2, 0x0b6d20, 0x0ab64e, -+ 0x09ff7c, 0x0948aa, 0x0891d8, 0x07db06, 0x072434, 0x066d62, -+ 0x05b690, 0x04ffbe, 0x0448ec, 0x03921a, 0x02db48, 0x022476, -+ 0x016da4, 0x00b6d2, 0x000000, -0x00b6d2, -0x016da4, -0x022476, -+ -0x02db48, -0x03921a, -0x0448ec, -0x04ffbe, -0x05b690, -0x066d62, -+ -0x072434, -0x07db06, -0x0891d8, -0x0948aa, -0x09ff7c, -0x0ab64e, -+ -0x0b6d20, -0x0c23f2, -0x0cdac4, -0x0d9196, -0x0e4868, -0x0eff3a, -+ -0x0fb60c, -0x106cde, -0x1123b0, -0x11da82, -0x129154, -0x134826, -+ -0x13fef8, -0x14b5ca, -0x156c9c, -0x16236e, -0x16da40, -0x179112, -+ -0x1847e4, -0x18feb6, -0x19b588, -0x1a6c5a, -0x1b232c, -0x1bd9fe, -+ -0x1c90d0, -0x1d47a2, -0x1dfe74, -0x1eb546, -0x1f6c18, -0x2022ea, -+ -0x20d9bc, -0x21908e, -0x224760, -0x22fe32, -0x23b504, -0x246bd6, -+ -0x2522a8, -0x25d97a, -0x26904c, -0x27471e, -0x27fdf0, -0x28b4c2, -+ -0x296b94, -0x2a2266, -0x2ad938, -0x2b900a, -0x2c46dc, -0x2cfdae, -+ -0x2db480, -0x2e6b52, -0x2f2224, -0x2fd8f6, -0x308fc8, -0x31469a, -+ -0x31fd6c, -0x32b43e, -0x336b10, -0x3421e2, -0x34d8b4, -0x358f86, -+ -0x364658, -0x36fd2a, -0x37b3fc, -0x386ace, -0x3921a0, -0x39d872, -+ -0x3a8f44, -0x3b4616, -0x3bfce8, -0x3cb3ba, -0x3d6a8c, -0x3e215e, -+ -0x3ed830, -0x3f8f02, -0x4045d4, -0x40fca6, -0x41b378, -0x426a4a, -+ -0x43211c, -0x43d7ee, -0x448ec0, -0x454592, -0x45fc64, -0x46b336, -+ -0x476a08, -0x4820da, -0x48d7ac, -0x498e7e, -0x4a4550, -0x4afc22, -+ -0x4bb2f4, -0x4c69c6, -0x4d2098, -0x4dd76a, -0x4e8e3c, -0x4f450e, -+ -0x4ffbe0, -0x50b2b2, -0x516984, -0x522056, -0x52d728, -0x538dfa, -+ -0x5444cc, -0x54fb9e, -0x55b270, -0x566942, -0x572014, -0x57d6e6, -+ -0x588db8, -0x59448a, -0x59fb5c, -0x5ab22e, -+ }; -+ -+const int Cb_g_tab[(MAXJSAMPLE+1) * sizeof(int)] ={ -+ 0x2c8d00, 0x2c34e6, 0x2bdccc, 0x2b84b2, 0x2b2c98, 0x2ad47e, -+ 0x2a7c64, 0x2a244a, 0x29cc30, 0x297416, 0x291bfc, 0x28c3e2, -+ 0x286bc8, 0x2813ae, 0x27bb94, 0x27637a, 0x270b60, 0x26b346, -+ 0x265b2c, 0x260312, 0x25aaf8, 0x2552de, 0x24fac4, 0x24a2aa, -+ 0x244a90, 0x23f276, 0x239a5c, 0x234242, 0x22ea28, 0x22920e, -+ 0x2239f4, 0x21e1da, 0x2189c0, 0x2131a6, 0x20d98c, 0x208172, -+ 0x202958, 0x1fd13e, 0x1f7924, 0x1f210a, 0x1ec8f0, 0x1e70d6, -+ 0x1e18bc, 0x1dc0a2, 0x1d6888, 0x1d106e, 0x1cb854, 0x1c603a, -+ 0x1c0820, 0x1bb006, 0x1b57ec, 0x1affd2, 0x1aa7b8, 0x1a4f9e, -+ 0x19f784, 0x199f6a, 0x194750, 0x18ef36, 0x18971c, 0x183f02, -+ 0x17e6e8, 0x178ece, 0x1736b4, 0x16de9a, 0x168680, 0x162e66, -+ 0x15d64c, 0x157e32, 0x152618, 0x14cdfe, 0x1475e4, 0x141dca, -+ 0x13c5b0, 0x136d96, 0x13157c, 0x12bd62, 0x126548, 0x120d2e, -+ 0x11b514, 0x115cfa, 0x1104e0, 0x10acc6, 0x1054ac, 0x0ffc92, -+ 0x0fa478, 0x0f4c5e, 0x0ef444, 0x0e9c2a, 0x0e4410, 0x0debf6, -+ 0x0d93dc, 0x0d3bc2, 0x0ce3a8, 0x0c8b8e, 0x0c3374, 0x0bdb5a, -+ 0x0b8340, 0x0b2b26, 0x0ad30c, 0x0a7af2, 0x0a22d8, 0x09cabe, -+ 0x0972a4, 0x091a8a, 0x08c270, 0x086a56, 0x08123c, 0x07ba22, -+ 0x076208, 0x0709ee, 0x06b1d4, 0x0659ba, 0x0601a0, 0x05a986, -+ 0x05516c, 0x04f952, 0x04a138, 0x04491e, 0x03f104, 0x0398ea, -+ 0x0340d0, 0x02e8b6, 0x02909c, 0x023882, 0x01e068, 0x01884e, -+ 0x013034, 0x00d81a, 0x008000, 0x0027e6, -0x003034, -0x00884e, -+ -0x00e068, -0x013882, -0x01909c, -0x01e8b6, -0x0240d0, -0x0298ea, -+ -0x02f104, -0x03491e, -0x03a138, -0x03f952, -0x04516c, -0x04a986, -+ -0x0501a0, -0x0559ba, -0x05b1d4, -0x0609ee, -0x066208, -0x06ba22, -+ -0x07123c, -0x076a56, -0x07c270, -0x081a8a, -0x0872a4, -0x08cabe, -+ -0x0922d8, -0x097af2, -0x09d30c, -0x0a2b26, -0x0a8340, -0x0adb5a, -+ -0x0b3374, -0x0b8b8e, -0x0be3a8, -0x0c3bc2, -0x0c93dc, -0x0cebf6, -+ -0x0d4410, -0x0d9c2a, -0x0df444, -0x0e4c5e, -0x0ea478, -0x0efc92, -+ -0x0f54ac, -0x0facc6, -0x1004e0, -0x105cfa, -0x10b514, -0x110d2e, -+ -0x116548, -0x11bd62, -0x12157c, -0x126d96, -0x12c5b0, -0x131dca, -+ -0x1375e4, -0x13cdfe, -0x142618, -0x147e32, -0x14d64c, -0x152e66, -+ -0x158680, -0x15de9a, -0x1636b4, -0x168ece, -0x16e6e8, -0x173f02, -+ -0x17971c, -0x17ef36, -0x184750, -0x189f6a, -0x18f784, -0x194f9e, -+ -0x19a7b8, -0x19ffd2, -0x1a57ec, -0x1ab006, -0x1b0820, -0x1b603a, -+ -0x1bb854, -0x1c106e, -0x1c6888, -0x1cc0a2, -0x1d18bc, -0x1d70d6, -+ -0x1dc8f0, -0x1e210a, -0x1e7924, -0x1ed13e, -0x1f2958, -0x1f8172, -+ -0x1fd98c, -0x2031a6, -0x2089c0, -0x20e1da, -0x2139f4, -0x21920e, -+ -0x21ea28, -0x224242, -0x229a5c, -0x22f276, -0x234a90, -0x23a2aa, -+ -0x23fac4, -0x2452de, -0x24aaf8, -0x250312, -0x255b2c, -0x25b346, -+ -0x260b60, -0x26637a, -0x26bb94, -0x2713ae, -0x276bc8, -0x27c3e2, -+ -0x281bfc, -0x287416, -0x28cc30, -0x29244a, -0x297c64, -0x29d47e, -+ -0x2a2c98, -0x2a84b2, -0x2adccc, -0x2b34e6, -+ }; -+ -+ -+/* We assume that right shift corresponds to signed division by 2 with -+ * rounding towards minus infinity. This is correct for typical "arithmetic -+ * shift" instructions that shift in copies of the sign bit. But some -+ * C compilers implement >> with an unsigned shift. For these machines you -+ * must define RIGHT_SHIFT_IS_UNSIGNED. -+ * RIGHT_SHIFT provides a proper signed right shift of an INT32 quantity. -+ * It is only applied with constant shift counts. SHIFT_TEMPS must be -+ * included in the variables of any routine using RIGHT_SHIFT. -+ */ -+ -+#ifdef RIGHT_SHIFT_IS_UNSIGNED -+#define SHIFT_TEMPS INT32 shift_temp; -+#define RIGHT_SHIFT(x,shft) \ -+ ((shift_temp = (x)) < 0 ? \ -+ (shift_temp >> (shft)) | ((~((INT32) 0)) << (32-(shft))) : \ -+ (shift_temp >> (shft))) -+#else -+#define SHIFT_TEMPS -+#define RIGHT_SHIFT(x,shft) ((x) >> (shft)) -+#endif -+ -+ -+METHODDEF(void) -+ycc_rgb_convert_argb (j_decompress_ptr cinfo, -+ JSAMPIMAGE input_buf, JDIMENSION input_row, -+ JSAMPARRAY output_buf, int num_rows) -+{ -+ JDIMENSION num_cols = cinfo->output_width; -+ JSAMPLE * range_limit = cinfo->sample_range_limit; -+ -+ SHIFT_TEMPS -+ -+ /* This is used if we don't have SSE2 */ -+ -+ while (--num_rows >= 0) { -+ JSAMPROW inptr0 = input_buf[0][input_row]; -+ JSAMPROW inptr1 = input_buf[1][input_row]; -+ JSAMPROW inptr2 = input_buf[2][input_row]; -+ input_row++; -+ uint32_t *outptr = (uint32_t *) *output_buf++; -+ for (JDIMENSION col = 0; col < num_cols; col++) { -+ int y = GETJSAMPLE(inptr0[col]); -+ int cb = GETJSAMPLE(inptr1[col]); -+ int cr = GETJSAMPLE(inptr2[col]); -+ JSAMPLE * range_limit_y = range_limit + y; -+ /* Range-limiting is essential due to noise introduced by DCT losses. */ -+ outptr[col] = 0xFF000000 | -+ ( range_limit_y[Cr_r_tab[cr]] << 16 ) | -+ ( range_limit_y[((int) RIGHT_SHIFT(Cb_g_tab[cb] + Cr_g_tab[cr], SCALEBITS))] << 8 ) | -+ ( range_limit_y[Cb_b_tab[cb]] ); -+ } -+ } -+} -+#endif -+ -+ - ///*************** Inverted CMYK -> RGB conversion ************************* - /// Input is (Inverted) CMYK stored as 4 bytes per pixel. - /// Output is RGB stored as 3 bytes per pixel. diff --git a/www/seamonkey/files/patch-sample-type b/www/seamonkey/files/patch-sample-type deleted file mode 100644 index 4e51c6ccf93..00000000000 --- a/www/seamonkey/files/patch-sample-type +++ /dev/null @@ -1,13 +0,0 @@ -# Let ports handle default sample type - ---- mozilla/old-configure.in~ -+++ mozilla/old-configure.in -@@ -5144,7 +5144,7 @@ dnl Use integers over floats for audio o - dnl (regarless of the CPU architecture, because audio - dnl backends for those platforms don't support floats. We also - dnl use integers on ARM with other OS, because it's more efficient. --if test "$OS_TARGET" = "Android" -o "$CPU_ARCH" = "arm"; then -+if test -n "$MOZ_INTEGER_SAMPLES"; then - MOZ_SAMPLE_TYPE_S16=1 - AC_DEFINE(MOZ_SAMPLE_TYPE_S16) - AC_SUBST(MOZ_SAMPLE_TYPE_S16) diff --git a/www/seamonkey/files/patch-z-bug517422 b/www/seamonkey/files/patch-z-bug517422 deleted file mode 100644 index e7f14c0a473..00000000000 --- a/www/seamonkey/files/patch-z-bug517422 +++ /dev/null @@ -1,502 +0,0 @@ -# Allow more config/external/ libs built against system-wide version. - -diff --git build/moz.configure/old.configure build/moz.configure/old.configure -index d0fe7accffe6..c46bdd023225 100644 ---- mozilla/build/moz.configure/old.configure -+++ mozilla/build/moz.configure/old.configure -@@ -288,7 +288,12 @@ def old_configure_options(*options): - '--with-system-libvpx', - '--with-system-nspr', - '--with-system-nss', -+ '--with-system-ogg', - '--with-system-png', -+ '--with-system-soundtouch', -+ '--with-system-theora', -+ '--with-system-tremor', -+ '--with-system-vorbis', - '--with-system-zlib', - '--with-thumb', - '--with-thumb-interwork', -diff --git config/Makefile.in config/Makefile.in -index a6206bb0ff30..f20987c61754 100644 ---- mozilla/config/Makefile.in -+++ mozilla/config/Makefile.in -@@ -51,6 +51,11 @@ export:: $(export-preqs) - -DMOZ_SYSTEM_LIBEVENT=$(MOZ_SYSTEM_LIBEVENT) \ - -DMOZ_SYSTEM_LIBVPX=$(MOZ_SYSTEM_LIBVPX) \ - -DMOZ_SYSTEM_ICU=$(MOZ_SYSTEM_ICU) \ -+ -DMOZ_SYSTEM_OGG=$(MOZ_SYSTEM_OGG) \ -+ -DMOZ_SYSTEM_THEORA=$(MOZ_SYSTEM_THEORA) \ -+ -DMOZ_SYSTEM_VORBIS=$(MOZ_SYSTEM_VORBIS) \ -+ -DMOZ_SYSTEM_TREMOR=$(MOZ_SYSTEM_TREMOR) \ -+ -DMOZ_SYSTEM_SOUNDTOUCH=$(MOZ_SYSTEM_SOUNDTOUCH) \ - $(srcdir)/system-headers $(srcdir)/stl-headers | $(PERL) $(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers - $(INSTALL) system_wrappers $(DIST) - -diff --git config/external/moz.build config/external/moz.build -index 029ff8504795..2c3a40caa1ba 100644 ---- mozilla/config/external/moz.build -+++ mozilla/config/external/moz.build -@@ -21,12 +21,21 @@ if CONFIG['MOZ_UPDATER']: - external_dirs += ['modules/brotli'] - external_dirs += ['modules/woff2'] - --if CONFIG['MOZ_VORBIS']: -+if not CONFIG['MOZ_SYSTEM_OGG']: -+ external_dirs += ['media/libogg'] -+ -+if CONFIG['MOZ_VORBIS'] and not CONFIG['MOZ_SYSTEM_VORBIS']: - external_dirs += ['media/libvorbis'] - --if CONFIG['MOZ_TREMOR']: -+if CONFIG['MOZ_TREMOR'] and not CONFIG['MOZ_SYSTEM_TREMOR']: - external_dirs += ['media/libtremor'] - -+if not CONFIG['MOZ_SYSTEM_THEORA']: -+ external_dirs += ['media/libtheora'] -+ -+if not CONFIG['MOZ_SYSTEM_SOUNDTOUCH']: -+ external_dirs += ['media/libsoundtouch'] -+ - if CONFIG['MOZ_WEBM_ENCODER']: - external_dirs += ['media/libmkv'] - -@@ -52,12 +61,9 @@ external_dirs += [ - 'media/kiss_fft', - 'media/libcubeb', - 'media/libnestegg', -- 'media/libogg', - 'media/libopus', -- 'media/libtheora', - 'media/libspeex_resampler', - 'media/libstagefright', -- 'media/libsoundtouch', - 'media/psshparser' - ] - -diff --git config/system-headers config/system-headers -index 5ee7f71f9634..13178ac3b3ab 100644 ---- mozilla/config/system-headers -+++ mozilla/config/system-headers -@@ -1348,3 +1348,17 @@ unicode/utypes.h - libutil.h - unwind.h - fenv.h -+#if MOZ_SYSTEM_OGG==1 -+ogg/ogg.h -+ogg/os_types.h -+#endif -+#if MOZ_SYSTEM_THEORA==1 -+theora/theoradec.h -+#endif -+#if MOZ_SYSTEM_VORBIS==1 -+vorbis/codec.h -+vorbis/vorbisenc.h -+#endif -+#if MOZ_SYSTEM_TREMOR==1 -+tremor/ivorbiscodec.h -+#endif -diff --git dom/media/AudioStream.cpp dom/media/AudioStream.cpp -index 93ecda4319af..ff674c64ea07 100644 ---- mozilla/dom/media/AudioStream.cpp -+++ mozilla/dom/media/AudioStream.cpp -@@ -115,7 +115,9 @@ AudioStream::AudioStream(DataSource& aSource) - : mMonitor("AudioStream") - , mChannels(0) - , mOutChannels(0) -+#ifndef MOZ_SYSTEM_SOUNDTOUCH - , mTimeStretcher(nullptr) -+#endif - , mDumpFile(nullptr) - , mState(INITIALIZED) - , mDataSource(aSource) -@@ -130,9 +132,11 @@ AudioStream::~AudioStream() - if (mDumpFile) { - fclose(mDumpFile); - } -+#ifndef MOZ_SYSTEM_SOUNDTOUCH - if (mTimeStretcher) { - soundtouch::destroySoundTouchObj(mTimeStretcher); - } -+#endif - } - - size_t -@@ -151,7 +155,11 @@ nsresult AudioStream::EnsureTimeStretcherInitializedUnlocked() - { - mMonitor.AssertCurrentThreadOwns(); - if (!mTimeStretcher) { -+#ifdef MOZ_SYSTEM_SOUNDTOUCH -+ mTimeStretcher = new soundtouch::SoundTouch(); -+#else - mTimeStretcher = soundtouch::createSoundTouchObj(); -+#endif - mTimeStretcher->setSampleRate(mAudioClock.GetInputRate()); - mTimeStretcher->setChannels(mOutChannels); - mTimeStretcher->setPitch(1.0); -diff --git dom/media/AudioStream.h dom/media/AudioStream.h -index 7dc1f60f95cc..67d402a4117f 100644 ---- mozilla/dom/media/AudioStream.h -+++ mozilla/dom/media/AudioStream.h -@@ -16,7 +16,11 @@ - #include "mozilla/TimeStamp.h" - #include "mozilla/UniquePtr.h" - #include "CubebUtils.h" -+#ifdef MOZ_SYSTEM_SOUNDTOUCH -+#include "soundtouch/SoundTouch.h" -+#else - #include "soundtouch/SoundTouchFactory.h" -+#endif - - namespace mozilla { - -@@ -287,7 +291,11 @@ private: - uint32_t mChannels; - uint32_t mOutChannels; - AudioClock mAudioClock; -+#ifdef MOZ_SYSTEM_SOUNDTOUCH -+ nsAutoPtr mTimeStretcher; -+#else - soundtouch::SoundTouch* mTimeStretcher; -+#endif - - // Output file for dumping audio - FILE* mDumpFile; -diff --git dom/media/moz.build dom/media/moz.build -index 86b051c58d33..fb6186dce78b 100644 ---- mozilla/dom/media/moz.build -+++ mozilla/dom/media/moz.build -@@ -308,6 +308,21 @@ if CONFIG['MOZ_WEBRTC']: - - DEFINES['MOZILLA_INTERNAL_API'] = True - -+if CONFIG['MOZ_SYSTEM_OGG']: -+ CXXFLAGS += CONFIG['MOZ_OGG_CFLAGS'] -+ -+if CONFIG['MOZ_SYSTEM_THEORA']: -+ CXXFLAGS += CONFIG['MOZ_THEORA_CFLAGS'] -+ -+if CONFIG['MOZ_SYSTEM_VORBIS']: -+ CXXFLAGS += CONFIG['MOZ_VORBIS_CFLAGS'] -+ -+if CONFIG['MOZ_SYSTEM_TREMOR']: -+ CXXFLAGS += CONFIG['MOZ_TREMOR_CFLAGS'] -+ -+if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']: -+ CXXFLAGS += CONFIG['MOZ_SOUNDTOUCH_CFLAGS'] -+ - if CONFIG['OS_TARGET'] == 'WINNT': - DEFINES['WEBRTC_WIN'] = True - else: -diff --git dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp -index 078f6ea5ef60..c600db067539 100644 ---- mozilla/dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp -+++ mozilla/dom/media/platforms/ffmpeg/ffvpx/FFVPXRuntimeLinker.cpp -@@ -11,9 +11,13 @@ - #include "prmem.h" - #include "prlink.h" - -+#ifdef MOZ_SYSTEM_SOUNDTOUCH -+#include "nsXPCOMPrivate.h" // for XUL_DLL -+#else - // We use a known symbol located in lgpllibs to determine its location. - // soundtouch happens to be always included in lgpllibs - #include "soundtouch/SoundTouch.h" -+#endif - - namespace mozilla { - -@@ -50,6 +54,12 @@ FFVPXRuntimeLinker::Init() - - sLinkStatus = LinkStatus_FAILED; - -+#ifdef MOZ_SYSTEM_SOUNDTOUCH -+ // We retrieve the path of the XUL library as this is where mozavcodec and -+ // mozavutil libs are located. -+ char* path = -+ PR_GetLibraryFilePathname(XUL_DLL, (PRFuncPtr)&FFVPXRuntimeLinker::Init); -+#else - // We retrieve the path of the lgpllibs library as this is where mozavcodec - // and mozavutil libs are located. - char* lgpllibsname = PR_GetLibraryName(nullptr, "lgpllibs"); -@@ -60,6 +70,7 @@ FFVPXRuntimeLinker::Init() - PR_GetLibraryFilePathname(lgpllibsname, - (PRFuncPtr)&soundtouch::SoundTouch::getVersionId); - PR_FreeLibraryName(lgpllibsname); -+#endif - if (!path) { - return false; - } -diff --git media/libogg/README_MOZILLA media/libogg/README_MOZILLA -index 6213fdc7770c..ada799916a17 100644 ---- mozilla/media/libogg/README_MOZILLA -+++ mozilla/media/libogg/README_MOZILLA -@@ -6,3 +6,6 @@ package downloaded from xiph.org and copied using the update.sh script. - The int-types.patch address a bug that config_types.h generated from - Linux platform can't be used on OpenSolaris directly see Mozilla bug - 449754 -+ -+The in-tree copy may be omitted during build by --with-system-ogg. -+Keep version in old-configure.in in sync on updates. -diff --git media/libsoundtouch/README_MOZILLA media/libsoundtouch/README_MOZILLA -index dc0dbe8f6886..ea73b55e3e39 100644 ---- mozilla/media/libsoundtouch/README_MOZILLA -+++ mozilla/media/libsoundtouch/README_MOZILLA -@@ -6,3 +6,5 @@ The whole library is not used, only the relevant files are imported in the tree, - using the script `update.sh`. Some changes have been made to the files, using - the patch `moz-libsoundtouch.patch`. We also use a custom soundtouch_config.h. - -+The in-tree copy may be omitted during build by --with-system-soundtouch. -+Keep version in old-configure.in in sync on updates. -diff --git media/libsoundtouch/src/soundtouch_perms.h media/libsoundtouch/src/soundtouch_perms.h -index 0af2fe618311..10973564e7a4 100644 ---- mozilla/media/libsoundtouch/src/soundtouch_perms.h -+++ mozilla/media/libsoundtouch/src/soundtouch_perms.h -@@ -12,7 +12,9 @@ - - #pragma GCC visibility push(default) - #include "SoundTouch.h" -+#ifndef MOZ_SYSTEM_SOUNDTOUCH - #include "SoundTouchFactory.h" -+#endif - #pragma GCC visibility pop - - #endif // MOZILLA_SOUNDTOUCH_PERMS_H -diff --git media/libtheora/README_MOZILLA media/libtheora/README_MOZILLA -index d48dbfa6f63d..6f30f250220e 100644 ---- mozilla/media/libtheora/README_MOZILLA -+++ mozilla/media/libtheora/README_MOZILLA -@@ -3,3 +3,6 @@ using the update.sh script. The changes made were those applied by update.sh, - the addition/update of Makefile.in files for the Mozilla build system. - - The subversion revision used was r17578. -+ -+The in-tree copy may be omitted during build by --with-system-theora. -+Keep version in old-configure.in in sync on updates. -diff --git media/libtheora/moz.build media/libtheora/moz.build -index c7f85eebff95..aae7b814adb5 100644 ---- mozilla/media/libtheora/moz.build -+++ mozilla/media/libtheora/moz.build -@@ -21,6 +21,9 @@ FINAL_LIBRARY = 'gkmedias' - # The encoder is currently not included. - DEFINES['THEORA_DISABLE_ENCODE'] = True - -+if CONFIG['MOZ_SYSTEM_OGG']: -+ CFLAGS += CONFIG['MOZ_OGG_CFLAGS'] -+ - # Suppress warnings in third-party code. - if CONFIG['GNU_CC'] or CONFIG['CLANG_CL']: - CFLAGS += ['-Wno-type-limits'] -diff --git media/libtremor/README_MOZILLA media/libtremor/README_MOZILLA -index ee67b53a05c5..81c971773d55 100644 ---- mozilla/media/libtremor/README_MOZILLA -+++ mozilla/media/libtremor/README_MOZILLA -@@ -5,3 +5,6 @@ Makefile.in files for the Mozilla build system. - - The upstream release used was http://svn.xiph.org/trunk/Tremor/ - The subversion revision used was r17547. -+ -+The in-tree copy may be omitted during build by --with-system-tremor. -+Keep version in old-configure.in in sync on updates. -diff --git media/libtremor/moz.build media/libtremor/moz.build -index 83afc8e37c64..71ef159da3d7 100644 ---- mozilla/media/libtremor/moz.build -+++ mozilla/media/libtremor/moz.build -@@ -9,3 +9,5 @@ with Files('*'): - - DIRS += ['include/tremor', 'lib'] - -+if CONFIG['MOZ_SYSTEM_OGG']: -+ CFLAGS += CONFIG['MOZ_OGG_CFLAGS'] -diff --git media/libvorbis/README_MOZILLA media/libvorbis/README_MOZILLA -index 1211ac074b33..eb31084aed25 100644 ---- mozilla/media/libvorbis/README_MOZILLA -+++ mozilla/media/libvorbis/README_MOZILLA -@@ -8,3 +8,6 @@ https://svn.xiph.org/tags/vorbis/libvorbis-1.3.5@19464 - - Some files are renamed during the copy to prevent clashes with object - file names with other Mozilla libraries. -+ -+The in-tree copy may be omitted during build by --with-system-vorbis. -+Keep version in old-configure.in in sync on updates. -diff --git media/libvorbis/moz.build media/libvorbis/moz.build -index adf393782cc9..923b76231107 100644 ---- mozilla/media/libvorbis/moz.build -+++ mozilla/media/libvorbis/moz.build -@@ -56,3 +56,6 @@ FINAL_LIBRARY = 'gkmedias' - # Suppress warnings in third-party code. - if CONFIG['GNU_CC']: - CFLAGS += ['-Wno-uninitialized'] -+ -+if CONFIG['MOZ_SYSTEM_OGG']: -+ CFLAGS += CONFIG['MOZ_OGG_CFLAGS'] -diff --git old-configure.in old-configure.in -index b614eef85c89..85f9099dba4d 100644 ---- mozilla/old-configure.in -+++ mozilla/old-configure.in -@@ -2941,6 +2941,111 @@ if test -n "$MOZ_OMX_PLUGIN"; then - fi - fi - -+dnl ======================================================== -+dnl Check for libogg -+dnl ======================================================== -+ -+MOZ_ARG_WITH_BOOL(system-ogg, -+[ --with-system-ogg Use system libogg (located with pkgconfig)], -+MOZ_SYSTEM_OGG=1, -+MOZ_SYSTEM_OGG=) -+ -+if test -n "$MOZ_SYSTEM_OGG"; then -+ PKG_CHECK_MODULES(MOZ_OGG, ogg >= 1.3.0) -+ -+ _SAVE_LIBS=$LIBS -+ LIBS="$LIBS $MOZ_OGG_LIBS" -+ AC_CHECK_FUNC(ogg_set_mem_functions, [], -+ [AC_DEFINE(MOZ_OGG_NO_MEM_REPORTING)]) -+ LIBS=$_SAVE_LIBS -+fi -+ -+AC_SUBST(MOZ_SYSTEM_OGG) -+ -+dnl ======================================================== -+dnl Check for libvorbis -+dnl ======================================================== -+ -+MOZ_ARG_WITH_BOOL(system-vorbis, -+[ --with-system-vorbis Use system libvorbis (located with pkgconfig)], -+MOZ_SYSTEM_VORBIS=1, -+MOZ_SYSTEM_VORBIS=) -+ -+if test -n "$MOZ_SYSTEM_VORBIS"; then -+ PKG_CHECK_MODULES(MOZ_VORBIS, vorbis vorbisenc >= 1.3.5) -+fi -+ -+AC_SUBST(MOZ_SYSTEM_VORBIS) -+ -+dnl ======================================================== -+dnl Check for integer-only libvorbis aka tremor -+dnl ======================================================== -+ -+MOZ_ARG_WITH_BOOL(system-tremor, -+[ --with-system-tremor Use system libtremor (located with pkgconfig)], -+MOZ_SYSTEM_TREMOR=1, -+MOZ_SYSTEM_TREMOR=) -+ -+if test -n "$MOZ_SYSTEM_TREMOR"; then -+ PKG_CHECK_MODULES(MOZ_TREMOR, vorbisidec >= 1.2.1) -+fi -+ -+AC_SUBST(MOZ_SYSTEM_TREMOR) -+ -+dnl ======================================================== -+dnl Check for libtheora -+dnl ======================================================== -+ -+MOZ_ARG_WITH_BOOL(system-theora, -+[ --with-system-theora Use system libtheora (located with pkgconfig)], -+MOZ_SYSTEM_THEORA=1, -+MOZ_SYSTEM_THEORA=) -+ -+if test -n "$MOZ_SYSTEM_THEORA"; then -+ PKG_CHECK_MODULES(MOZ_THEORA, theora >= 1.2) -+fi -+ -+AC_SUBST(MOZ_SYSTEM_THEORA) -+ -+dnl ======================================================== -+dnl Check for libSoundTouch -+dnl ======================================================== -+ -+MOZ_ARG_WITH_BOOL(system-soundtouch, -+[ --with-system-soundtouch Use system libSoundTouch (located with pkgconfig)], -+MOZ_SYSTEM_SOUNDTOUCH=1, -+MOZ_SYSTEM_SOUNDTOUCH=) -+ -+if test -n "$MOZ_SYSTEM_SOUNDTOUCH"; then -+ PKG_CHECK_MODULES(MOZ_SOUNDTOUCH, soundtouch >= 1.9.0) -+ -+ AC_LANG_SAVE -+ AC_LANG_CPLUSPLUS -+ _SAVE_CXXFLAGS=$CXXFLAGS -+ CXXFLAGS="$CXXFLAGS $MOZ_SOUNDTOUCH_CFLAGS" -+ AC_CACHE_CHECK(for soundtouch sample type, -+ ac_cv_soundtouch_sample_type, -+ [AC_TRY_COMPILE([#include -+ #ifndef SOUNDTOUCH_INTEGER_SAMPLES -+ #error soundtouch expects float samples -+ #endif], -+ [], -+ [ac_cv_soundtouch_sample_type=short], -+ [ac_cv_soundtouch_sample_type=float])]) -+ CXXFLAGS=$_SAVE_CXXFLAGS -+ AC_LANG_RESTORE -+ -+ if test \( -n "$MOZ_SAMPLE_TYPE_S16" -a "$ac_cv_soundtouch_sample_type" != short \) \ -+ -o \( -n "$MOZ_SAMPLE_TYPE_FLOAT32" -a "$ac_cv_soundtouch_sample_type" != float \) ; then -+ AC_MSG_ERROR([SoundTouch library is built with incompatible sample type. Either rebuild the library with/without --enable-integer-samples, chase default Mozilla sample type or remove --with-system-soundtouch.]) -+ fi -+fi -+ -+if test -n "$MOZ_SYSTEM_SOUNDTOUCH"; then -+ AC_DEFINE(MOZ_SYSTEM_SOUNDTOUCH) -+fi -+AC_SUBST(MOZ_SYSTEM_SOUNDTOUCH) -+ - dnl system libvpx Support - dnl ======================================================== - MOZ_ARG_WITH_BOOL(system-libvpx, -diff --git toolkit/library/moz.build toolkit/library/moz.build -index 079a575adec3..514d901195de 100644 ---- mozilla/toolkit/library/moz.build -+++ mozilla/toolkit/library/moz.build -@@ -237,6 +237,21 @@ if CONFIG['MOZ_SYSTEM_HARFBUZZ']: - if CONFIG['MOZ_SYSTEM_HUNSPELL']: - OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS'] - -+if CONFIG['MOZ_SYSTEM_OGG']: -+ OS_LIBS += CONFIG['MOZ_OGG_LIBS'] -+ -+if CONFIG['MOZ_SYSTEM_THEORA']: -+ OS_LIBS += CONFIG['MOZ_THEORA_LIBS'] -+ -+if CONFIG['MOZ_SYSTEM_VORBIS']: -+ OS_LIBS += CONFIG['MOZ_VORBIS_LIBS'] -+ -+if CONFIG['MOZ_SYSTEM_TREMOR']: -+ OS_LIBS += CONFIG['MOZ_TREMOR_LIBS'] -+ -+if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']: -+ OS_LIBS += CONFIG['MOZ_SOUNDTOUCH_LIBS'] -+ - if CONFIG['MOZ_SYSTEM_LIBEVENT']: - OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS'] - -diff --git xpcom/build/XPCOMInit.cpp xpcom/build/XPCOMInit.cpp -index c083ab4bc4f3..62b917043a2c 100644 ---- mozilla/xpcom/build/XPCOMInit.cpp -+++ mozilla/xpcom/build/XPCOMInit.cpp -@@ -154,7 +154,9 @@ extern nsresult nsStringInputStreamConstructor(nsISupports*, REFNSIID, void**); - - #include "mozilla/ipc/GeckoChildProcessHost.h" - -+#ifndef MOZ_OGG_NO_MEM_REPORTING - #include "ogg/ogg.h" -+#endif - #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING) - #if defined(HAVE_STDINT_H) - // mozilla-config.h defines HAVE_STDINT_H, and then it's defined *again* in -@@ -664,11 +666,13 @@ NS_InitXPCOM2(nsIServiceManager** aResult, - // this oddness. - mozilla::SetICUMemoryFunctions(); - -+#ifndef MOZ_OGG_NO_MEM_REPORTING - // Do the same for libogg. - ogg_set_mem_functions(OggReporter::CountingMalloc, - OggReporter::CountingCalloc, - OggReporter::CountingRealloc, - OggReporter::CountingFree); -+#endif - - #if defined(MOZ_VPX) && !defined(MOZ_VPX_NO_MEM_REPORTING) - // And for VPX.