May 2019 - crux-commits - lists.crux.nu

ports/opt (3.5): adwaita-icon-theme: change dependency from librsvg to librsvg-compat
by crux＠crux.nu 02 May '19

02 May '19

commit 5539da98615dda74ea2f2baffb0e366a188fc558 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Mon Apr 29 23:58:19 2019 +0200 adwaita-icon-theme: change dependency from librsvg to librsvg-compat diff --git a/adwaita-icon-theme/.signature b/adwaita-icon-theme/.signature index 1bd629ad6..a69bca719 100644 --- a/adwaita-icon-theme/.signature +++ b/adwaita-icon-theme/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/YY9bKrGpdykGZ8LdBULk9EnVpjntiGUQ8Dy51bWbZQ3kZ0OPYCaYEtmhLBnikQ/AOZAZs0325Fx0M6L0N708gc= -SHA256 (Pkgfile) = fc1980eb9fa12df55e26cab52a2086c23117b42d5482d4ebb0f4a881060a595d +RWSE3ohX2g5d/fd5U9fVnWOAHQWlZDcL1r/ncGXvF95ALZbPtONS6JyW6HEp8qi7K6uOUTgw9GQ6R4tm3pTfbHp4g3qFgvv8eAQ= +SHA256 (Pkgfile) = e5ce3b39a05600ccfcfbc9ae36eaec7d64b0783f2578ef25dafb4e9c76b0c02f SHA256 (.footprint) = 60421809bad0621924db27fdcb0b077322537461ff310951349ab40da206b5ee SHA256 (adwaita-icon-theme-3.30.1.tar.xz) = 6d752a2b1bc668483956d4485c39cad1642d9358e133ff689526e43674a4e1ce diff --git a/adwaita-icon-theme/Pkgfile b/adwaita-icon-theme/Pkgfile index 2a4f6b35f..509f63143 100644 --- a/adwaita-icon-theme/Pkgfile +++ b/adwaita-icon-theme/Pkgfile @@ -1,7 +1,7 @@ # Description: Adwaita Icon Theme # URL: https://git.gnome.org/browse/adwaita-icon-theme/ # Maintainer: Fredrik Rinnestam, fredrik at rinnestam dot se -# Depends On: librsvg +# Depends On: librsvg-compat name=adwaita-icon-theme version=3.30.1

1 0

ports/opt (3.4): [notify] php: update to 7.2.18
by crux＠crux.nu 02 May '19

02 May '19

commit 1b47278e7fcf2a834a4816a69500f946103e4d01 Author: Juergen Daubert <jue(a)jue.li> Date: Thu May 2 16:27:26 2019 +0200 [notify] php: update to 7.2.18 includes security fixes, see https://www.php.net/ChangeLog-7.php#7.2.18 diff --git a/mod_php/.signature b/mod_php/.signature index c248392b7..2b85102ce 100644 --- a/mod_php/.signature +++ b/mod_php/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/ToAMqsC6n4vDgC8lxIX3hGhQym8Zhk8Hwwk1dccwW/jwHQhjG9kV1mTGp1Ca6iarPj9TYbsZXuaOJlW4arQ5gU= -SHA256 (Pkgfile) = fe0bc121910aec7ba3977b48337efd6b763e756dc14114af04b3bf2b334b15d1 +RWSE3ohX2g5d/V7lNMT1sBsov6vOmGe5/GbnTzqSEgrp4v/dvjY3/n9dAcQD22ls+pcgucb/u7yc900aAJTmrulLp9W7aIXtGgs= +SHA256 (Pkgfile) = 65ecada6f223894de981231768b598e41579769cb5cc5177f18a98fc10c1fb86 SHA256 (.footprint) = 431a1cd161b066612e0916398d648fbdb211d5fd502017fda989467c8a81f861 -SHA256 (php-7.2.17.tar.xz) = a3e5f51a9ae08813b3925bea3a4de02cd4906fcccf75646e267a213bb63bcf84 +SHA256 (php-7.2.18.tar.xz) = 9970dbb3ab1298c9e6aac54bebfa841c8ad14b18eead65594a68fa841364cb8d diff --git a/mod_php/Pkgfile b/mod_php/Pkgfile index 3e8e9f83e..2ea339202 100644 --- a/mod_php/Pkgfile +++ b/mod_php/Pkgfile @@ -4,7 +4,7 @@ # Depends on: apache name=mod_php -version=7.2.17 +version=7.2.18 release=1 source=(http://php.net/distributions/php-$version.tar.xz) diff --git a/php-fcgi/.signature b/php-fcgi/.signature index 0efc43eac..b77718cfa 100644 --- a/php-fcgi/.signature +++ b/php-fcgi/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/bnm4JwKPFYDbJ/2gWfmqxxGCiDUWYWGNj++sIyJt/h6L4gvSrsENLVl+VMqjQpzNqVmc46nK3WtvHAFMsg+/Q0= -SHA256 (Pkgfile) = 8dc3971172cef31f03f6d0b0f36f7f6a9a5cb0ff532ac86ead7ff686b26ea741 +RWSE3ohX2g5d/eNeuGbYbafwXQCvryMfqWpCKAUsvJFcUKciUGHS+RCsSCPOI95B9fz4pueaRp2AIxnJijSptBMquD+lc/SMaAc= +SHA256 (Pkgfile) = f685306f2f176601d5f09fd51e06f487341f909efd2cfb346a389179c14baf79 SHA256 (.footprint) = 073d817f449e60b58f4c904bd4ef54ddad9bd0ab946ee178956622bf76d5501b -SHA256 (php-7.2.17.tar.xz) = a3e5f51a9ae08813b3925bea3a4de02cd4906fcccf75646e267a213bb63bcf84 +SHA256 (php-7.2.18.tar.xz) = 9970dbb3ab1298c9e6aac54bebfa841c8ad14b18eead65594a68fa841364cb8d SHA256 (php-fcgi) = 058feaf2d8ad8ed61a4191512eb2151b8ed87fd92ce469ee8bab1812c0cb6471 diff --git a/php-fcgi/Pkgfile b/php-fcgi/Pkgfile index 129879657..7f8003398 100644 --- a/php-fcgi/Pkgfile +++ b/php-fcgi/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libpcre libxml2 name=php-fcgi -version=7.2.17 +version=7.2.18 release=1 source=(http://php.net/distributions/php-$version.tar.xz php-fcgi) diff --git a/php-fpm/.signature b/php-fpm/.signature index 3b7678137..2c3d0d4c8 100644 --- a/php-fpm/.signature +++ b/php-fpm/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/YG2Kw+yrAQJWBYutf5xHILVBVVW2qjqtXILIzg+VNzmlAgaOWh532MdKPwwaJRaIsS2BuNZbaawl48RCTkWNQs= -SHA256 (Pkgfile) = f2593b2ce209d679d8e3b396c6adcd32ea72bc29a2cd87b8f306e7fd8c8c2350 +RWSE3ohX2g5d/Wa/au4RqAJ67MvfkTgs0MzWjkIKE6wJnNXHyEBH6OlBU9sSIGsHi7mEO7EBMfGi2gyDVjnKBoVlJMGRRaMZegA= +SHA256 (Pkgfile) = 79e70ac6c5b2ae050c0b73e6fab8be5372a1fa924877905925dcb1edd1c78a1f SHA256 (.footprint) = a26b7d8af42742c284dd40e96fb4c4d1ba451ac9bf4f714c8f12fb6975ffa5fe -SHA256 (php-7.2.17.tar.xz) = a3e5f51a9ae08813b3925bea3a4de02cd4906fcccf75646e267a213bb63bcf84 +SHA256 (php-7.2.18.tar.xz) = 9970dbb3ab1298c9e6aac54bebfa841c8ad14b18eead65594a68fa841364cb8d SHA256 (php-fpm) = a1fde2295e819a33d492cfdeca8d4e0e8de08b8d051c95c4758ba01da38354b7 diff --git a/php-fpm/Pkgfile b/php-fpm/Pkgfile index eca0cdd89..a70b351a6 100644 --- a/php-fpm/Pkgfile +++ b/php-fpm/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libpcre libxml2 name=php-fpm -version=7.2.17 +version=7.2.18 release=1 source=(http://php.net/distributions/php-$version.tar.xz php-fpm) diff --git a/php-ftp/.signature b/php-ftp/.signature index b9d07cdd0..767936fd4 100644 --- a/php-ftp/.signature +++ b/php-ftp/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/XDSyumB+3yxaFawVXc8znm3JDpkZLzPonMbhgzGJZLUC0AmWbYE4ZsyZpd3e/OJgaxG45o1lLlDG68WA72iwAg= -SHA256 (Pkgfile) = 12b14c46db99b8a42462a80b3b4f7580fbcf96b34e3c7de57c926bf824416cc1 +RWSE3ohX2g5d/VAmpqqrx3qckz2XYFy1uyXmufu7G1aeBODKuATpoW2LXMUhHbbPBBWX+0lagaRKdt7c6rQGG1W6arGwlupM+g4= +SHA256 (Pkgfile) = 2c3eea90d573a468d9f01fafb43fe7d4b3dcf8457dc64c8f35fee68945fe8e7d SHA256 (.footprint) = 4b6e9e791f10bb007a541c6a4cfe6a189d549592939bdf3e04c5bd0f25a4bfa0 -SHA256 (php-7.2.17.tar.xz) = a3e5f51a9ae08813b3925bea3a4de02cd4906fcccf75646e267a213bb63bcf84 +SHA256 (php-7.2.18.tar.xz) = 9970dbb3ab1298c9e6aac54bebfa841c8ad14b18eead65594a68fa841364cb8d diff --git a/php-ftp/Pkgfile b/php-ftp/Pkgfile index 31b817937..7c7624654 100644 --- a/php-ftp/Pkgfile +++ b/php-ftp/Pkgfile @@ -5,7 +5,7 @@ # Depends on: name=php-ftp -version=7.2.17 +version=7.2.18 release=1 source=(http://www.php.net/distributions/php-$version.tar.xz) diff --git a/php-gd/.signature b/php-gd/.signature index a41c519ec..43a60612d 100644 --- a/php-gd/.signature +++ b/php-gd/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/f1z+tRrhLlCJ1AG+rNKXzYCqhI2qZ4ewoHN30UqKuAGpjt9Z1fYxmzWRW1NbH8BgH8U58X/23+JGtCsk+wABAs= -SHA256 (Pkgfile) = 6736ee9e8d2ed1079a529870c483af14a816b35402659798e7bbdff21e44c151 +RWSE3ohX2g5d/QiZnPhTBe7H1FMAke9nataohFFrXhKRInZM+75shv2PXZeVYaZaa/voNFEpEpKWOD8YJoOHfZS9hLqhlrVKzAc= +SHA256 (Pkgfile) = c1b46e78b425c44da32a27536fe4b06688a9a4c952d31458fd228ca6214fd6a1 SHA256 (.footprint) = 09e41333252c613bbc54155a95e91919aedf35e3fe90607f941528ac9f1a39bb -SHA256 (php-7.2.17.tar.xz) = a3e5f51a9ae08813b3925bea3a4de02cd4906fcccf75646e267a213bb63bcf84 +SHA256 (php-7.2.18.tar.xz) = 9970dbb3ab1298c9e6aac54bebfa841c8ad14b18eead65594a68fa841364cb8d diff --git a/php-gd/Pkgfile b/php-gd/Pkgfile index b854af048..49637d5fe 100644 --- a/php-gd/Pkgfile +++ b/php-gd/Pkgfile @@ -5,7 +5,7 @@ # Depends on: libgd name=php-gd -version=7.2.17 +version=7.2.18 release=1 source=(http://www.php.net/distributions/php-$version.tar.xz) diff --git a/php-gettext/.signature b/php-gettext/.signature index 793657f72..102c2cf58 100644 --- a/php-gettext/.signature +++ b/php-gettext/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/bFJnNHx0YMAW1ZW9n2am2T/aWpQAwdvyN4WKCyQEMdUtwwcHRn555PDRMIsxI+eiuZ75wFGBgmp2KsLYCn5Qwg= -SHA256 (Pkgfile) = 93459a819b73ca52406e645fa17c26baed028e9e43a1431fb9d0f6f619833e86 +RWSE3ohX2g5d/f8aXIuwVaLIFlJxr3SumeOFMUMRbtJBn/RyQaadmTVgwjfGGP7T0iXgn7OxlUDZRzjiMpBdNNM3B3mKBLxlmQc= +SHA256 (Pkgfile) = 302fb588bca4a63da19271a5ed61b1e7271056de7e6207578eeaf065b608947e SHA256 (.footprint) = f2188408bdd37cf12c2eb9ef545b934e6a10d8faf52d3b961cd6c7649bdfaf9a -SHA256 (php-7.2.17.tar.xz) = a3e5f51a9ae08813b3925bea3a4de02cd4906fcccf75646e267a213bb63bcf84 +SHA256 (php-7.2.18.tar.xz) = 9970dbb3ab1298c9e6aac54bebfa841c8ad14b18eead65594a68fa841364cb8d diff --git a/php-gettext/Pkgfile b/php-gettext/Pkgfile index 509787ccb..428d57285 100644 --- a/php-gettext/Pkgfile +++ b/php-gettext/Pkgfile @@ -5,7 +5,7 @@ # Depends on: name=php-gettext -version=7.2.17 +version=7.2.18 release=1 source=(http://www.php.net/distributions/php-$version.tar.xz) diff --git a/php-mysql/.signature b/php-mysql/.signature index 1143c2e63..8cb929d08 100644 --- a/php-mysql/.signature +++ b/php-mysql/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/bloxUoEwY5yk6KzBwQR6WdoXYIiblNDSWQSwuxK+nsQtrinhLp/8rOd9Kame1FXuCtzXsp4jPYM+8uwlwHhows= -SHA256 (Pkgfile) = 024408f124fb3776ed91c9ea4c9c0c7bc51adb25200f0b72baa8b88b720e420d +RWSE3ohX2g5d/SFNamQuSAoERQdJzKQ92aSvo8/UOurRnAuh4YlGZ1aGGAVDbxQZ4Xbeb++D7i8SxuYnIUxj4JmIl52NzhtZsAU= +SHA256 (Pkgfile) = 3f7fb9b9710030fd3160a318e08d9e881072a159073856218585b5132d25eb18 SHA256 (.footprint) = 0500f66a60a1c3d5951694c22f29e7e34a6dbc8e5a1487119ff56db1ea7cdda3 -SHA256 (php-7.2.17.tar.xz) = a3e5f51a9ae08813b3925bea3a4de02cd4906fcccf75646e267a213bb63bcf84 +SHA256 (php-7.2.18.tar.xz) = 9970dbb3ab1298c9e6aac54bebfa841c8ad14b18eead65594a68fa841364cb8d diff --git a/php-mysql/Pkgfile b/php-mysql/Pkgfile index 5b3a39647..faf97b8f6 100644 --- a/php-mysql/Pkgfile +++ b/php-mysql/Pkgfile @@ -4,7 +4,7 @@ # Depends on: mysql name=php-mysql -version=7.2.17 +version=7.2.18 release=1 source=(http://php.net/distributions/php-$version.tar.xz) diff --git a/php-sockets/.signature b/php-sockets/.signature index 8598602a0..795ff492b 100644 --- a/php-sockets/.signature +++ b/php-sockets/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/fLF+9W/vbQR2fNEHWuqL/PR5sxw8ksUdE36350uzgRm9iZBkgtKS9HL1MlrRw81oCpld24aJoc2RBMM3P5iNgM= -SHA256 (Pkgfile) = 5e3d885ada51a6f013372a867d0f19b94092fc2d35cf8b74ed95c016e70a4232 +RWSE3ohX2g5d/VlY7UWtatGGWrItT4UbVR6o34b4ZcO+wAICWYEECq84h+eJ8Z4YmfALrKPF4qBY6CcTqf+wR9/tISap1iqzYwk= +SHA256 (Pkgfile) = f1c6fcbd55a6a7fbcc5e6249360dd39143e564df61278ce377a15cab9f2b4111 SHA256 (.footprint) = 1a0e33807dcda8d11408be8b6356860cac8daea5a94d4e9a87e535fbf778f04e -SHA256 (php-7.2.17.tar.xz) = a3e5f51a9ae08813b3925bea3a4de02cd4906fcccf75646e267a213bb63bcf84 +SHA256 (php-7.2.18.tar.xz) = 9970dbb3ab1298c9e6aac54bebfa841c8ad14b18eead65594a68fa841364cb8d diff --git a/php-sockets/Pkgfile b/php-sockets/Pkgfile index 9effa9374..8a173ddd4 100644 --- a/php-sockets/Pkgfile +++ b/php-sockets/Pkgfile @@ -5,7 +5,7 @@ # Depends on: name=php-sockets -version=7.2.17 +version=7.2.18 release=1 source=(http://www.php.net/distributions/php-$version.tar.xz) diff --git a/php-sqlite3/.signature b/php-sqlite3/.signature index 52460cd3a..e844ff5a4 100644 --- a/php-sqlite3/.signature +++ b/php-sqlite3/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/REGcUmX5s2EX0ykqoii/kivOneCKDM5YbTtQ5FDw4E899ZklWv2Fd9gzEhbL7L9f6wVAptyGo+sYUp9UVdoOQs= -SHA256 (Pkgfile) = a30f5e585754b05efe5ab2d4f0e3596ab6e13ca2d00e850494ddd4ef9f800b45 +RWSE3ohX2g5d/U073qLlSFGpnmI/V/gPH+Xf6foQD/HFdSI7n9GxCtPu+T9CexhWkwQICW9qSa6zLPV+fzNIIH924PH9EhrvmAo= +SHA256 (Pkgfile) = 18ed89e5434c3304a7476e9d40df1a9923b351f1cd250a2f06d5a8f43b87cfc7 SHA256 (.footprint) = e626528b1bc2b3ce187cc979172f24c489075e0bc584aeb1d082b2f7197d6e49 -SHA256 (php-7.2.17.tar.xz) = a3e5f51a9ae08813b3925bea3a4de02cd4906fcccf75646e267a213bb63bcf84 +SHA256 (php-7.2.18.tar.xz) = 9970dbb3ab1298c9e6aac54bebfa841c8ad14b18eead65594a68fa841364cb8d diff --git a/php-sqlite3/Pkgfile b/php-sqlite3/Pkgfile index 6475195ce..eebe025f1 100644 --- a/php-sqlite3/Pkgfile +++ b/php-sqlite3/Pkgfile @@ -4,7 +4,7 @@ # Depends on: sqlite3 name=php-sqlite3 -version=7.2.17 +version=7.2.18 release=1 source=(http://php.net/distributions/php-$version.tar.xz) diff --git a/php/.signature b/php/.signature index a843d88d2..6e39f671b 100644 --- a/php/.signature +++ b/php/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/ZdoCkpSrQG15Dk9Q3a5dC2HKSzyf2IDEX6N9VMbY+xBv00zZaPgNFYZdzgDwSYuBKzd2Jj6Sufhf/tL6sriHwk= -SHA256 (Pkgfile) = 7a2dd6b4d363e1bfdcac32a19f961ecf51b49ed18fb0bc1b4796185e0cf97437 +RWSE3ohX2g5d/RPxkulRMf4dd53srgZP2xzCa0xSGj/CsfQUTqnygjkw6h9anodOLPm6PrVM+KJScnfX9ErMac7ch5DHpyw1sgU= +SHA256 (Pkgfile) = 612a21775ba2dabeed6d6832f29e3570edab829e80d21cb75d4c1801a95e9cf9 SHA256 (.footprint) = e0e2508418360d78c2172cbb92411cfb34aa98b17b7bb3ea29ef1540da5aca6c -SHA256 (php-7.2.17.tar.xz) = a3e5f51a9ae08813b3925bea3a4de02cd4906fcccf75646e267a213bb63bcf84 +SHA256 (php-7.2.18.tar.xz) = 9970dbb3ab1298c9e6aac54bebfa841c8ad14b18eead65594a68fa841364cb8d diff --git a/php/Pkgfile b/php/Pkgfile index 5ce0c5481..37e9642f7 100644 --- a/php/Pkgfile +++ b/php/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libpcre libxml2 curl db gdbm name=php -version=7.2.17 +version=7.2.18 release=1 source=(http://php.net/distributions/php-$version.tar.xz)

1 0

ports/contrib (3.4): libquicktime: fix compile
by crux＠crux.nu 02 May '19

02 May '19

commit 419a2dcb34de45772c9c1ab2bae28434387d77f1 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Thu May 2 20:47:38 2019 +1000 libquicktime: fix compile diff --git a/libquicktime/.signature b/libquicktime/.signature index 12f8351f..ef5bd74c 100644 --- a/libquicktime/.signature +++ b/libquicktime/.signature @@ -1,6 +1,9 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF381sFKfGeHNvfETGirKnm+wyorfyQKxGVDe5OW0K9JLuTfSX0FJf5HpNnzY5zGsU5FOZSmvGPqUPdBTztsfp/QM= -SHA256 (Pkgfile) = 885e6499f15d0172e9e5f5ca314c7162669bc563c82bedfc939ce90f57b67f6e +RWSagIOpLGJF31sw/zTLS4+EpnXDqaNVNVGHlm+0aAwQ0KbFpFktYs9R4eh+tdsKlkXUUdL1kFzkUwBiq+Kvh2zmqN4s9IrKkQA= +SHA256 (Pkgfile) = 586ba27e5945e755bb9235845994493d9976d9920dcdfe23f5347186358143e6 SHA256 (.footprint) = c19db413f77f309a736a9a1a40e444cf40210885243f035d4dc61a94d2a48da8 SHA256 (libquicktime-1.2.4.tar.gz) = 1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368 -SHA256 (libquicktime-1.2.4-ffmpeg3-1.patch) = 2e46f547fdf0f550857115c4e2bdcd5299c35386be253da1f7adb1aba36b64fb +SHA256 (CVE-2016-2399.patch) = 006c6be761075ca25217fe510e1ec7cfbb6262c3d758c1bd629719072ddb0935 +SHA256 (libquicktime-1.2.4-ffmpeg2.patch) = 2c7bb532ea8ac3b0e7a9a76ca6ad41127810529e7f7c2faac6f1e2f7c5c4bb93 +SHA256 (libquicktime-1.2.4-ffmpeg29.patch) = c3a8dfb6bfb69c2b54aeafe3306a8af1fff5a3a06fd05b28725d3ea7688ce2cd +SHA256 (libquicktime-1.2.4-ffmpeg4.patch) = d4582dc2ed389acd01080690a95643277e43955adcb4058132506c5b437d044f diff --git a/libquicktime/CVE-2016-2399.patch b/libquicktime/CVE-2016-2399.patch new file mode 100644 index 00000000..a1737c0d --- /dev/null +++ b/libquicktime/CVE-2016-2399.patch @@ -0,0 +1,25 @@ +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=855099 +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-2399 + +diff --git a/src/util.c b/src/util.c +index d8dc3c3..9422fc5 100644 +--- a/src/util.c ++++ b/src/util.c +@@ -340,9 +340,14 @@ int64_t quicktime_byte_position(quicktime_t *file) + + void quicktime_read_pascal(quicktime_t *file, char *data) + { +- char len = quicktime_read_char(file); +- quicktime_read_data(file, (uint8_t*)data, len); +- data[(int)len] = 0; ++ int len = quicktime_read_char(file); ++ if ((len > 0) && (len < 256)) { ++ /* data[] is expected to be 256 bytes long */ ++ quicktime_read_data(file, (uint8_t*)data, len); ++ data[len] = 0; ++ } else { ++ data[0] = 0; ++ } + } + + void quicktime_write_pascal(quicktime_t *file, char *data) diff --git a/libquicktime/Pkgfile b/libquicktime/Pkgfile index d8874e96..e024de66 100644 --- a/libquicktime/Pkgfile +++ b/libquicktime/Pkgfile @@ -1,19 +1,27 @@ # Description: A library based on quicktime4linux with extensions. # URL: http://libquicktime.sourceforge.net/ # Maintainer: Danny Rawlins, crux at romster dot me -# Packager: Younes Hafri, ycrux at club-internet dot fr -# Depends on: faac faad2 ffmpeg gtk libdv util-linux xorg-libxaw +# Depends on: faac faad2 ffmpeg gtk lame libdv libvorbis schroedinger util-linux x264 xorg-libxaw name=libquicktime version=1.2.4 -release=3 -source=(http://downloads.sourceforge.net/project/$name/$name/$version/$name-$version.tar.gz - libquicktime-1.2.4-ffmpeg3-1.patch) +release=4 +source=(https://downloads.sourceforge.net/project/$name/$name/$version/$name-$version.tar.gz + CVE-2016-2399.patch + libquicktime-1.2.4-ffmpeg2.patch + libquicktime-1.2.4-ffmpeg29.patch + libquicktime-1.2.4-ffmpeg4.patch) build() { cd $name-$version - patch -p 1 -i $SRC/libquicktime-1.2.4-ffmpeg3-1.patch + patch -p 1 -i $SRC/CVE-2016-2399.patch + patch -p 1 -i $SRC/libquicktime-1.2.4-ffmpeg2.patch + patch -p 1 -i $SRC/libquicktime-1.2.4-ffmpeg29.patch + patch -p 1 -i $SRC/libquicktime-1.2.4-ffmpeg4.patch + for FILE in lqt_ffmpeg.c video.c audio.c ; do + sed -i -e "s:CODEC_ID_:AV_&:g" "plugins/ffmpeg/${FILE}" + done ./configure \ --prefix=/usr \ diff --git a/libquicktime/libquicktime-1.2.4-ffmpeg2.patch b/libquicktime/libquicktime-1.2.4-ffmpeg2.patch new file mode 100644 index 00000000..7add4422 --- /dev/null +++ b/libquicktime/libquicktime-1.2.4-ffmpeg2.patch @@ -0,0 +1,98 @@ +Extracted from upstream CVS. +https://bugs.gentoo.org/show_bug.cgi?id=476498 + +Index: libquicktime-1.2.4/plugins/ffmpeg/audio.c +=================================================================== +--- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c ++++ libquicktime-1.2.4/plugins/ffmpeg/audio.c +@@ -45,6 +45,11 @@ + #define ENCODE_AUDIO 1 + #endif + ++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE ++/* from libavcodec/avcodec.h dated Dec 23 2012 */ ++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio ++#endif ++ + /* The following code was ported from gmerlin_avdecoder (http://gmerlin.sourceforge.net) */ + + /* MPEG Audio header parsing code */ +Index: libquicktime-1.2.4/plugins/ffmpeg/params.c +=================================================================== +--- libquicktime-1.2.4.orig/plugins/ffmpeg/params.c ++++ libquicktime-1.2.4/plugins/ffmpeg/params.c +@@ -101,6 +101,17 @@ typedef struct + } \ + } + ++#define PARAM_DICT_INT(name, dict_name) \ ++ { \ ++ if(!strcasecmp(name, key)) \ ++ { \ ++ char buf[128]; \ ++ snprintf(buf, sizeof(buf), "%d", *(int*)value); \ ++ av_dict_set(options, dict_name, buf, 0); \ ++ found = 1; \ ++ } \ ++ } ++ + #define PARAM_DICT_FLAG(name, dict_name) \ + { \ + if(!strcasecmp(name, key)) \ +@@ -202,8 +213,15 @@ void lqt_ffmpeg_set_parameter(AVCodecCon + PARAM_INT("ff_max_b_frames",max_b_frames); + PARAM_FLOAT("ff_b_quant_factor",b_quant_factor); + PARAM_INT("ff_b_frame_strategy",b_frame_strategy); ++ ++#if LIBAVCODEC_VERSION_MAJOR >= 55 ++ PARAM_DICT_INT("ff_luma_elim_threshold","luma_elim_threshold"); ++ PARAM_DICT_INT("ff_chroma_elim_threshold","chroma_elim_threshold"); ++#else + PARAM_INT("ff_luma_elim_threshold",luma_elim_threshold); + PARAM_INT("ff_chroma_elim_threshold",chroma_elim_threshold); ++#endif ++ + PARAM_INT("ff_strict_std_compliance",strict_std_compliance); + PARAM_QP2LAMBDA("ff_b_quant_offset",b_quant_offset); + PARAM_INT("ff_rc_min_rate",rc_min_rate); +@@ -241,8 +259,15 @@ void lqt_ffmpeg_set_parameter(AVCodecCon + PARAM_QP2LAMBDA("ff_lmax", lmax); + PARAM_INT("ff_noise_reduction",noise_reduction); + PARAM_INT_SCALE("ff_rc_initial_buffer_occupancy",rc_initial_buffer_occupancy,1000); ++ ++#if LIBAVCODEC_VERSION_MAJOR >= 55 ++ PARAM_DICT_INT("ff_inter_threshold","inter_threshold"); ++ PARAM_DICT_INT("ff_quantizer_noise_shaping","quantizer_noise_shaping"); ++#else + PARAM_INT("ff_inter_threshold",inter_threshold); + PARAM_INT("ff_quantizer_noise_shaping",quantizer_noise_shaping); ++#endif ++ + PARAM_INT("ff_thread_count",thread_count); + PARAM_INT("ff_me_threshold",me_threshold); + PARAM_INT("ff_mb_threshold",mb_threshold); +@@ -272,8 +297,16 @@ void lqt_ffmpeg_set_parameter(AVCodecCon + PARAM_FLAG("ff_flag_bitexact",CODEC_FLAG_BITEXACT); + PARAM_FLAG("ff_flag_ac_pred",CODEC_FLAG_AC_PRED); + // PARAM_FLAG("ff_flag_h263p_umv",CODEC_FLAG_H263P_UMV); // Unused ++ ++#if LIBAVCODEC_VERSION_MAJOR >= 55 ++ PARAM_DICT_FLAG("ff_flag_cbp_rd","cbp_rd"); ++ PARAM_DICT_FLAG("ff_flag_qp_rd","qp_rd"); ++ PARAM_DICT_FLAG("ff_flag2_strict_gop","strict_gop"); ++#else + PARAM_FLAG("ff_flag_cbp_rd",CODEC_FLAG_CBP_RD); + PARAM_FLAG("ff_flag_qp_rd",CODEC_FLAG_QP_RD); ++ PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP); ++#endif + + #if LIBAVCODEC_VERSION_MAJOR >= 54 + PARAM_DICT_FLAG("ff_flag_h263p_aiv", "aiv"); +@@ -288,7 +321,6 @@ void lqt_ffmpeg_set_parameter(AVCodecCon + PARAM_FLAG("ff_flag_loop_filter",CODEC_FLAG_LOOP_FILTER); + PARAM_FLAG("ff_flag_closed_gop",CODEC_FLAG_CLOSED_GOP); + PARAM_FLAG2("ff_flag2_fast",CODEC_FLAG2_FAST); +- PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP); + PARAM_ENUM("ff_coder_type",coder_type,coder_type); + + } diff --git a/libquicktime/libquicktime-1.2.4-ffmpeg29.patch b/libquicktime/libquicktime-1.2.4-ffmpeg29.patch new file mode 100644 index 00000000..96a323aa --- /dev/null +++ b/libquicktime/libquicktime-1.2.4-ffmpeg29.patch @@ -0,0 +1,287 @@ +Index: libquicktime-1.2.4/plugins/ffmpeg/video.c +=================================================================== +--- libquicktime-1.2.4.orig/plugins/ffmpeg/video.c ++++ libquicktime-1.2.4/plugins/ffmpeg/video.c +@@ -37,10 +37,10 @@ + #endif + + +-#ifdef PIX_FMT_YUV422P10 +-#define PIX_FMT_YUV422P10_OR_DUMMY PIX_FMT_YUV422P10 ++#ifdef AV_PIX_FMT_YUV422P10 ++#define AV_PIX_FMT_YUV422P10_OR_DUMMY AV_PIX_FMT_YUV422P10 + #else +-#define PIX_FMT_YUV422P10_OR_DUMMY -1234 ++#define AV_PIX_FMT_YUV422P10_OR_DUMMY -1234 + #endif + + #if LIBAVCODEC_VERSION_INT >= ((54<<16)|(1<<8)|0) +@@ -90,9 +90,9 @@ typedef struct + int imx_bitrate; + int imx_strip_vbi; + +- /* In some cases FFMpeg would report something like PIX_FMT_YUV422P, while +- we would like to treat it as PIX_FMT_YUVJ422P. It's only used for decoding */ +- enum PixelFormat reinterpret_pix_fmt; ++ /* In some cases FFMpeg would report something like AV_PIX_FMT_YUV422P, while ++ we would like to treat it as AV_PIX_FMT_YUVJ422P. It's only used for decoding */ ++ enum AVPixelFormat reinterpret_pix_fmt; + + int is_imx; + int y_offset; +@@ -137,42 +137,42 @@ typedef struct + + static const struct + { +- enum PixelFormat ffmpeg_id; ++ enum AVPixelFormat ffmpeg_id; + int lqt_id; + int exact; + } + colormodels[] = + { +- { PIX_FMT_YUV420P, BC_YUV420P, 1 }, ///< Planar YUV 4:2:0 (1 Cr & Cb sample per 2x2 Y samples) ++ { AV_PIX_FMT_YUV420P, BC_YUV420P, 1 }, ///< Planar YUV 4:2:0 (1 Cr & Cb sample per 2x2 Y samples) + #if LIBAVUTIL_VERSION_INT < (50<<16) +- { PIX_FMT_YUV422, BC_YUV422, 1 }, ++ { AV_PIX_FMT_YUV422, BC_YUV422, 1 }, + #else +- { PIX_FMT_YUYV422, BC_YUV422, 1 }, ++ { AV_PIX_FMT_YUYV422, BC_YUV422, 1 }, + #endif +- { PIX_FMT_RGB24, BC_RGB888, 1 }, ///< Packed pixel, 3 bytes per pixel, RGBRGB... +- { PIX_FMT_BGR24, BC_BGR888, 1 }, ///< Packed pixel, 3 bytes per pixel, BGRBGR... +- { PIX_FMT_YUV422P, BC_YUV422P, 1 }, ///< Planar YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) +- { PIX_FMT_YUV444P, BC_YUV444P, 1 }, ///< Planar YUV 4:4:4 (1 Cr & Cb sample per 1x1 Y samples) +- { PIX_FMT_YUV411P, BC_YUV411P, 1 }, ///< Planar YUV 4:1:1 (1 Cr & Cb sample per 4x1 Y samples) +- { PIX_FMT_YUV422P16, BC_YUV422P16, 1 }, ///< Planar 16 bit YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) +-#ifdef PIX_FMT_YUV422P10 +- { PIX_FMT_YUV422P10, BC_YUV422P10, 1 }, ///< 10 bit samples in uint16_t containers, planar 4:2:2 +-#endif +- { PIX_FMT_RGB565, BC_RGB565, 1 }, ///< always stored in cpu endianness +- { PIX_FMT_YUVJ420P, BC_YUVJ420P, 1 }, ///< Planar YUV 4:2:0 full scale (jpeg) +- { PIX_FMT_YUVJ422P, BC_YUVJ422P, 1 }, ///< Planar YUV 4:2:2 full scale (jpeg) +- { PIX_FMT_YUVJ444P, BC_YUVJ444P, 1 }, ///< Planar YUV 4:4:4 full scale (jpeg) ++ { AV_PIX_FMT_RGB24, BC_RGB888, 1 }, ///< Packed pixel, 3 bytes per pixel, RGBRGB... ++ { AV_PIX_FMT_BGR24, BC_BGR888, 1 }, ///< Packed pixel, 3 bytes per pixel, BGRBGR... ++ { AV_PIX_FMT_YUV422P, BC_YUV422P, 1 }, ///< Planar YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) ++ { AV_PIX_FMT_YUV444P, BC_YUV444P, 1 }, ///< Planar YUV 4:4:4 (1 Cr & Cb sample per 1x1 Y samples) ++ { AV_PIX_FMT_YUV411P, BC_YUV411P, 1 }, ///< Planar YUV 4:1:1 (1 Cr & Cb sample per 4x1 Y samples) ++ { AV_PIX_FMT_YUV422P16, BC_YUV422P16, 1 }, ///< Planar 16 bit YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) ++#ifdef AV_PIX_FMT_YUV422P10 ++ { AV_PIX_FMT_YUV422P10, BC_YUV422P10, 1 }, ///< 10 bit samples in uint16_t containers, planar 4:2:2 ++#endif ++ { AV_PIX_FMT_RGB565, BC_RGB565, 1 }, ///< always stored in cpu endianness ++ { AV_PIX_FMT_YUVJ420P, BC_YUVJ420P, 1 }, ///< Planar YUV 4:2:0 full scale (jpeg) ++ { AV_PIX_FMT_YUVJ422P, BC_YUVJ422P, 1 }, ///< Planar YUV 4:2:2 full scale (jpeg) ++ { AV_PIX_FMT_YUVJ444P, BC_YUVJ444P, 1 }, ///< Planar YUV 4:4:4 full scale (jpeg) + #if LIBAVUTIL_VERSION_INT < (50<<16) +- { PIX_FMT_RGBA32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... ++ { AV_PIX_FMT_RGBA32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... + #else +- { PIX_FMT_RGB32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... ++ { AV_PIX_FMT_RGB32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... + #endif +- { PIX_FMT_RGB555, BC_RGB888, 0 }, ///< always stored in cpu endianness, most significant bit to 1 +- { PIX_FMT_GRAY8, BC_RGB888, 0 }, +- { PIX_FMT_MONOWHITE, BC_RGB888, 0 }, ///< 0 is white +- { PIX_FMT_MONOBLACK, BC_RGB888, 0 }, ///< 0 is black +- { PIX_FMT_PAL8, BC_RGB888, 0 }, ///< 8 bit with RGBA palette +- { PIX_FMT_YUV410P, BC_YUV420P, 0 }, ///< Planar YUV 4:1:0 (1 Cr & Cb sample per 4x4 Y samples) ++ { AV_PIX_FMT_RGB555, BC_RGB888, 0 }, ///< always stored in cpu endianness, most significant bit to 1 ++ { AV_PIX_FMT_GRAY8, BC_RGB888, 0 }, ++ { AV_PIX_FMT_MONOWHITE, BC_RGB888, 0 }, ///< 0 is white ++ { AV_PIX_FMT_MONOBLACK, BC_RGB888, 0 }, ///< 0 is black ++ { AV_PIX_FMT_PAL8, BC_RGB888, 0 }, ///< 8 bit with RGBA palette ++ { AV_PIX_FMT_YUV410P, BC_YUV420P, 0 }, ///< Planar YUV 4:1:0 (1 Cr & Cb sample per 4x4 Y samples) + }; + + static const struct +@@ -343,16 +343,16 @@ static int lqt_tenbit_dnxhd_supported(AV + if (!codec->pix_fmts) + return 0; + +- for (i = 0; codec->pix_fmts[i] != PIX_FMT_NONE; ++i) ++ for (i = 0; codec->pix_fmts[i] != AV_PIX_FMT_NONE; ++i) + { +- if (codec->pix_fmts[i] == PIX_FMT_YUV422P10_OR_DUMMY) ++ if (codec->pix_fmts[i] == AV_PIX_FMT_YUV422P10_OR_DUMMY) + return 1; + } + + return 0; + } + +-static enum PixelFormat lqt_ffmpeg_get_ffmpeg_colormodel(int id) ++static enum AVPixelFormat lqt_ffmpeg_get_ffmpeg_colormodel(int id) + { + int i; + +@@ -361,10 +361,10 @@ static enum PixelFormat lqt_ffmpeg_get_f + if(colormodels[i].lqt_id == id) + return colormodels[i].ffmpeg_id; + } +- return PIX_FMT_NB; ++ return AV_PIX_FMT_NB; + } + +-static int lqt_ffmpeg_get_lqt_colormodel(enum PixelFormat id, int * exact) ++static int lqt_ffmpeg_get_lqt_colormodel(enum AVPixelFormat id, int * exact) + { + int i; + +@@ -402,24 +402,24 @@ static void lqt_ffmpeg_setup_decoding_co + /* First we try codec-specific colormodel matching. */ + if(codec->decoder->id == AV_CODEC_ID_DNXHD) + { +- /* FFMpeg supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 for DNxHD, which +- we sometimes interpret as PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10. */ +- if (codec->avctx->pix_fmt == PIX_FMT_YUV422P || codec->avctx->pix_fmt == PIX_FMT_YUV422P10_OR_DUMMY) ++ /* FFMpeg supports AV_PIX_FMT_YUV422P and AV_PIX_FMT_YUV422P10 for DNxHD, which ++ we sometimes interpret as AV_PIX_FMT_YUVJ422P and AV_PIX_FMT_YUVJ422P10. */ ++ if (codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P || codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P10_OR_DUMMY) + { +- int p10 = (codec->avctx->pix_fmt == PIX_FMT_YUV422P10_OR_DUMMY); ++ int p10 = (codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P10_OR_DUMMY); + *exact = 1; + if (lqt_ffmpeg_get_avid_yuv_range(vtrack->track) == AVID_FULL_YUV_RANGE) + { + vtrack->stream_cmodel = p10 ? BC_YUVJ422P10 : BC_YUVJ422P; +- codec->reinterpret_pix_fmt = p10 ? PIX_FMT_YUV422P10_OR_DUMMY : PIX_FMT_YUVJ422P; +- // Note: reinterpret_pix_fmt should really be PIX_FMT_YUVJ422P10, except ++ codec->reinterpret_pix_fmt = p10 ? AV_PIX_FMT_YUV422P10_OR_DUMMY : AV_PIX_FMT_YUVJ422P; ++ // Note: reinterpret_pix_fmt should really be AV_PIX_FMT_YUVJ422P10, except + // there is no such colormodel in FFMpeg. Fortunately, it's not a problem + // in this case, as reinterpret_pix_fmt is only used when *exact == 0. + } + else + { + vtrack->stream_cmodel = p10 ? BC_YUV422P10 : BC_YUV422P; +- codec->reinterpret_pix_fmt = p10 ? PIX_FMT_YUV422P10_OR_DUMMY : PIX_FMT_YUV422P; ++ codec->reinterpret_pix_fmt = p10 ? AV_PIX_FMT_YUV422P10_OR_DUMMY : AV_PIX_FMT_YUV422P; + } + return; + } +@@ -440,14 +440,14 @@ static void lqt_ffmpeg_setup_encoding_co + + if (codec->encoder->id == AV_CODEC_ID_DNXHD) + { +- /* FFMpeg's DNxHD encoder only supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 +- and doesn't know anything about PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10 ++ /* FFMpeg's DNxHD encoder only supports AV_PIX_FMT_YUV422P and AV_PIX_FMT_YUV422P10 ++ and doesn't know anything about AV_PIX_FMT_YUVJ422P and AV_PIX_FMT_YUVJ422P10 + (in fact, the latter doesn't even exist) */ +- codec->avctx->pix_fmt = PIX_FMT_YUV422P; ++ codec->avctx->pix_fmt = AV_PIX_FMT_YUV422P; + if (vtrack->stream_cmodel == BC_YUV422P10 || vtrack->stream_cmodel == BC_YUVJ422P10) + { + if (lqt_tenbit_dnxhd_supported(codec->encoder)) +- codec->avctx->pix_fmt = PIX_FMT_YUV422P10_OR_DUMMY; ++ codec->avctx->pix_fmt = AV_PIX_FMT_YUV422P10_OR_DUMMY; + } + } + } +@@ -458,7 +458,7 @@ static void lqt_ffmpeg_setup_encoding_co + /* From avcodec.h: */ + + /* +- * PIX_FMT_RGBA32 is handled in an endian-specific manner. A RGBA ++ * AV_PIX_FMT_RGBA32 is handled in an endian-specific manner. A RGBA + * color is put together as: + * (A << 24) | (R << 16) | (G << 8) | B + * This is stored as BGRA on little endian CPU architectures and ARGB on +@@ -530,7 +530,7 @@ static void convert_rgba_to_argb(uint8_t + */ + + static void convert_image_decode(quicktime_ffmpeg_video_codec_t *codec, +- AVFrame * in_frame, enum PixelFormat in_format, ++ AVFrame * in_frame, enum AVPixelFormat in_format, + unsigned char ** out_frame, int out_format, + int width, int height, int row_span, int row_span_uv) + { +@@ -547,9 +547,9 @@ static void convert_image_decode(quickti + * RGBA format like in ffmpeg?? + */ + #if LIBAVUTIL_VERSION_INT < (50<<16) +- if((in_format == PIX_FMT_RGBA32) && (out_format == BC_RGBA8888)) ++ if((in_format == AV_PIX_FMT_RGBA32) && (out_format == BC_RGBA8888)) + #else +- if((in_format == PIX_FMT_RGB32) && (out_format == BC_RGBA8888)) ++ if((in_format == AV_PIX_FMT_RGB32) && (out_format == BC_RGBA8888)) + #endif + { + convert_image_decode_rgba(in_frame, out_frame, width, height, codec->y_offset); +@@ -829,7 +829,7 @@ static int lqt_ffmpeg_decode_video(quick + if(avcodec_open2(codec->avctx, codec->decoder, NULL) != 0) + return -1; + #endif +- codec->frame = avcodec_alloc_frame(); ++ codec->frame = av_frame_alloc(); + vtrack->stream_cmodel = LQT_COLORMODEL_NONE; + codec->initialized = 1; + } +@@ -929,10 +929,10 @@ static int lqt_ffmpeg_decode_video(quick + #ifdef HAVE_LIBSWSCALE + + #if LIBAVUTIL_VERSION_INT < (50<<16) +- if(!((codec->avctx->pix_fmt == PIX_FMT_RGBA32) && ++ if(!((codec->avctx->pix_fmt == AV_PIX_FMT_RGBA32) && + (vtrack->stream_cmodel == BC_RGBA8888))) + #else +- if(!((codec->avctx->pix_fmt == PIX_FMT_RGB32) && ++ if(!((codec->avctx->pix_fmt == AV_PIX_FMT_RGB32) && + (vtrack->stream_cmodel == BC_RGBA8888))) + #endif + { +@@ -1318,7 +1318,7 @@ static int lqt_ffmpeg_encode_video(quick + + if(!codec->initialized) + { +- codec->frame = avcodec_alloc_frame(); ++ codec->frame = av_frame_alloc(); + + /* time_base is 1/framerate for constant framerate */ + +@@ -1396,9 +1396,9 @@ static int lqt_ffmpeg_encode_video(quick + if(vtrack->stream_cmodel == BC_RGBA8888) + { + /* Libquicktime doesn't natively support a color model equivalent +- to PIX_FMT_ARGB, which is required for QTRLE with alpha channel. ++ to AV_PIX_FMT_ARGB, which is required for QTRLE with alpha channel. + So, we use BC_RGBA8888 and do ad hoc conversion below. */ +- codec->avctx->pix_fmt = PIX_FMT_ARGB; ++ codec->avctx->pix_fmt = AV_PIX_FMT_ARGB; + vtrack->track->mdia.minf.stbl.stsd.table[0].depth = 32; + } + } +@@ -1467,7 +1467,7 @@ static int lqt_ffmpeg_encode_video(quick + } + // codec->lqt_colormodel = ffmepg_2_lqt(codec->com.ffcodec_enc); + +- if(codec->y_offset != 0 || codec->avctx->pix_fmt == PIX_FMT_ARGB) ++ if(codec->y_offset != 0 || codec->avctx->pix_fmt == AV_PIX_FMT_ARGB) + { + if(!codec->tmp_rows) + { +@@ -1492,7 +1492,7 @@ static int lqt_ffmpeg_encode_video(quick + vtrack->stream_cmodel, + 0, 0, 0, codec->y_offset); + } +- else if(codec->avctx->pix_fmt == PIX_FMT_ARGB) ++ else if(codec->avctx->pix_fmt == AV_PIX_FMT_ARGB) + { + convert_rgba_to_argb(row_pointers[0], vtrack->stream_row_span, + codec->tmp_rows[0], codec->tmp_row_span, +Index: libquicktime-1.2.4/plugins/ffmpeg/audio.c +=================================================================== +--- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c ++++ libquicktime-1.2.4/plugins/ffmpeg/audio.c +@@ -1266,7 +1266,7 @@ static int lqt_ffmpeg_encode_audio(quick + pkt.data = codec->chunk_buffer; + pkt.size = codec->chunk_buffer_alloc; + +- avcodec_get_frame_defaults(&f); ++ av_frame_unref(&f); + f.nb_samples = codec->avctx->frame_size; + + avcodec_fill_audio_frame(&f, channels, codec->avctx->sample_fmt, diff --git a/libquicktime/libquicktime-1.2.4-ffmpeg3-1.patch b/libquicktime/libquicktime-1.2.4-ffmpeg3-1.patch deleted file mode 100644 index 81c76ab9..00000000 --- a/libquicktime/libquicktime-1.2.4-ffmpeg3-1.patch +++ /dev/null @@ -1,1014 +0,0 @@ -Submitted By: Armin K. <krejzi at mail dot com> -Date: 2016-05-04 -Initial Package Version: 1.2.4 -Upstream Status: Fixed -Origin: Gentoo and Debian -Description: Fixes building against FFmpeg version >= 3.0.0 - ---- a/plugins/ffmpeg/audio.c 2012-03-29 21:44:28.000000000 +0200 -+++ b/plugins/ffmpeg/audio.c 2016-02-15 16:17:09.977415405 +0100 -@@ -45,6 +45,11 @@ - #define ENCODE_AUDIO 1 - #endif - -+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE -+/* from libavcodec/avcodec.h dated Dec 23 2012 */ -+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio -+#endif -+ - /* The following code was ported from gmerlin_avdecoder (http://gmerlin.sourceforge.net) */ - - /* MPEG Audio header parsing code */ -@@ -626,7 +631,7 @@ - { - /* If the codec is mp3, make sure to decode the very last frame */ - -- if((codec->avctx->codec_id == CODEC_ID_MP3) && -+ if((codec->avctx->codec_id == AV_CODEC_ID_MP3) && - (codec->bytes_in_chunk_buffer >= 4)) - { - if(!mpa_decode_header(&mph, codec->chunk_buffer, (const mpa_header*)0)) -@@ -695,7 +700,7 @@ - - /* Some really broken mp3 files have the header bytes split across 2 chunks */ - -- if(codec->avctx->codec_id == CODEC_ID_MP3) -+ if(codec->avctx->codec_id == AV_CODEC_ID_MP3) - { - if(codec->bytes_in_chunk_buffer < 4) - { -@@ -806,7 +811,7 @@ - - if(bytes_decoded < 0) - { -- if(codec->avctx->codec_id == CODEC_ID_MP3) -+ if(codec->avctx->codec_id == AV_CODEC_ID_MP3) - { - /* For mp3, bytes_decoded < 0 means, that the frame should be muted */ - memset(&codec->sample_buffer[track_map->channels * (codec->sample_buffer_end - -@@ -866,8 +871,8 @@ - quicktime_audio_map_t *track_map = &file->atracks[track]; - quicktime_ffmpeg_audio_codec_t *codec = track_map->codec->priv; - -- if((codec->decoder->id == CODEC_ID_MP2) || -- (codec->decoder->id == CODEC_ID_MP3)) -+ if((codec->decoder->id == AV_CODEC_ID_MP2) || -+ (codec->decoder->id == AV_CODEC_ID_MP3)) - { - mpa_header h; - uint32_t header; -@@ -909,7 +914,7 @@ - else - track_map->ci.bitrate = h.bitrate; - } -- else if(codec->decoder->id == CODEC_ID_AC3) -+ else if(codec->decoder->id == AV_CODEC_ID_AC3) - { - a52_header h; - uint8_t * ptr; -@@ -986,7 +991,7 @@ - #endif - /* Some codecs need extra stuff */ - -- if(codec->decoder->id == CODEC_ID_ALAC) -+ if(codec->decoder->id == AV_CODEC_ID_ALAC) - { - header = quicktime_wave_get_user_atom(track_map->track, "alac", &header_len); - if(header) -@@ -995,7 +1000,7 @@ - codec->avctx->extradata_size = header_len; - } - } -- if(codec->decoder->id == CODEC_ID_QDM2) -+ if(codec->decoder->id == AV_CODEC_ID_QDM2) - { - header = quicktime_wave_get_user_atom(track_map->track, "QDCA", &header_len); - if(header) -@@ -1261,7 +1266,7 @@ - pkt.data = codec->chunk_buffer; - pkt.size = codec->chunk_buffer_alloc; - -- avcodec_get_frame_defaults(&f); -+ av_frame_unref(&f); - f.nb_samples = codec->avctx->frame_size; - - avcodec_fill_audio_frame(&f, channels, codec->avctx->sample_fmt, -@@ -1495,9 +1500,9 @@ - codec_base->decode_audio = lqt_ffmpeg_decode_audio; - codec_base->set_parameter = set_parameter; - -- if((decoder->id == CODEC_ID_MP3) || (decoder->id == CODEC_ID_MP2)) -+ if((decoder->id == AV_CODEC_ID_MP3) || (decoder->id == AV_CODEC_ID_MP2)) - codec_base->read_packet = read_packet_mpa; -- else if(decoder->id == CODEC_ID_AC3) -+ else if(decoder->id == AV_CODEC_ID_AC3) - { - codec_base->write_packet = write_packet_ac3; - codec_base->read_packet = read_packet_ac3; ---- a/plugins/ffmpeg/ffmpeg.h 2012-02-15 20:48:30.000000000 +0100 -+++ b/plugins/ffmpeg/ffmpeg.h 2016-02-15 16:15:08.114897089 +0100 -@@ -27,6 +27,7 @@ - - #include <quicktime/qtprivate.h> - #include AVCODEC_HEADER -+#include <libavutil/mem.h> - - void quicktime_init_video_codec_ffmpeg(quicktime_codec_t * codec, - quicktime_video_map_t *vtrack, ---- a/plugins/ffmpeg/lqt_ffmpeg.c 2012-02-15 20:48:30.000000000 +0100 -+++ b/plugins/ffmpeg/lqt_ffmpeg.c 2016-02-15 16:17:09.973415323 +0100 -@@ -386,7 +386,7 @@ - struct CODECIDMAP codecidmap_v[] = - { - { -- .id = CODEC_ID_MPEG1VIDEO, -+ .id = AV_CODEC_ID_MPEG1VIDEO, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -397,7 +397,7 @@ - .wav_ids = { LQT_WAV_ID_NONE } - }, - { -- .id = CODEC_ID_MPEG4, -+ .id = AV_CODEC_ID_MPEG4, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -415,7 +415,7 @@ - .compression_id = LQT_COMPRESSION_MPEG4_ASP, - }, - { -- .id = CODEC_ID_MSMPEG4V1, -+ .id = AV_CODEC_ID_MSMPEG4V1, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -426,7 +426,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_MSMPEG4V2, -+ .id = AV_CODEC_ID_MSMPEG4V2, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -437,7 +437,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_MSMPEG4V3, -+ .id = AV_CODEC_ID_MSMPEG4V3, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -453,7 +453,7 @@ - .do_encode = 1, - }, - { -- .id = CODEC_ID_MSMPEG4V3, -+ .id = AV_CODEC_ID_MSMPEG4V3, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -468,7 +468,7 @@ - }, - #if 0 - { -- .id = CODEC_ID_WMV1, -+ .id = AV_CODEC_ID_WMV1, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -481,7 +481,7 @@ - }, - #endif - { -- .id = CODEC_ID_H263, -+ .id = AV_CODEC_ID_H263, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -493,7 +493,7 @@ - .compatibility_flags = LQT_FILE_QT_OLD | LQT_FILE_QT | LQT_FILE_MP4 | LQT_FILE_3GP, - }, - { -- .id = CODEC_ID_H263, -+ .id = AV_CODEC_ID_H263, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -508,7 +508,7 @@ - .do_encode = 1, - }, - { -- .id = CODEC_ID_H264, -+ .id = AV_CODEC_ID_H264, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -519,7 +519,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_H263P, -+ .id = AV_CODEC_ID_H263P, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -533,7 +533,7 @@ - .do_encode = 1, - }, - { -- .id = CODEC_ID_H263I, -+ .id = AV_CODEC_ID_H263I, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -544,7 +544,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_SVQ1, -+ .id = AV_CODEC_ID_SVQ1, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -555,7 +555,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_SVQ3, -+ .id = AV_CODEC_ID_SVQ3, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -566,7 +566,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_MJPEG, -+ .id = AV_CODEC_ID_MJPEG, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -580,7 +580,7 @@ - .do_encode = 1, - }, - { -- .id = CODEC_ID_MJPEGB, -+ .id = AV_CODEC_ID_MJPEGB, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -594,7 +594,7 @@ - }, - #if LIBAVCODEC_BUILD >= 3346688 - { -- .id = CODEC_ID_TARGA, -+ .id = AV_CODEC_ID_TARGA, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -606,7 +606,7 @@ - #endif - #if LIBAVCODEC_BUILD >= 3347456 - { -- .id = CODEC_ID_TIFF, -+ .id = AV_CODEC_ID_TIFF, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -617,7 +617,7 @@ - }, - #endif - { -- .id = CODEC_ID_8BPS, -+ .id = AV_CODEC_ID_8BPS, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -627,7 +627,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_INDEO3, -+ .id = AV_CODEC_ID_INDEO3, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -638,7 +638,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_RPZA, -+ .id = AV_CODEC_ID_RPZA, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -648,7 +648,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_SMC, -+ .id = AV_CODEC_ID_SMC, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -658,7 +658,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_CINEPAK, -+ .id = AV_CODEC_ID_CINEPAK, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -669,7 +669,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_CYUV, -+ .id = AV_CODEC_ID_CYUV, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -680,7 +680,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_QTRLE, -+ .id = AV_CODEC_ID_QTRLE, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -693,7 +693,7 @@ - .encoding_colormodels = (int[]){ BC_RGB888, BC_RGBA8888, LQT_COLORMODEL_NONE }, - }, - { -- .id = CODEC_ID_MSRLE, -+ .id = AV_CODEC_ID_MSRLE, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -703,7 +703,7 @@ - .wav_ids = { LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_DVVIDEO, -+ .id = AV_CODEC_ID_DVVIDEO, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -719,7 +719,7 @@ - .image_sizes = image_sizes_dv, - }, - { -- .id = CODEC_ID_DVVIDEO, -+ .id = AV_CODEC_ID_DVVIDEO, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -735,7 +735,7 @@ - .image_sizes = image_sizes_dv, - }, - { -- .id = CODEC_ID_DVVIDEO, -+ .id = AV_CODEC_ID_DVVIDEO, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -751,7 +751,7 @@ - }, - /* DVCPRO HD (decoding only for now) */ - { -- .id = CODEC_ID_DVVIDEO, -+ .id = AV_CODEC_ID_DVVIDEO, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -772,7 +772,7 @@ - // .do_encode = 1 - }, - { -- .id = CODEC_ID_FFVHUFF, -+ .id = AV_CODEC_ID_FFVHUFF, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -785,7 +785,7 @@ - .do_encode = 1 - }, - { -- .id = CODEC_ID_FFV1, -+ .id = AV_CODEC_ID_FFV1, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -801,7 +801,7 @@ - }, - #if LIBAVCODEC_BUILD >= 3352576 - { -- .id = CODEC_ID_DNXHD, -+ .id = AV_CODEC_ID_DNXHD, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -817,7 +817,7 @@ - }, - #endif - { -- .id = CODEC_ID_MPEG2VIDEO, -+ .id = AV_CODEC_ID_MPEG2VIDEO, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -839,7 +839,7 @@ - struct CODECIDMAP codecidmap_a[] = - { - { -- .id = CODEC_ID_MP3, -+ .id = AV_CODEC_ID_MP3, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -851,7 +851,7 @@ - .wav_ids = { 0x50, 0x55, LQT_WAV_ID_NONE }, - }, - { -- .id = CODEC_ID_MP2, -+ .id = AV_CODEC_ID_MP2, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -866,7 +866,7 @@ - .compression_id = LQT_COMPRESSION_MP2, - }, - { -- .id = CODEC_ID_AC3, -+ .id = AV_CODEC_ID_AC3, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -881,7 +881,7 @@ - .compression_id = LQT_COMPRESSION_AC3, - }, - { -- .id = CODEC_ID_QDM2, -+ .id = AV_CODEC_ID_QDM2, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -896,7 +896,7 @@ - #if 1 - /* Doesn't work as long as audio chunks are not split into VBR "Samples" */ - { -- .id = CODEC_ID_ALAC, -+ .id = AV_CODEC_ID_ALAC, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -909,7 +909,7 @@ - #if 1 - /* Sounds ugly */ - { -- .id = CODEC_ID_ADPCM_MS, -+ .id = AV_CODEC_ID_ADPCM_MS, - .index = -1, - .encoder = NULL, - .decoder = NULL, -@@ -922,7 +922,7 @@ - #if 1 - /* Sounds ugly */ - { -- .id = CODEC_ID_ADPCM_IMA_WAV, -+ .id = AV_CODEC_ID_ADPCM_IMA_WAV, - .index = -1, - .encoder = NULL, - .decoder = NULL, ---- a/plugins/ffmpeg/params.c 2012-03-07 15:10:41.000000000 +0100 -+++ b/plugins/ffmpeg/params.c 2016-02-15 16:15:08.114897089 +0100 -@@ -101,6 +101,17 @@ - } \ - } - -+#define PARAM_DICT_INT(name, dict_name) \ -+ { \ -+ if(!strcasecmp(name, key)) \ -+ { \ -+ char buf[128]; \ -+ snprintf(buf, sizeof(buf), "%d", *(int*)value); \ -+ av_dict_set(options, dict_name, buf, 0); \ -+ found = 1; \ -+ } \ -+ } -+ - #define PARAM_DICT_FLAG(name, dict_name) \ - { \ - if(!strcasecmp(name, key)) \ -@@ -202,8 +213,15 @@ - PARAM_INT("ff_max_b_frames",max_b_frames); - PARAM_FLOAT("ff_b_quant_factor",b_quant_factor); - PARAM_INT("ff_b_frame_strategy",b_frame_strategy); -+ -+#if LIBAVCODEC_VERSION_MAJOR >= 55 -+ PARAM_DICT_INT("ff_luma_elim_threshold","luma_elim_threshold"); -+ PARAM_DICT_INT("ff_chroma_elim_threshold","chroma_elim_threshold"); -+#else - PARAM_INT("ff_luma_elim_threshold",luma_elim_threshold); - PARAM_INT("ff_chroma_elim_threshold",chroma_elim_threshold); -+#endif -+ - PARAM_INT("ff_strict_std_compliance",strict_std_compliance); - PARAM_QP2LAMBDA("ff_b_quant_offset",b_quant_offset); - PARAM_INT("ff_rc_min_rate",rc_min_rate); -@@ -241,8 +259,15 @@ - PARAM_QP2LAMBDA("ff_lmax", lmax); - PARAM_INT("ff_noise_reduction",noise_reduction); - PARAM_INT_SCALE("ff_rc_initial_buffer_occupancy",rc_initial_buffer_occupancy,1000); -+ -+#if LIBAVCODEC_VERSION_MAJOR >= 55 -+ PARAM_DICT_INT("ff_inter_threshold","inter_threshold"); -+ PARAM_DICT_INT("ff_quantizer_noise_shaping","quantizer_noise_shaping"); -+#else - PARAM_INT("ff_inter_threshold",inter_threshold); - PARAM_INT("ff_quantizer_noise_shaping",quantizer_noise_shaping); -+#endif -+ - PARAM_INT("ff_thread_count",thread_count); - PARAM_INT("ff_me_threshold",me_threshold); - PARAM_INT("ff_mb_threshold",mb_threshold); -@@ -272,8 +297,16 @@ - PARAM_FLAG("ff_flag_bitexact",CODEC_FLAG_BITEXACT); - PARAM_FLAG("ff_flag_ac_pred",CODEC_FLAG_AC_PRED); - // PARAM_FLAG("ff_flag_h263p_umv",CODEC_FLAG_H263P_UMV); // Unused -+ -+#if LIBAVCODEC_VERSION_MAJOR >= 55 -+ PARAM_DICT_FLAG("ff_flag_cbp_rd","cbp_rd"); -+ PARAM_DICT_FLAG("ff_flag_qp_rd","qp_rd"); -+ PARAM_DICT_FLAG("ff_flag2_strict_gop","strict_gop"); -+#else - PARAM_FLAG("ff_flag_cbp_rd",CODEC_FLAG_CBP_RD); - PARAM_FLAG("ff_flag_qp_rd",CODEC_FLAG_QP_RD); -+ PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP); -+#endif - - #if LIBAVCODEC_VERSION_MAJOR >= 54 - PARAM_DICT_FLAG("ff_flag_h263p_aiv", "aiv"); -@@ -288,7 +321,6 @@ - PARAM_FLAG("ff_flag_loop_filter",CODEC_FLAG_LOOP_FILTER); - PARAM_FLAG("ff_flag_closed_gop",CODEC_FLAG_CLOSED_GOP); - PARAM_FLAG2("ff_flag2_fast",CODEC_FLAG2_FAST); -- PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP); - PARAM_ENUM("ff_coder_type",coder_type,coder_type); - - } ---- a/plugins/ffmpeg/video.c 2012-02-25 20:46:56.000000000 +0100 -+++ b/plugins/ffmpeg/video.c 2016-02-15 16:17:09.982415507 +0100 -@@ -37,10 +37,10 @@ - #endif - - --#ifdef PIX_FMT_YUV422P10 --#define PIX_FMT_YUV422P10_OR_DUMMY PIX_FMT_YUV422P10 -+#ifdef AV_PIX_FMT_YUV422P10 -+#define AV_PIX_FMT_YUV422P10_OR_DUMMY AV_PIX_FMT_YUV422P10 - #else --#define PIX_FMT_YUV422P10_OR_DUMMY -1234 -+#define AV_PIX_FMT_YUV422P10_OR_DUMMY -1234 - #endif - - #if LIBAVCODEC_VERSION_INT >= ((54<<16)|(1<<8)|0) -@@ -90,9 +90,9 @@ - int imx_bitrate; - int imx_strip_vbi; - -- /* In some cases FFMpeg would report something like PIX_FMT_YUV422P, while -- we would like to treat it as PIX_FMT_YUVJ422P. It's only used for decoding */ -- enum PixelFormat reinterpret_pix_fmt; -+ /* In some cases FFMpeg would report something like AV_PIX_FMT_YUV422P, while -+ we would like to treat it as AV_PIX_FMT_YUVJ422P. It's only used for decoding */ -+ enum AVPixelFormat reinterpret_pix_fmt; - - int is_imx; - int y_offset; -@@ -137,42 +137,42 @@ - - static const struct - { -- enum PixelFormat ffmpeg_id; -+ enum AVPixelFormat ffmpeg_id; - int lqt_id; - int exact; - } - colormodels[] = - { -- { PIX_FMT_YUV420P, BC_YUV420P, 1 }, ///< Planar YUV 4:2:0 (1 Cr & Cb sample per 2x2 Y samples) -+ { AV_PIX_FMT_YUV420P, BC_YUV420P, 1 }, ///< Planar YUV 4:2:0 (1 Cr & Cb sample per 2x2 Y samples) - #if LIBAVUTIL_VERSION_INT < (50<<16) -- { PIX_FMT_YUV422, BC_YUV422, 1 }, -+ { AV_PIX_FMT_YUV422, BC_YUV422, 1 }, - #else -- { PIX_FMT_YUYV422, BC_YUV422, 1 }, -+ { AV_PIX_FMT_YUYV422, BC_YUV422, 1 }, - #endif -- { PIX_FMT_RGB24, BC_RGB888, 1 }, ///< Packed pixel, 3 bytes per pixel, RGBRGB... -- { PIX_FMT_BGR24, BC_BGR888, 1 }, ///< Packed pixel, 3 bytes per pixel, BGRBGR... -- { PIX_FMT_YUV422P, BC_YUV422P, 1 }, ///< Planar YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) -- { PIX_FMT_YUV444P, BC_YUV444P, 1 }, ///< Planar YUV 4:4:4 (1 Cr & Cb sample per 1x1 Y samples) -- { PIX_FMT_YUV411P, BC_YUV411P, 1 }, ///< Planar YUV 4:1:1 (1 Cr & Cb sample per 4x1 Y samples) -- { PIX_FMT_YUV422P16, BC_YUV422P16, 1 }, ///< Planar 16 bit YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) --#ifdef PIX_FMT_YUV422P10 -- { PIX_FMT_YUV422P10, BC_YUV422P10, 1 }, ///< 10 bit samples in uint16_t containers, planar 4:2:2 --#endif -- { PIX_FMT_RGB565, BC_RGB565, 1 }, ///< always stored in cpu endianness -- { PIX_FMT_YUVJ420P, BC_YUVJ420P, 1 }, ///< Planar YUV 4:2:0 full scale (jpeg) -- { PIX_FMT_YUVJ422P, BC_YUVJ422P, 1 }, ///< Planar YUV 4:2:2 full scale (jpeg) -- { PIX_FMT_YUVJ444P, BC_YUVJ444P, 1 }, ///< Planar YUV 4:4:4 full scale (jpeg) -+ { AV_PIX_FMT_RGB24, BC_RGB888, 1 }, ///< Packed pixel, 3 bytes per pixel, RGBRGB... -+ { AV_PIX_FMT_BGR24, BC_BGR888, 1 }, ///< Packed pixel, 3 bytes per pixel, BGRBGR... -+ { AV_PIX_FMT_YUV422P, BC_YUV422P, 1 }, ///< Planar YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) -+ { AV_PIX_FMT_YUV444P, BC_YUV444P, 1 }, ///< Planar YUV 4:4:4 (1 Cr & Cb sample per 1x1 Y samples) -+ { AV_PIX_FMT_YUV411P, BC_YUV411P, 1 }, ///< Planar YUV 4:1:1 (1 Cr & Cb sample per 4x1 Y samples) -+ { AV_PIX_FMT_YUV422P16, BC_YUV422P16, 1 }, ///< Planar 16 bit YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) -+#ifdef AV_PIX_FMT_YUV422P10 -+ { AV_PIX_FMT_YUV422P10, BC_YUV422P10, 1 }, ///< 10 bit samples in uint16_t containers, planar 4:2:2 -+#endif -+ { AV_PIX_FMT_RGB565, BC_RGB565, 1 }, ///< always stored in cpu endianness -+ { AV_PIX_FMT_YUVJ420P, BC_YUVJ420P, 1 }, ///< Planar YUV 4:2:0 full scale (jpeg) -+ { AV_PIX_FMT_YUVJ422P, BC_YUVJ422P, 1 }, ///< Planar YUV 4:2:2 full scale (jpeg) -+ { AV_PIX_FMT_YUVJ444P, BC_YUVJ444P, 1 }, ///< Planar YUV 4:4:4 full scale (jpeg) - #if LIBAVUTIL_VERSION_INT < (50<<16) -- { PIX_FMT_RGBA32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... -+ { AV_PIX_FMT_RGBA32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... - #else -- { PIX_FMT_RGB32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... -+ { AV_PIX_FMT_RGB32, BC_RGBA8888, 0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... - #endif -- { PIX_FMT_RGB555, BC_RGB888, 0 }, ///< always stored in cpu endianness, most significant bit to 1 -- { PIX_FMT_GRAY8, BC_RGB888, 0 }, -- { PIX_FMT_MONOWHITE, BC_RGB888, 0 }, ///< 0 is white -- { PIX_FMT_MONOBLACK, BC_RGB888, 0 }, ///< 0 is black -- { PIX_FMT_PAL8, BC_RGB888, 0 }, ///< 8 bit with RGBA palette -- { PIX_FMT_YUV410P, BC_YUV420P, 0 }, ///< Planar YUV 4:1:0 (1 Cr & Cb sample per 4x4 Y samples) -+ { AV_PIX_FMT_RGB555, BC_RGB888, 0 }, ///< always stored in cpu endianness, most significant bit to 1 -+ { AV_PIX_FMT_GRAY8, BC_RGB888, 0 }, -+ { AV_PIX_FMT_MONOWHITE, BC_RGB888, 0 }, ///< 0 is white -+ { AV_PIX_FMT_MONOBLACK, BC_RGB888, 0 }, ///< 0 is black -+ { AV_PIX_FMT_PAL8, BC_RGB888, 0 }, ///< 8 bit with RGBA palette -+ { AV_PIX_FMT_YUV410P, BC_YUV420P, 0 }, ///< Planar YUV 4:1:0 (1 Cr & Cb sample per 4x4 Y samples) - }; - - static const struct -@@ -343,16 +343,16 @@ - if (!codec->pix_fmts) - return 0; - -- for (i = 0; codec->pix_fmts[i] != PIX_FMT_NONE; ++i) -+ for (i = 0; codec->pix_fmts[i] != AV_PIX_FMT_NONE; ++i) - { -- if (codec->pix_fmts[i] == PIX_FMT_YUV422P10_OR_DUMMY) -+ if (codec->pix_fmts[i] == AV_PIX_FMT_YUV422P10_OR_DUMMY) - return 1; - } - - return 0; - } - --static enum PixelFormat lqt_ffmpeg_get_ffmpeg_colormodel(int id) -+static enum AVPixelFormat lqt_ffmpeg_get_ffmpeg_colormodel(int id) - { - int i; - -@@ -361,10 +361,10 @@ - if(colormodels[i].lqt_id == id) - return colormodels[i].ffmpeg_id; - } -- return PIX_FMT_NB; -+ return AV_PIX_FMT_NB; - } - --static int lqt_ffmpeg_get_lqt_colormodel(enum PixelFormat id, int * exact) -+static int lqt_ffmpeg_get_lqt_colormodel(enum AVPixelFormat id, int * exact) - { - int i; - -@@ -400,26 +400,26 @@ - codec->reinterpret_pix_fmt = codec->avctx->pix_fmt; - - /* First we try codec-specific colormodel matching. */ -- if(codec->decoder->id == CODEC_ID_DNXHD) -+ if(codec->decoder->id == AV_CODEC_ID_DNXHD) - { -- /* FFMpeg supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 for DNxHD, which -- we sometimes interpret as PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10. */ -- if (codec->avctx->pix_fmt == PIX_FMT_YUV422P || codec->avctx->pix_fmt == PIX_FMT_YUV422P10_OR_DUMMY) -+ /* FFMpeg supports AV_PIX_FMT_YUV422P and AV_PIX_FMT_YUV422P10 for DNxHD, which -+ we sometimes interpret as AV_PIX_FMT_YUVJ422P and AV_PIX_FMT_YUVJ422P10. */ -+ if (codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P || codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P10_OR_DUMMY) - { -- int p10 = (codec->avctx->pix_fmt == PIX_FMT_YUV422P10_OR_DUMMY); -+ int p10 = (codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P10_OR_DUMMY); - *exact = 1; - if (lqt_ffmpeg_get_avid_yuv_range(vtrack->track) == AVID_FULL_YUV_RANGE) - { - vtrack->stream_cmodel = p10 ? BC_YUVJ422P10 : BC_YUVJ422P; -- codec->reinterpret_pix_fmt = p10 ? PIX_FMT_YUV422P10_OR_DUMMY : PIX_FMT_YUVJ422P; -- // Note: reinterpret_pix_fmt should really be PIX_FMT_YUVJ422P10, except -+ codec->reinterpret_pix_fmt = p10 ? AV_PIX_FMT_YUV422P10_OR_DUMMY : AV_PIX_FMT_YUVJ422P; -+ // Note: reinterpret_pix_fmt should really be AV_PIX_FMT_YUVJ422P10, except - // there is no such colormodel in FFMpeg. Fortunately, it's not a problem - // in this case, as reinterpret_pix_fmt is only used when *exact == 0. - } - else - { - vtrack->stream_cmodel = p10 ? BC_YUV422P10 : BC_YUV422P; -- codec->reinterpret_pix_fmt = p10 ? PIX_FMT_YUV422P10_OR_DUMMY : PIX_FMT_YUV422P; -+ codec->reinterpret_pix_fmt = p10 ? AV_PIX_FMT_YUV422P10_OR_DUMMY : AV_PIX_FMT_YUV422P; - } - return; - } -@@ -438,16 +438,16 @@ - quicktime_ffmpeg_video_codec_t *codec = vtrack->codec->priv; - codec->avctx->pix_fmt = lqt_ffmpeg_get_ffmpeg_colormodel(vtrack->stream_cmodel); - -- if (codec->encoder->id == CODEC_ID_DNXHD) -+ if (codec->encoder->id == AV_CODEC_ID_DNXHD) - { -- /* FFMpeg's DNxHD encoder only supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 -- and doesn't know anything about PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10 -+ /* FFMpeg's DNxHD encoder only supports AV_PIX_FMT_YUV422P and AV_PIX_FMT_YUV422P10 -+ and doesn't know anything about AV_PIX_FMT_YUVJ422P and AV_PIX_FMT_YUVJ422P10 - (in fact, the latter doesn't even exist) */ -- codec->avctx->pix_fmt = PIX_FMT_YUV422P; -+ codec->avctx->pix_fmt = AV_PIX_FMT_YUV422P; - if (vtrack->stream_cmodel == BC_YUV422P10 || vtrack->stream_cmodel == BC_YUVJ422P10) - { - if (lqt_tenbit_dnxhd_supported(codec->encoder)) -- codec->avctx->pix_fmt = PIX_FMT_YUV422P10_OR_DUMMY; -+ codec->avctx->pix_fmt = AV_PIX_FMT_YUV422P10_OR_DUMMY; - } - } - } -@@ -458,7 +458,7 @@ - /* From avcodec.h: */ - - /* -- * PIX_FMT_RGBA32 is handled in an endian-specific manner. A RGBA -+ * AV_PIX_FMT_RGBA32 is handled in an endian-specific manner. A RGBA - * color is put together as: - * (A << 24) | (R << 16) | (G << 8) | B - * This is stored as BGRA on little endian CPU architectures and ARGB on -@@ -530,7 +530,7 @@ - */ - - static void convert_image_decode(quicktime_ffmpeg_video_codec_t *codec, -- AVFrame * in_frame, enum PixelFormat in_format, -+ AVFrame * in_frame, enum AVPixelFormat in_format, - unsigned char ** out_frame, int out_format, - int width, int height, int row_span, int row_span_uv) - { -@@ -547,9 +547,9 @@ - * RGBA format like in ffmpeg?? - */ - #if LIBAVUTIL_VERSION_INT < (50<<16) -- if((in_format == PIX_FMT_RGBA32) && (out_format == BC_RGBA8888)) -+ if((in_format == AV_PIX_FMT_RGBA32) && (out_format == BC_RGBA8888)) - #else -- if((in_format == PIX_FMT_RGB32) && (out_format == BC_RGBA8888)) -+ if((in_format == AV_PIX_FMT_RGB32) && (out_format == BC_RGBA8888)) - #endif - { - convert_image_decode_rgba(in_frame, out_frame, width, height, codec->y_offset); -@@ -728,13 +728,13 @@ - - /* Set extradata: It's done differently for each codec */ - -- if(codec->decoder->id == CODEC_ID_SVQ3) -+ if(codec->decoder->id == AV_CODEC_ID_SVQ3) - { - extradata = trak->mdia.minf.stbl.stsd.table[0].table_raw + 4; - extradata_size = trak->mdia.minf.stbl.stsd.table[0].table_raw_size - 4; - - } -- else if(codec->decoder->id == CODEC_ID_H264) -+ else if(codec->decoder->id == AV_CODEC_ID_H264) - { - user_atom = quicktime_stsd_get_user_atom(trak, "avcC", &user_atom_len); - -@@ -753,7 +753,7 @@ - } - - } -- else if(codec->decoder->id == CODEC_ID_MPEG4) -+ else if(codec->decoder->id == AV_CODEC_ID_MPEG4) - { - if(trak->mdia.minf.stbl.stsd.table[0].has_esds) - { -@@ -829,7 +829,7 @@ - if(avcodec_open2(codec->avctx, codec->decoder, NULL) != 0) - return -1; - #endif -- codec->frame = avcodec_alloc_frame(); -+ codec->frame = av_frame_alloc(); - vtrack->stream_cmodel = LQT_COLORMODEL_NONE; - codec->initialized = 1; - } -@@ -929,10 +929,10 @@ - #ifdef HAVE_LIBSWSCALE - - #if LIBAVUTIL_VERSION_INT < (50<<16) -- if(!((codec->avctx->pix_fmt == PIX_FMT_RGBA32) && -+ if(!((codec->avctx->pix_fmt == AV_PIX_FMT_RGBA32) && - (vtrack->stream_cmodel == BC_RGBA8888))) - #else -- if(!((codec->avctx->pix_fmt == PIX_FMT_RGB32) && -+ if(!((codec->avctx->pix_fmt == AV_PIX_FMT_RGB32) && - (vtrack->stream_cmodel == BC_RGBA8888))) - #endif - { -@@ -947,15 +947,15 @@ - } - #endif - } -- if(codec->decoder->id == CODEC_ID_DVVIDEO) -+ if(codec->decoder->id == AV_CODEC_ID_DVVIDEO) - { - if(vtrack->stream_cmodel == BC_YUV420P) - vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_DVPAL; - vtrack->interlace_mode = LQT_INTERLACE_BOTTOM_FIRST; - vtrack->ci.id = LQT_COMPRESSION_DV; - } -- else if((codec->decoder->id == CODEC_ID_MPEG4) || -- (codec->decoder->id == CODEC_ID_H264)) -+ else if((codec->decoder->id == AV_CODEC_ID_MPEG4) || -+ (codec->decoder->id == AV_CODEC_ID_H264)) - { - if(vtrack->stream_cmodel == BC_YUV420P) - vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_MPEG2; -@@ -1299,13 +1299,13 @@ - { - if(vtrack->stream_cmodel == BC_YUV420P) - { -- if(codec->encoder->id == CODEC_ID_MPEG4) -+ if(codec->encoder->id == AV_CODEC_ID_MPEG4) - { - vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_MPEG2; - /* enable interlaced encoding */ - vtrack->interlace_mode = LQT_INTERLACE_NONE; - } -- else if(codec->encoder->id == CODEC_ID_DVVIDEO) -+ else if(codec->encoder->id == AV_CODEC_ID_DVVIDEO) - { - vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_DVPAL; - } -@@ -1318,7 +1318,7 @@ - - if(!codec->initialized) - { -- codec->frame = avcodec_alloc_frame(); -+ codec->frame = av_frame_alloc(); - - /* time_base is 1/framerate for constant framerate */ - -@@ -1340,7 +1340,7 @@ - codec->avctx->sample_aspect_ratio.num = pixel_width; - codec->avctx->sample_aspect_ratio.den = pixel_height; - /* Use global headers for mp4v */ -- if(codec->encoder->id == CODEC_ID_MPEG4) -+ if(codec->encoder->id == AV_CODEC_ID_MPEG4) - { - if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML))) - { -@@ -1364,12 +1364,12 @@ - } - #endif - } -- else if((codec->encoder->id == CODEC_ID_MSMPEG4V3) && (trak->strl) && -+ else if((codec->encoder->id == AV_CODEC_ID_MSMPEG4V3) && (trak->strl) && - !strncmp(trak->strl->strf.bh.biCompression, "DIV3", 4)) - { - strncpy(trak->strl->strh.fccHandler, "div3", 4); - } -- else if((codec->encoder->id == CODEC_ID_H263) && -+ else if((codec->encoder->id == AV_CODEC_ID_H263) && - (file->file_type & (LQT_FILE_MP4|LQT_FILE_3GP))) - { - uint8_t d263_data[] = -@@ -1383,7 +1383,7 @@ - strncpy(trak->mdia.minf.stbl.stsd.table[0].format, - "s263", 4); - } -- else if(codec->encoder->id == CODEC_ID_FFVHUFF) -+ else if(codec->encoder->id == AV_CODEC_ID_FFVHUFF) - { - if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML))) - { -@@ -1391,22 +1391,22 @@ - codec->write_global_header = 1; - } - } -- else if(codec->encoder->id == CODEC_ID_QTRLE) -+ else if(codec->encoder->id == AV_CODEC_ID_QTRLE) - { - if(vtrack->stream_cmodel == BC_RGBA8888) - { - /* Libquicktime doesn't natively support a color model equivalent -- to PIX_FMT_ARGB, which is required for QTRLE with alpha channel. -+ to AV_PIX_FMT_ARGB, which is required for QTRLE with alpha channel. - So, we use BC_RGBA8888 and do ad hoc conversion below. */ -- codec->avctx->pix_fmt = PIX_FMT_ARGB; -+ codec->avctx->pix_fmt = AV_PIX_FMT_ARGB; - vtrack->track->mdia.minf.stbl.stsd.table[0].depth = 32; - } - } -- else if(codec->encoder->id == CODEC_ID_DVVIDEO) -+ else if(codec->encoder->id == AV_CODEC_ID_DVVIDEO) - { - set_dv_fourcc(width, height, vtrack->stream_cmodel, trak); - } -- else if(codec->encoder->id == CODEC_ID_DNXHD) -+ else if(codec->encoder->id == AV_CODEC_ID_DNXHD) - { - if(vtrack->interlace_mode != LQT_INTERLACE_NONE) - { -@@ -1467,7 +1467,7 @@ - } - // codec->lqt_colormodel = ffmepg_2_lqt(codec->com.ffcodec_enc); - -- if(codec->y_offset != 0 || codec->avctx->pix_fmt == PIX_FMT_ARGB) -+ if(codec->y_offset != 0 || codec->avctx->pix_fmt == AV_PIX_FMT_ARGB) - { - if(!codec->tmp_rows) - { -@@ -1492,7 +1492,7 @@ - vtrack->stream_cmodel, - 0, 0, 0, codec->y_offset); - } -- else if(codec->avctx->pix_fmt == PIX_FMT_ARGB) -+ else if(codec->avctx->pix_fmt == AV_PIX_FMT_ARGB) - { - convert_rgba_to_argb(row_pointers[0], vtrack->stream_row_span, - codec->tmp_rows[0], codec->tmp_row_span, -@@ -1558,12 +1558,12 @@ - - #endif - -- if(!was_initialized && codec->encoder->id == CODEC_ID_DNXHD) -+ if(!was_initialized && codec->encoder->id == AV_CODEC_ID_DNXHD) - setup_avid_atoms(file, vtrack, codec->buffer, bytes_encoded); - - if(bytes_encoded) - { -- if (pts == AV_NOPTS_VALUE || (codec->encoder->id == CODEC_ID_DNXHD && pts == 0)) -+ if (pts == AV_NOPTS_VALUE || (codec->encoder->id == AV_CODEC_ID_DNXHD && pts == 0)) - { - /* Some codecs don't bother generating presentation timestamps. - FFMpeg's DNxHD encoder doesn't even bother to set it to AV_NOPTS_VALUE. */ -@@ -1590,13 +1590,13 @@ - - if(codec->write_global_header && !codec->global_header_written) - { -- if(codec->encoder->id == CODEC_ID_FFVHUFF) -+ if(codec->encoder->id == AV_CODEC_ID_FFVHUFF) - { - quicktime_user_atoms_add_atom(&trak->mdia.minf.stbl.stsd.table[0].user_atoms, - "glbl", - codec->avctx->extradata, codec->avctx->extradata_size ); - } -- else if(codec->encoder->id == CODEC_ID_MPEG4) -+ else if(codec->encoder->id == AV_CODEC_ID_MPEG4) - { - int advanced = 0; - if(codec->avctx->max_b_frames || -@@ -1903,18 +1903,18 @@ - codec_base->encode_video = lqt_ffmpeg_encode_video; - codec_base->set_pass = set_pass_ffmpeg; - -- if(encoder->id == CODEC_ID_MPEG4) -+ if(encoder->id == AV_CODEC_ID_MPEG4) - { - codec_base->writes_compressed = writes_compressed_mpeg4; - codec_base->init_compressed = init_compressed_mpeg4; - codec_base->write_packet = write_packet_mpeg4; - } -- else if(encoder->id == CODEC_ID_MPEG2VIDEO) -+ else if(encoder->id == AV_CODEC_ID_MPEG2VIDEO) - { - codec_base->writes_compressed = writes_compressed_imx; - codec_base->init_compressed = init_compressed_imx; - } -- else if(encoder->id == CODEC_ID_DVVIDEO) -+ else if(encoder->id == AV_CODEC_ID_DVVIDEO) - { - codec_base->init_compressed = init_compressed_dv; - } -@@ -1922,7 +1922,7 @@ - } - if(decoder) - { -- if(decoder->id == CODEC_ID_H264) -+ if(decoder->id == AV_CODEC_ID_H264) - codec_base->read_packet = read_packet_h264; - codec_base->decode_video = lqt_ffmpeg_decode_video; - } diff --git a/libquicktime/libquicktime-1.2.4-ffmpeg4.patch b/libquicktime/libquicktime-1.2.4-ffmpeg4.patch new file mode 100644 index 00000000..eb196ea1 --- /dev/null +++ b/libquicktime/libquicktime-1.2.4-ffmpeg4.patch @@ -0,0 +1,342 @@ +Index: libquicktime-1.2.4/plugins/ffmpeg/audio.c +=================================================================== +--- libquicktime-1.2.4.orig/plugins/ffmpeg/audio.c ++++ libquicktime-1.2.4/plugins/ffmpeg/audio.c +@@ -545,7 +545,7 @@ static int decode_chunk_vbr(quicktime_t + + #if DECODE_AUDIO3 || DECODE_AUDIO4 + codec->pkt.data = codec->chunk_buffer; +- codec->pkt.size = packet_size + FF_INPUT_BUFFER_PADDING_SIZE; ++ codec->pkt.size = packet_size + AV_INPUT_BUFFER_PADDING_SIZE; + + #if DECODE_AUDIO4 + frame_bytes = avcodec_decode_audio4(codec->avctx, &f, +@@ -583,7 +583,7 @@ static int decode_chunk_vbr(quicktime_t + (codec->sample_buffer_end - codec->sample_buffer_start)], + &bytes_decoded, + codec->chunk_buffer, +- packet_size + FF_INPUT_BUFFER_PADDING_SIZE); ++ packet_size + AV_INPUT_BUFFER_PADDING_SIZE); + if(frame_bytes < 0) + { + lqt_log(file, LQT_LOG_ERROR, LOG_DOMAIN, "avcodec_decode_audio2 error"); +@@ -645,13 +645,13 @@ static int decode_chunk(quicktime_t * fi + return 0; + } + +- if(codec->chunk_buffer_alloc < mph.frame_bytes + FF_INPUT_BUFFER_PADDING_SIZE) ++ if(codec->chunk_buffer_alloc < mph.frame_bytes + AV_INPUT_BUFFER_PADDING_SIZE) + { +- codec->chunk_buffer_alloc = mph.frame_bytes + FF_INPUT_BUFFER_PADDING_SIZE; ++ codec->chunk_buffer_alloc = mph.frame_bytes + AV_INPUT_BUFFER_PADDING_SIZE; + codec->chunk_buffer = realloc(codec->chunk_buffer, codec->chunk_buffer_alloc); + } + memset(codec->chunk_buffer + codec->bytes_in_chunk_buffer, 0, +- mph.frame_bytes - codec->bytes_in_chunk_buffer + FF_INPUT_BUFFER_PADDING_SIZE); ++ mph.frame_bytes - codec->bytes_in_chunk_buffer + AV_INPUT_BUFFER_PADDING_SIZE); + num_samples = mph.samples_per_frame; + codec->bytes_in_chunk_buffer = mph.frame_bytes; + } +@@ -695,7 +695,7 @@ static int decode_chunk(quicktime_t * fi + { + + +- /* BIG NOTE: We pass extra FF_INPUT_BUFFER_PADDING_SIZE for the buffer size ++ /* BIG NOTE: We pass extra AV_INPUT_BUFFER_PADDING_SIZE for the buffer size + because we know, that lqt_read_audio_chunk allocates 16 extra bytes for us */ + + /* Some really broken mp3 files have the header bytes split across 2 chunks */ +@@ -761,7 +761,7 @@ static int decode_chunk(quicktime_t * fi + + #if DECODE_AUDIO3 || DECODE_AUDIO4 + codec->pkt.data = &codec->chunk_buffer[bytes_used]; +- codec->pkt.size = codec->bytes_in_chunk_buffer + FF_INPUT_BUFFER_PADDING_SIZE; ++ codec->pkt.size = codec->bytes_in_chunk_buffer + AV_INPUT_BUFFER_PADDING_SIZE; + + #if DECODE_AUDIO4 + +@@ -798,7 +798,7 @@ static int decode_chunk(quicktime_t * fi + (codec->sample_buffer_end - codec->sample_buffer_start)], + &bytes_decoded, + &codec->chunk_buffer[bytes_used], +- codec->bytes_in_chunk_buffer + FF_INPUT_BUFFER_PADDING_SIZE); ++ codec->bytes_in_chunk_buffer + AV_INPUT_BUFFER_PADDING_SIZE); + #endif + if(frame_bytes < 0) + { +@@ -838,7 +838,7 @@ static int decode_chunk(quicktime_t * fi + } + } + +- /* This happens because ffmpeg adds FF_INPUT_BUFFER_PADDING_SIZE to the bytes returned */ ++ /* This happens because ffmpeg adds AV_INPUT_BUFFER_PADDING_SIZE to the bytes returned */ + + if(codec->bytes_in_chunk_buffer < 0) + codec->bytes_in_chunk_buffer = 0; +Index: libquicktime-1.2.4/plugins/ffmpeg/params.c +=================================================================== +--- libquicktime-1.2.4.orig/plugins/ffmpeg/params.c ++++ libquicktime-1.2.4/plugins/ffmpeg/params.c +@@ -124,16 +124,6 @@ typedef struct + } + + +-enum_t me_method[] = +- { +- { "Zero", ME_ZERO }, +- { "Phods", ME_PHODS }, +- { "Log", ME_LOG }, +- { "X1", ME_X1 }, +- { "Epzs", ME_EPZS }, +- { "Full", ME_FULL } +- }; +- + enum_t prediction_method[] = + { + { "Left", FF_PRED_LEFT }, +@@ -163,15 +153,6 @@ enum_t mb_decision[] = + { "Rate distoration", FF_MB_DECISION_RD } + }; + +-enum_t coder_type[] = +- { +- { "VLC", FF_CODER_TYPE_VLC }, +- { "Arithmetic", FF_CODER_TYPE_AC }, +- { "Raw", FF_CODER_TYPE_RAW }, +- { "RLE", FF_CODER_TYPE_RLE }, +- { "Deflate", FF_CODER_TYPE_DEFLATE }, +- }; +- + #define PARAM_ENUM(name, var, arr) \ + if(!strcasecmp(key, name)) \ + { \ +@@ -203,7 +184,7 @@ void lqt_ffmpeg_set_parameter(AVCodecCon + PARAM_INT_SCALE("ff_bit_rate_audio",bit_rate,1000); + PARAM_INT_SCALE("ff_bit_rate_video",bit_rate,1000); + PARAM_INT_SCALE("ff_bit_rate_tolerance",bit_rate_tolerance,1000); +- PARAM_ENUM("ff_me_method",me_method,me_method); ++ PARAM_DICT_INT("ff_me_method","motion-est"); + PARAM_INT("ff_gop_size",gop_size); + PARAM_FLOAT("ff_qcompress",qcompress); + PARAM_FLOAT("ff_qblur",qblur); +@@ -227,10 +208,9 @@ void lqt_ffmpeg_set_parameter(AVCodecCon + PARAM_INT("ff_rc_min_rate",rc_min_rate); + PARAM_INT("ff_rc_max_rate",rc_max_rate); + PARAM_INT_SCALE("ff_rc_buffer_size",rc_buffer_size,1000); +- PARAM_FLOAT("ff_rc_buffer_aggressivity",rc_buffer_aggressivity); + PARAM_FLOAT("ff_i_quant_factor",i_quant_factor); + PARAM_QP2LAMBDA("ff_i_quant_offset",i_quant_offset); +- PARAM_FLOAT("ff_rc_initial_cplx",rc_initial_cplx); ++ PARAM_DICT_INT("ff_rc_initial_cplx","rc_init_cplx"); + PARAM_FLOAT("ff_lumi_masking",lumi_masking); + PARAM_FLOAT("ff_temporal_cplx_masking",temporal_cplx_masking); + PARAM_FLOAT("ff_spatial_cplx_masking",spatial_cplx_masking); +@@ -255,8 +235,8 @@ void lqt_ffmpeg_set_parameter(AVCodecCon + PARAM_INT("ff_me_range",me_range); + PARAM_ENUM("ff_mb_decision",mb_decision,mb_decision); + PARAM_INT("ff_scenechange_threshold",scenechange_threshold); +- PARAM_QP2LAMBDA("ff_lmin", lmin); +- PARAM_QP2LAMBDA("ff_lmax", lmax); ++ PARAM_DICT_INT("ff_lmin", "lmin"); ++ PARAM_DICT_INT("ff_lmax", "lmax"); + PARAM_INT("ff_noise_reduction",noise_reduction); + PARAM_INT_SCALE("ff_rc_initial_buffer_occupancy",rc_initial_buffer_occupancy,1000); + +@@ -269,33 +249,29 @@ void lqt_ffmpeg_set_parameter(AVCodecCon + #endif + + PARAM_INT("ff_thread_count",thread_count); +- PARAM_INT("ff_me_threshold",me_threshold); +- PARAM_INT("ff_mb_threshold",mb_threshold); + PARAM_INT("ff_nsse_weight",nsse_weight); +- PARAM_FLOAT("ff_border_masking",border_masking); ++ PARAM_DICT_INT("ff_border_masking","border_mask"); + PARAM_QP2LAMBDA("ff_mb_lmin", mb_lmin); + PARAM_QP2LAMBDA("ff_mb_lmax", mb_lmax); + PARAM_INT("ff_me_penalty_compensation",me_penalty_compensation); + PARAM_INT("ff_bidir_refine",bidir_refine); + PARAM_INT("ff_brd_scale",brd_scale); +- PARAM_INT("ff_scenechange_factor",scenechange_factor); +- PARAM_FLAG("ff_flag_qscale",CODEC_FLAG_QSCALE); +- PARAM_FLAG("ff_flag_4mv",CODEC_FLAG_4MV); +- PARAM_FLAG("ff_flag_qpel",CODEC_FLAG_QPEL); +- PARAM_FLAG("ff_flag_gmc",CODEC_FLAG_GMC); +- PARAM_FLAG("ff_flag_mv0",CODEC_FLAG_MV0); ++ PARAM_FLAG("ff_flag_qscale",AV_CODEC_FLAG_QSCALE); ++ PARAM_FLAG("ff_flag_4mv",AV_CODEC_FLAG_4MV); ++ PARAM_FLAG("ff_flag_qpel",AV_CODEC_FLAG_QPEL); ++ PARAM_DICT_FLAG("ff_flag_gmc","gmc"); ++ PARAM_DICT_FLAG("ff_flag_mv0","mpv_flags"); + // PARAM_FLAG("ff_flag_part",CODEC_FLAG_PART); // Unused +- PARAM_FLAG("ff_flag_gray",CODEC_FLAG_GRAY); +- PARAM_FLAG("ff_flag_emu_edge",CODEC_FLAG_EMU_EDGE); +- PARAM_FLAG("ff_flag_normalize_aqp",CODEC_FLAG_NORMALIZE_AQP); ++ PARAM_FLAG("ff_flag_gray",AV_CODEC_FLAG_GRAY); ++ PARAM_DICT_FLAG("ff_flag_normalize_aqp","naq"); + // PARAM_FLAG("ff_flag_alt_scan",CODEC_FLAG_ALT_SCAN); // Unused + #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) + PARAM_FLAG("ff_flag_trellis_quant",CODEC_FLAG_TRELLIS_QUANT); + #else + PARAM_INT("ff_trellis",trellis); + #endif +- PARAM_FLAG("ff_flag_bitexact",CODEC_FLAG_BITEXACT); +- PARAM_FLAG("ff_flag_ac_pred",CODEC_FLAG_AC_PRED); ++ PARAM_FLAG("ff_flag_bitexact",AV_CODEC_FLAG_BITEXACT); ++ PARAM_FLAG("ff_flag_ac_pred",AV_CODEC_FLAG_AC_PRED); + // PARAM_FLAG("ff_flag_h263p_umv",CODEC_FLAG_H263P_UMV); // Unused + + #if LIBAVCODEC_VERSION_MAJOR >= 55 +@@ -303,9 +279,9 @@ void lqt_ffmpeg_set_parameter(AVCodecCon + PARAM_DICT_FLAG("ff_flag_qp_rd","qp_rd"); + PARAM_DICT_FLAG("ff_flag2_strict_gop","strict_gop"); + #else +- PARAM_FLAG("ff_flag_cbp_rd",CODEC_FLAG_CBP_RD); +- PARAM_FLAG("ff_flag_qp_rd",CODEC_FLAG_QP_RD); +- PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP); ++ PARAM_FLAG("ff_flag_cbp_rd",AV_CODEC_FLAG_CBP_RD); ++ PARAM_FLAG("ff_flag_qp_rd",AV_CODEC_FLAG_QP_RD); ++ PARAM_FLAG2("ff_flag2_strict_gop",AV_CODEC_FLAG2_STRICT_GOP); + #endif + + #if LIBAVCODEC_VERSION_MAJOR >= 54 +@@ -313,14 +289,14 @@ void lqt_ffmpeg_set_parameter(AVCodecCon + PARAM_DICT_FLAG("ff_flag_obmc","obmc"); + PARAM_DICT_FLAG("ff_flag_h263p_slice_struct","structured_slices"); + #else +- PARAM_FLAG("ff_flag_h263p_aiv",CODEC_FLAG_H263P_AIV); +- PARAM_FLAG("ff_flag_obmc",CODEC_FLAG_OBMC); +- PARAM_FLAG("ff_flag_h263p_slice_struct",CODEC_FLAG_H263P_SLICE_STRUCT); ++ PARAM_FLAG("ff_flag_h263p_aiv",AV_CODEC_FLAG_H263P_AIV); ++ PARAM_FLAG("ff_flag_obmc",AV_CODEC_FLAG_OBMC); ++ PARAM_FLAG("ff_flag_h263p_slice_struct",AV_CODEC_FLAG_H263P_SLICE_STRUCT); + #endif + +- PARAM_FLAG("ff_flag_loop_filter",CODEC_FLAG_LOOP_FILTER); +- PARAM_FLAG("ff_flag_closed_gop",CODEC_FLAG_CLOSED_GOP); +- PARAM_FLAG2("ff_flag2_fast",CODEC_FLAG2_FAST); +- PARAM_ENUM("ff_coder_type",coder_type,coder_type); ++ PARAM_FLAG("ff_flag_loop_filter",AV_CODEC_FLAG_LOOP_FILTER); ++ PARAM_FLAG("ff_flag_closed_gop",AV_CODEC_FLAG_CLOSED_GOP); ++ PARAM_FLAG2("ff_flag2_fast",AV_CODEC_FLAG2_FAST); ++ PARAM_DICT_INT("ff_coder_type","coder"); + + } +Index: libquicktime-1.2.4/plugins/ffmpeg/params.h +=================================================================== +--- libquicktime-1.2.4.orig/plugins/ffmpeg/params.h ++++ libquicktime-1.2.4/plugins/ffmpeg/params.h +@@ -149,7 +149,7 @@ the reference. Unused for constant quant + .type = LQT_PARAMETER_INT, \ + .val_default = { .val_int = 0 }, \ + .val_min = { .val_int = 0 }, \ +- .val_max = { .val_int = FF_MAX_B_FRAMES }, \ ++ .val_max = { .val_int = 16 }, \ + .help_string = TRS("Maximum number of B-frames between non B-frames") \ + } + +Index: libquicktime-1.2.4/plugins/ffmpeg/video.c +=================================================================== +--- libquicktime-1.2.4.orig/plugins/ffmpeg/video.c ++++ libquicktime-1.2.4/plugins/ffmpeg/video.c +@@ -781,7 +781,7 @@ static int lqt_ffmpeg_decode_video(quick + if(extradata) + { + codec->extradata = +- calloc(1, extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); ++ calloc(1, extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); + memcpy(codec->extradata, extradata, extradata_size); + codec->avctx->extradata_size = extradata_size; + codec->avctx->extradata = codec->extradata; +@@ -1140,8 +1140,8 @@ static int init_imx_encoder(quicktime_t + codec->avctx->qmin = 1; + codec->avctx->qmax = 3; + codec->avctx->rtp_payload_size = 1; // ?? +- codec->avctx->rc_buffer_aggressivity = 0.25; +- codec->avctx->flags |= CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_LOW_DELAY; ++ av_dict_set(&codec->options, "rc_buf_aggressivity", "0.25", 0); ++ codec->avctx->flags |= AV_CODEC_FLAG_INTERLACED_DCT|AV_CODEC_FLAG_LOW_DELAY; + + #if (LIBAVCODEC_VERSION_MAJOR < 54) + codec->avctx->flags2 |= CODEC_FLAG2_INTRA_VLC|CODEC_FLAG2_NON_LINEAR_QUANT; +@@ -1328,7 +1328,7 @@ static int lqt_ffmpeg_encode_video(quick + // codec->avctx->time_base.den = 1; + // codec->avctx->time_base.num = lqt_video_time_scale(file, track); + +- if(codec->avctx->flags & CODEC_FLAG_QSCALE) ++ if(codec->avctx->flags & AV_CODEC_FLAG_QSCALE) + codec->avctx->global_quality = codec->qscale; + + codec->avctx->width = width; +@@ -1344,7 +1344,7 @@ static int lqt_ffmpeg_encode_video(quick + { + if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML))) + { +- codec->avctx->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ codec->avctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + codec->write_global_header = 1; + } + +@@ -1360,7 +1360,7 @@ static int lqt_ffmpeg_encode_video(quick + { + lqt_log(file, LQT_LOG_INFO, LOG_DOMAIN, "Enabling interlaced encoding"); + codec->avctx->flags |= +- (CODEC_FLAG_INTERLACED_DCT|CODEC_FLAG_INTERLACED_ME|CODEC_FLAG_ALT_SCAN); ++ (AV_CODEC_FLAG_INTERLACED_DCT|AV_CODEC_FLAG_INTERLACED_ME|AV_CODEC_FLAG_ALT_SCAN); + } + #endif + } +@@ -1387,7 +1387,7 @@ static int lqt_ffmpeg_encode_video(quick + { + if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML))) + { +- codec->avctx->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ codec->avctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + codec->write_global_header = 1; + } + } +@@ -1410,7 +1410,7 @@ static int lqt_ffmpeg_encode_video(quick + { + if(vtrack->interlace_mode != LQT_INTERLACE_NONE) + { +- codec->avctx->flags |= CODEC_FLAG_INTERLACED_DCT; ++ codec->avctx->flags |= AV_CODEC_FLAG_INTERLACED_DCT; + } + } + else if(codec->is_imx) +@@ -1422,7 +1422,7 @@ static int lqt_ffmpeg_encode_video(quick + if(codec->pass == 1) + { + codec->stats_file = fopen(codec->stats_filename, "w"); +- codec->avctx->flags |= CODEC_FLAG_PASS1; ++ codec->avctx->flags |= AV_CODEC_FLAG_PASS1; + } + else if(codec->pass == codec->total_passes) + { +@@ -1438,7 +1438,7 @@ static int lqt_ffmpeg_encode_video(quick + fclose(codec->stats_file); + codec->stats_file = (FILE*)0; + +- codec->avctx->flags |= CODEC_FLAG_PASS2; ++ codec->avctx->flags |= AV_CODEC_FLAG_PASS2; + } + } + /* Open codec */ +@@ -1516,7 +1516,7 @@ static int lqt_ffmpeg_encode_video(quick + } + + codec->frame->pts = vtrack->timestamp; +- if(codec->avctx->flags & CODEC_FLAG_QSCALE) ++ if(codec->avctx->flags & AV_CODEC_FLAG_QSCALE) + codec->frame->quality = codec->qscale; + #ifdef DO_INTERLACE + if(vtrack->interlace_mode != LQT_INTERLACE_NONE) +@@ -1599,8 +1599,7 @@ static int lqt_ffmpeg_encode_video(quick + else if(codec->encoder->id == AV_CODEC_ID_MPEG4) + { + int advanced = 0; +- if(codec->avctx->max_b_frames || +- (codec->avctx->flags & (CODEC_FLAG_QPEL|CODEC_FLAG_GMC))) ++ if(codec->avctx->max_b_frames) + advanced = 1; + + setup_header_mpeg4(file, track, codec->avctx->extradata,

1 0

ports/compat-32 (3.4): libogg-32: 1.3.2 -> 1.3.3
by crux＠crux.nu 02 May '19

02 May '19

commit b9526ec8f80b7ad53fa3a7b7e4db9907910c6111 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Thu May 2 19:51:14 2019 +1000 libogg-32: 1.3.2 -> 1.3.3 diff --git a/libogg-32/.footprint b/libogg-32/.footprint index 617025f..7956d45 100644 --- a/libogg-32/.footprint +++ b/libogg-32/.footprint @@ -2,8 +2,8 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib32/ -rw-r--r-- root/root usr/lib32/libogg.a -rwxr-xr-x root/root usr/lib32/libogg.la -lrwxrwxrwx root/root usr/lib32/libogg.so -> libogg.so.0.8.2 -lrwxrwxrwx root/root usr/lib32/libogg.so.0 -> libogg.so.0.8.2 --rwxr-xr-x root/root usr/lib32/libogg.so.0.8.2 +lrwxrwxrwx root/root usr/lib32/libogg.so -> libogg.so.0.8.3 +lrwxrwxrwx root/root usr/lib32/libogg.so.0 -> libogg.so.0.8.3 +-rwxr-xr-x root/root usr/lib32/libogg.so.0.8.3 drwxr-xr-x root/root usr/lib32/pkgconfig/ -rw-r--r-- root/root usr/lib32/pkgconfig/ogg.pc diff --git a/libogg-32/.md5sum b/libogg-32/.md5sum deleted file mode 100644 index 3cf9a7c..0000000 --- a/libogg-32/.md5sum +++ /dev/null @@ -1 +0,0 @@ -5c3a34309d8b98640827e5d0991a4015 libogg-1.3.2.tar.xz diff --git a/libogg-32/.signature b/libogg-32/.signature index 38340aa..3f3b81c 100644 --- a/libogg-32/.signature +++ b/libogg-32/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXUlZpzJqyC9SYNUu22X1XDZ/oiqpzEkENeXlOhdNfHlrSWxq/L7mA1lCikmJt/LX87tvKkVwV28vfnbAItMLTAc= -SHA256 (Pkgfile) = a080013fd9da3d803beeb6a37f8b562887e4b841170a4836b7786cdcae290e7a -SHA256 (.footprint) = 4b3ff990af423faea9b2fd3f3bfc0abe339f5d1101da7d2757944d48a0e9002b -SHA256 (libogg-1.3.2.tar.xz) = 3f687ccdd5ac8b52d76328fbbfebc70c459a40ea891dbf3dccb74a210826e79b +RWSwxGo/zH7eXah+S9UIqzhHPzsnQneHv+El2YQLGqRwd/Z7BRz6yrL4VQqSUmblugVeaTVDy3SRnGSufY5C7K3rhPHFwT78uwg= +SHA256 (Pkgfile) = 062090582c3a6fde6252ce1dbb46f9e2b95097958b21fe739e208d51dfa1d318 +SHA256 (.footprint) = d6f62eb85e0fd3759a55b0ff3ba15cba708a3bb756c13d41dec13cfca3084582 +SHA256 (libogg-1.3.3.tar.xz) = 4f3fc6178a533d392064f14776b23c397ed4b9f48f5de297aba73b643f955c08 diff --git a/libogg-32/Pkgfile b/libogg-32/Pkgfile index 4cd7530..5563f7c 100644 --- a/libogg-32/Pkgfile +++ b/libogg-32/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libogg name=libogg-32 -version=1.3.2 +version=1.3.3 release=1 source=(https://downloads.xiph.org/releases/ogg/libogg-$version.tar.xz)

1 0

ports/opt (3.4): autoconf-archive: dropped hexchat and gst-libav don't use this anymore, I am not aware of anything else using this port
by crux＠crux.nu 02 May '19

02 May '19

commit 973ca523277f806e30fdeba5d1b05f06d032c1c8 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Thu May 2 19:32:28 2019 +1000 autoconf-archive: dropped hexchat and gst-libav don't use this anymore, I am not aware of anything else using this port diff --git a/autoconf-archive/.footprint b/autoconf-archive/.footprint deleted file mode 100644 index 84c52fa0f..000000000 --- a/autoconf-archive/.footprint +++ /dev/null @@ -1,573 +0,0 @@ -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/aclocal/ --rw-r--r-- root/root usr/share/aclocal/ax_absolute_header.m4 --rw-r--r-- root/root usr/share/aclocal/ax_ac_append_to_file.m4 --rw-r--r-- root/root usr/share/aclocal/ax_ac_print_to_file.m4 --rw-r--r-- root/root usr/share/aclocal/ax_add_am_macro.m4 --rw-r--r-- root/root usr/share/aclocal/ax_add_am_macro_static.m4 --rw-r--r-- root/root usr/share/aclocal/ax_add_am_trilinos_makefile_export.m4 --rw-r--r-- root/root usr/share/aclocal/ax_add_fortify_source.m4 --rw-r--r-- root/root usr/share/aclocal/ax_add_recursive_am_macro.m4 --rw-r--r-- root/root usr/share/aclocal/ax_add_recursive_am_macro_static.m4 --rw-r--r-- root/root usr/share/aclocal/ax_afs.m4 --rw-r--r-- root/root usr/share/aclocal/ax_am_jobserver.m4 --rw-r--r-- root/root usr/share/aclocal/ax_am_macros.m4 --rw-r--r-- root/root usr/share/aclocal/ax_am_macros_static.m4 --rw-r--r-- root/root usr/share/aclocal/ax_am_override_var.m4 --rw-r--r-- root/root usr/share/aclocal/ax_append_compile_flags.m4 --rw-r--r-- root/root usr/share/aclocal/ax_append_flag.m4 --rw-r--r-- root/root usr/share/aclocal/ax_append_link_flags.m4 --rw-r--r-- root/root usr/share/aclocal/ax_append_to_file.m4 --rw-r--r-- root/root usr/share/aclocal/ax_arg_with_path_style.m4 --rw-r--r-- root/root usr/share/aclocal/ax_asm_inline.m4 --rw-r--r-- root/root usr/share/aclocal/ax_at_check_pattern.m4 --rw-r--r-- root/root usr/share/aclocal/ax_auto_include_headers.m4 --rw-r--r-- root/root usr/share/aclocal/ax_berkeley_db.m4 --rw-r--r-- root/root usr/share/aclocal/ax_berkeley_db_cxx.m4 --rw-r--r-- root/root usr/share/aclocal/ax_blas.m4 --rw-r--r-- root/root usr/share/aclocal/ax_blas_f77_func.m4 --rw-r--r-- root/root usr/share/aclocal/ax_boost_asio.m4 --rw-r--r-- root/root usr/share/aclocal/ax_boost_base.m4 --rw-r--r-- root/root usr/share/aclocal/ax_boost_chrono.m4 --rw-r--r-- root/root usr/share/aclocal/ax_boost_context.m4 --rw-r--r-- root/root usr/share/aclocal/ax_boost_coroutine.m4 --rw-r--r-- root/root usr/share/aclocal/ax_boost_date_time.m4 --rw-r--r-- root/root usr/share/aclocal/ax_boost_filesystem.m4 --rw-r--r-- root/root usr/share/aclocal/ax_boost_iostreams.m4 --rw-r--r-- root/root usr/share/aclocal/ax_boost_locale.m4 --rw-r--r-- root/root usr/share/aclocal/ax_boost_log.m4 --rw-r--r-- root/root usr/share/aclocal/ax_boost_log_setup.m4 --rw-r--r-- root/root usr/share/aclocal/ax_boost_program_options.m4 --rw-r--r-- root/root usr/share/aclocal/ax_boost_python.m4 --rw-r--r-- root/root usr/share/aclocal/ax_boost_regex.m4 --rw-r--r-- root/root usr/share/aclocal/ax_boost_serialization.m4 --rw-r--r-- root/root usr/share/aclocal/ax_boost_signals.m4 --rw-r--r-- root/root usr/share/aclocal/ax_boost_system.m4 --rw-r--r-- root/root usr/share/aclocal/ax_boost_test_exec_monitor.m4 --rw-r--r-- root/root usr/share/aclocal/ax_boost_thread.m4 --rw-r--r-- root/root usr/share/aclocal/ax_boost_unit_test_framework.m4 --rw-r--r-- root/root usr/share/aclocal/ax_boost_wave.m4 --rw-r--r-- root/root usr/share/aclocal/ax_boost_wserialization.m4 --rw-r--r-- root/root usr/share/aclocal/ax_build_date_epoch.m4 --rw-r--r-- root/root usr/share/aclocal/ax_c99_inline.m4 --rw-r--r-- root/root usr/share/aclocal/ax_c___attribute__.m4 --rw-r--r-- root/root usr/share/aclocal/ax_c_arithmetic_rshift.m4 --rw-r--r-- root/root usr/share/aclocal/ax_c_compile_value.m4 --rw-r--r-- root/root usr/share/aclocal/ax_c_declare_block.m4 --rw-r--r-- root/root usr/share/aclocal/ax_c_float_words_bigendian.m4 --rw-r--r-- root/root usr/share/aclocal/ax_c_long_long.m4 --rw-r--r-- root/root usr/share/aclocal/ax_c_referenceable_passed_va_list.m4 --rw-r--r-- root/root usr/share/aclocal/ax_c_var_func.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cache_size.m4 --rw-r--r-- root/root usr/share/aclocal/ax_caolan_check_package.m4 --rw-r--r-- root/root usr/share/aclocal/ax_caolan_search_package.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cc_for_build.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cc_maxopt.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cf_ebcdic.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cflags_aix_option.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cflags_force_c89.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cflags_hpux_option.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cflags_irix_option.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cflags_no_writable_strings.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cflags_strict_prototypes.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cflags_sun_option.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cflags_warn_all.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_aligned_access_required.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_allocated_ctime.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk__v.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk__x_escapes.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_and.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_argind.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_array_delete.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_array_delete_elem.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_array_in.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_asort.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_asorti.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_associative_array.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_atan2.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_compl.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_conditional_expression.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_cos.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_environ.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_errno.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_exit.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_exp.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_gensub.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_getline.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_gsub.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_ignorecase.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_index.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_int.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_length.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_log.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_lshift.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_match_2parms.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_match_3parms.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_operator_multiply_multiply.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_operator_square.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_or.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_printf.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_rand.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_rshift.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_sin.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_split.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_sprintf.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_sqrt.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_srand.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_strftime.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_strtonum.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_sub.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_substr.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_system.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_systime.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_tolower.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_toupper.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_user_defined_functions.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_var_regexp.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_variable_value_pairs.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_awk_xor.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_class.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_classpath.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_compile_flag.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_define.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_docbook_dtd.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_docbook_xslt.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_docbook_xslt_min.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_dos_filesys.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_enable_debug.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_func_in.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_gd.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_gir_symbols_gjs.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_girs_gjs.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_gl.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_glu.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_glut.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_glx.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_gnu_make.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_icu.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_java_home.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_java_plugin.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_junit.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_library.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_link_flag.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_mysql.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_mysql_db.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_mysqlr.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_off64_t.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_openssl.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_page_aligned_malloc.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_pathfind.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_pathname_style.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_pgsql_db.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_posix_regcomp.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_posix_sysinfo.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_postgres_db.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_preproc_flag.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_rqrd_class.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_sign.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_strcspn.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_strftime.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_struct_for.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_symbol.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_sys_siglist.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_typedef.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_uname_syscall.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_user.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_vscript.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_x86_features.m4 --rw-r--r-- root/root usr/share/aclocal/ax_check_zlib.m4 --rw-r--r-- root/root usr/share/aclocal/ax_code_coverage.m4 --rw-r--r-- root/root usr/share/aclocal/ax_compare_version.m4 --rw-r--r-- root/root usr/share/aclocal/ax_compile_check_sizeof.m4 --rw-r--r-- root/root usr/share/aclocal/ax_compiler_flags.m4 --rw-r--r-- root/root usr/share/aclocal/ax_compiler_flags_cflags.m4 --rw-r--r-- root/root usr/share/aclocal/ax_compiler_flags_cxxflags.m4 --rw-r--r-- root/root usr/share/aclocal/ax_compiler_flags_gir.m4 --rw-r--r-- root/root usr/share/aclocal/ax_compiler_flags_ldflags.m4 --rw-r--r-- root/root usr/share/aclocal/ax_compiler_vendor.m4 --rw-r--r-- root/root usr/share/aclocal/ax_compiler_version.m4 --rw-r--r-- root/root usr/share/aclocal/ax_compute_relative_paths.m4 --rw-r--r-- root/root usr/share/aclocal/ax_compute_standard_relative_paths.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cond_with_level.m4 --rw-r--r-- root/root usr/share/aclocal/ax_config_feature.m4 --rw-r--r-- root/root usr/share/aclocal/ax_configure_args.m4 --rw-r--r-- root/root usr/share/aclocal/ax_count_cpus.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cpu_freq.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cpu_vendor.m4 --rw-r--r-- root/root usr/share/aclocal/ax_create_generic_config.m4 --rw-r--r-- root/root usr/share/aclocal/ax_create_pkgconfig_info.m4 --rw-r--r-- root/root usr/share/aclocal/ax_create_stdint_h.m4 --rw-r--r-- root/root usr/share/aclocal/ax_create_target_h.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cvs.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_bool.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_compile_stdcxx.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_compile_stdcxx_0x.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_compile_stdcxx_11.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_compile_stdcxx_14.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_compile_stdcxx_17.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_complex_math_in_namespace_std.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_const_cast.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_cppflags_std_lang.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_cxxflags_std_lang.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_default_template_parameters.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_delete_method.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_dtor_after_atexit.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_dynamic_cast.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_enum_computations.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_enum_computations_with_cast.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_erase_iterator_type.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_exceptions.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_explicit.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_explicit_instantiations.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_explicit_template_function_qualification.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_extern_template.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_full_specialization_syntax.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_function_nontype_parameters.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_function_try_blocks.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_gcc_abi_demangle.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_gnucxx_hashmap.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_have_bad_function_call.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_have_bind.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_have_bit_and.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_have_bit_or.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_have_bit_xor.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_have_complex.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_have_complex_math1.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_have_complex_math2.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_have_cref.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_have_empty_iostream.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_have_ext_hash_map.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_have_ext_hash_set.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_have_ext_slist.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_have_freeze_sstream.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_have_function.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_have_hash.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_have_ieee_math.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_have_is_bind_expression.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_have_is_placeholder.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_have_koenig_lookup.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_have_long_long_for_iostream.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_have_mem_fn.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_have_numeric_limits.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_have_placeholders.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_have_ref.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_have_reference_wrapper.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_have_sstream.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_have_std.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_have_stl.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_have_string_push_back.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_have_system_v_math.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_have_valarray.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_have_vector_at.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_header_pre_stdcxx.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_header_stdcxx_0x.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_header_stdcxx_98.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_header_stdcxx_tr1.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_header_tr1_unordered_map.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_header_tr1_unordered_set.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_header_unordered_map.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_header_unordered_set.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_ldflags_std_lang.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_member_constants.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_member_templates.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_member_templates_outside_class.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_mutable.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_namespace_std.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_namespaces.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_new_for_scoping.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_old_for_scoping.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_partial_ordering.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_partial_specialization.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_reinterpret_cast.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_restrict_this.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_rtti.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_rvalue_references.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_static_cast.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_stlport_hashmap.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_template_keyword_qualifier.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_template_qualified_base_class.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_template_qualified_return_type.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_template_scoped_argument_matching.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_templates.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_templates_as_template_arguments.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_typename.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_use_numtrait.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_var_prettyfunc.m4 --rw-r--r-- root/root usr/share/aclocal/ax_cxx_verbose_terminate_handler.m4 --rw-r--r-- root/root usr/share/aclocal/ax_czmq.m4 --rw-r--r-- root/root usr/share/aclocal/ax_decl_wchar_max.m4 --rw-r--r-- root/root usr/share/aclocal/ax_define_integer_bits.m4 --rw-r--r-- root/root usr/share/aclocal/ax_define_sub_path.m4 --rw-r--r-- root/root usr/share/aclocal/ax_dirname.m4 --rw-r--r-- root/root usr/share/aclocal/ax_dist_msi.m4 --rw-r--r-- root/root usr/share/aclocal/ax_dist_rpm.m4 --rw-r--r-- root/root usr/share/aclocal/ax_dll_string.m4 --rw-r--r-- root/root usr/share/aclocal/ax_enable_builddir.m4 --rw-r--r-- root/root usr/share/aclocal/ax_execinfo.m4 --rw-r--r-- root/root usr/share/aclocal/ax_expand_prefix.m4 --rw-r--r-- root/root usr/share/aclocal/ax_ext.m4 --rw-r--r-- root/root usr/share/aclocal/ax_ext_check_header.m4 --rw-r--r-- root/root usr/share/aclocal/ax_ext_have_lib.m4 --rw-r--r-- root/root usr/share/aclocal/ax_extend_srcdir.m4 --rw-r--r-- root/root usr/share/aclocal/ax_extra_dist.m4 --rw-r--r-- root/root usr/share/aclocal/ax_f77_cmain_fflags.m4 --rw-r--r-- root/root usr/share/aclocal/ax_f90_header.m4 --rw-r--r-- root/root usr/share/aclocal/ax_f90_internal_headmod.m4 --rw-r--r-- root/root usr/share/aclocal/ax_f90_library.m4 --rw-r--r-- root/root usr/share/aclocal/ax_f90_library_setup.m4 --rw-r--r-- root/root usr/share/aclocal/ax_f90_module.m4 --rw-r--r-- root/root usr/share/aclocal/ax_f90_module_extension.m4 --rw-r--r-- root/root usr/share/aclocal/ax_f90_module_flag.m4 --rw-r--r-- root/root usr/share/aclocal/ax_fc_check_define.m4 --rw-r--r-- root/root usr/share/aclocal/ax_file_escapes.m4 --rw-r--r-- root/root usr/share/aclocal/ax_find_hamcrest.m4 --rw-r--r-- root/root usr/share/aclocal/ax_find_junit.m4 --rw-r--r-- root/root usr/share/aclocal/ax_find_scala_stdlib.m4 --rw-r--r-- root/root usr/share/aclocal/ax_forceinline.m4 --rw-r--r-- root/root usr/share/aclocal/ax_func_accept_argtypes.m4 --rw-r--r-- root/root usr/share/aclocal/ax_func_getopt_long.m4 --rw-r--r-- root/root usr/share/aclocal/ax_func_memmove.m4 --rw-r--r-- root/root usr/share/aclocal/ax_func_mkdir.m4 --rw-r--r-- root/root usr/share/aclocal/ax_func_posix_memalign.m4 --rw-r--r-- root/root usr/share/aclocal/ax_func_snprintf.m4 --rw-r--r-- root/root usr/share/aclocal/ax_func_which_gethostbyname_r.m4 --rw-r--r-- root/root usr/share/aclocal/ax_func_which_getservbyname_r.m4 --rw-r--r-- root/root usr/share/aclocal/ax_gcc_archflag.m4 --rw-r--r-- root/root usr/share/aclocal/ax_gcc_builtin.m4 --rw-r--r-- root/root usr/share/aclocal/ax_gcc_const_call.m4 --rw-r--r-- root/root usr/share/aclocal/ax_gcc_func_attribute.m4 --rw-r--r-- root/root usr/share/aclocal/ax_gcc_lib.m4 --rw-r--r-- root/root usr/share/aclocal/ax_gcc_libgcc_eh.m4 --rw-r--r-- root/root usr/share/aclocal/ax_gcc_libsupcxx.m4 --rw-r--r-- root/root usr/share/aclocal/ax_gcc_malloc_call.m4 --rw-r--r-- root/root usr/share/aclocal/ax_gcc_var_attribute.m4 --rw-r--r-- root/root usr/share/aclocal/ax_gcc_warn_unused_result.m4 --rw-r--r-- root/root usr/share/aclocal/ax_gcc_x86_avx_xgetbv.m4 --rw-r--r-- root/root usr/share/aclocal/ax_gcc_x86_cpu_supports.m4 --rw-r--r-- root/root usr/share/aclocal/ax_gcc_x86_cpuid.m4 --rw-r--r-- root/root usr/share/aclocal/ax_generate_changelog.m4 --rw-r--r-- root/root usr/share/aclocal/ax_gnu_autotest.m4 --rw-r--r-- root/root usr/share/aclocal/ax_have_adns.m4 --rw-r--r-- root/root usr/share/aclocal/ax_have_epoll.m4 --rw-r--r-- root/root usr/share/aclocal/ax_have_poll.m4 --rw-r--r-- root/root usr/share/aclocal/ax_have_qt.m4 --rw-r--r-- root/root usr/share/aclocal/ax_have_select.m4 --rw-r--r-- root/root usr/share/aclocal/ax_include_strcasecmp.m4 --rw-r--r-- root/root usr/share/aclocal/ax_install_files.m4 --rw-r--r-- root/root usr/share/aclocal/ax_is_release.m4 --rw-r--r-- root/root usr/share/aclocal/ax_java_check_class.m4 --rw-r--r-- root/root usr/share/aclocal/ax_java_options.m4 --rw-r--r-- root/root usr/share/aclocal/ax_jni_include_dir.m4 --rw-r--r-- root/root usr/share/aclocal/ax_lapack.m4 --rw-r--r-- root/root usr/share/aclocal/ax_lib_beecrypt.m4 --rw-r--r-- root/root usr/share/aclocal/ax_lib_cgal_core.m4 --rw-r--r-- root/root usr/share/aclocal/ax_lib_crypto.m4 --rw-r--r-- root/root usr/share/aclocal/ax_lib_curl.m4 --rw-r--r-- root/root usr/share/aclocal/ax_lib_ev.m4 --rw-r--r-- root/root usr/share/aclocal/ax_lib_expat.m4 --rw-r--r-- root/root usr/share/aclocal/ax_lib_firebird.m4 --rw-r--r-- root/root usr/share/aclocal/ax_lib_gcrypt.m4 --rw-r--r-- root/root usr/share/aclocal/ax_lib_gdal.m4 --rw-r--r-- root/root usr/share/aclocal/ax_lib_hdf5.m4 --rw-r--r-- root/root usr/share/aclocal/ax_lib_id3.m4 --rw-r--r-- root/root usr/share/aclocal/ax_lib_libkml.m4 --rw-r--r-- root/root usr/share/aclocal/ax_lib_metis.m4 --rw-r--r-- root/root usr/share/aclocal/ax_lib_mysql.m4 --rw-r--r-- root/root usr/share/aclocal/ax_lib_mysqlcppconn.m4 --rw-r--r-- root/root usr/share/aclocal/ax_lib_netcdf4.m4 --rw-r--r-- root/root usr/share/aclocal/ax_lib_nettle.m4 --rw-r--r-- root/root usr/share/aclocal/ax_lib_nokalva.m4 --rw-r--r-- root/root usr/share/aclocal/ax_lib_oracle_occi.m4 --rw-r--r-- root/root usr/share/aclocal/ax_lib_oracle_oci.m4 --rw-r--r-- root/root usr/share/aclocal/ax_lib_orbit2.m4 --rw-r--r-- root/root usr/share/aclocal/ax_lib_postgresql.m4 --rw-r--r-- root/root usr/share/aclocal/ax_lib_readline.m4 --rw-r--r-- root/root usr/share/aclocal/ax_lib_samtools.m4 --rw-r--r-- root/root usr/share/aclocal/ax_lib_socket_nsl.m4 --rw-r--r-- root/root usr/share/aclocal/ax_lib_sqlite3.m4 --rw-r--r-- root/root usr/share/aclocal/ax_lib_tabix.m4 --rw-r--r-- root/root usr/share/aclocal/ax_lib_taglib.m4 --rw-r--r-- root/root usr/share/aclocal/ax_lib_trace.m4 --rw-r--r-- root/root usr/share/aclocal/ax_lib_upnp.m4 --rw-r--r-- root/root usr/share/aclocal/ax_lib_wad.m4 --rw-r--r-- root/root usr/share/aclocal/ax_lib_xalan.m4 --rw-r--r-- root/root usr/share/aclocal/ax_lib_xerces.m4 --rw-r--r-- root/root usr/share/aclocal/ax_lib_xml_security.m4 --rw-r--r-- root/root usr/share/aclocal/ax_libgcj_jar.m4 --rw-r--r-- root/root usr/share/aclocal/ax_libtoolize_cflags.m4 --rw-r--r-- root/root usr/share/aclocal/ax_llvm.m4 --rw-r--r-- root/root usr/share/aclocal/ax_lua.m4 --rw-r--r-- root/root usr/share/aclocal/ax_luarocks_rock.m4 --rw-r--r-- root/root usr/share/aclocal/ax_maintainer_mode_auto_silent.m4 --rw-r--r-- root/root usr/share/aclocal/ax_missing_prog.m4 --rw-r--r-- root/root usr/share/aclocal/ax_mpi.m4 --rw-r--r-- root/root usr/share/aclocal/ax_mpip.m4 --rw-r--r-- root/root usr/share/aclocal/ax_need_awk.m4 --rw-r--r-- root/root usr/share/aclocal/ax_normalize_path.m4 --rw-r--r-- root/root usr/share/aclocal/ax_not_enable_frame_pointer.m4 --rw-r--r-- root/root usr/share/aclocal/ax_numeric_namedlevel.m4 --rw-r--r-- root/root usr/share/aclocal/ax_open62541_check_h.m4 --rw-r--r-- root/root usr/share/aclocal/ax_open62541_check_lib.m4 --rw-r--r-- root/root usr/share/aclocal/ax_open62541_path.m4 --rw-r--r-- root/root usr/share/aclocal/ax_openmp.m4 --rw-r--r-- root/root usr/share/aclocal/ax_patch_libtool_changing_cmds_ifs.m4 --rw-r--r-- root/root usr/share/aclocal/ax_path_bdb.m4 --rw-r--r-- root/root usr/share/aclocal/ax_path_generic.m4 --rw-r--r-- root/root usr/share/aclocal/ax_path_lib_pcre.m4 --rw-r--r-- root/root usr/share/aclocal/ax_path_milter.m4 --rw-r--r-- root/root usr/share/aclocal/ax_path_missing.m4 --rw-r--r-- root/root usr/share/aclocal/ax_perl_ext.m4 --rw-r--r-- root/root usr/share/aclocal/ax_perl_ext_flags.m4 --rw-r--r-- root/root usr/share/aclocal/ax_perl_module_version.m4 --rw-r--r-- root/root usr/share/aclocal/ax_pgsql_priv_root.m4 --rw-r--r-- root/root usr/share/aclocal/ax_pkg_check_modules.m4 --rw-r--r-- root/root usr/share/aclocal/ax_pkg_mico.m4 --rw-r--r-- root/root usr/share/aclocal/ax_pkg_swig.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prefix_config_h.m4 --rw-r--r-- root/root usr/share/aclocal/ax_print_to_file.m4 --rw-r--r-- root/root usr/share/aclocal/ax_printf_size_t.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_apache.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_bison.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_bison_version.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_cc_char_subscripts.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_cc_for_build.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_cc_mpi.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_cp_s.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_crontab.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_cxx_for_build.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_cxx_mpi.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_dotnetcore_version.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_doxygen.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_f77_mpi.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_fasm.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_fasm_opt.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_fc_mpi.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_fig2dev.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_flex.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_flex_version.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_gjs.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_guile_version.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_haxe_version.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_hla.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_hla_opt.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_httpd.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_jar.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_java.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_java_cc.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_java_works.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_javac.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_javac_works.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_javadoc.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_javah.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_masm.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_masm_opt.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_md5sum.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_modprobe.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_mysql.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_mysqladmin.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_mysqld.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_mysqlimport.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_mysqlshow.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_nasm.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_nasm_opt.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_perl_modules.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_perl_version.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_pgclient.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_python_version.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_ruby_version.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_scala.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_scalac.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_scp.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_splint.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_ssh.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_tasm.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_tasm_opt.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_tcl.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_xsltproc.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_yasm.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prog_yasm_opt.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prototype.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prototype_accept.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prototype_getsockname.m4 --rw-r--r-- root/root usr/share/aclocal/ax_prototype_setsockopt.m4 --rw-r--r-- root/root usr/share/aclocal/ax_pthread.m4 --rw-r--r-- root/root usr/share/aclocal/ax_python.m4 --rw-r--r-- root/root usr/share/aclocal/ax_python_config_var.m4 --rw-r--r-- root/root usr/share/aclocal/ax_python_devel.m4 --rw-r--r-- root/root usr/share/aclocal/ax_python_embed.m4 --rw-r--r-- root/root usr/share/aclocal/ax_python_module.m4 --rw-r--r-- root/root usr/share/aclocal/ax_python_module_version.m4 --rw-r--r-- root/root usr/share/aclocal/ax_require_defined.m4 --rw-r--r-- root/root usr/share/aclocal/ax_require_one_func.m4 --rw-r--r-- root/root usr/share/aclocal/ax_restore_flags.m4 --rw-r--r-- root/root usr/share/aclocal/ax_restore_flags_with_prefix.m4 --rw-r--r-- root/root usr/share/aclocal/ax_rpm_init.m4 --rw-r--r-- root/root usr/share/aclocal/ax_ruby_devel.m4 --rw-r--r-- root/root usr/share/aclocal/ax_ruby_ext.m4 --rw-r--r-- root/root usr/share/aclocal/ax_save_flags.m4 --rw-r--r-- root/root usr/share/aclocal/ax_save_flags_with_prefix.m4 --rw-r--r-- root/root usr/share/aclocal/ax_set_default_paths_system.m4 --rw-r--r-- root/root usr/share/aclocal/ax_short_sleep.m4 --rw-r--r-- root/root usr/share/aclocal/ax_silent_mode.m4 --rw-r--r-- root/root usr/share/aclocal/ax_sip_devel.m4 --rw-r--r-- root/root usr/share/aclocal/ax_spec_file.m4 --rw-r--r-- root/root usr/share/aclocal/ax_spec_package_version.m4 --rw-r--r-- root/root usr/share/aclocal/ax_split_version.m4 --rw-r--r-- root/root usr/share/aclocal/ax_string_strcasecmp.m4 --rw-r--r-- root/root usr/share/aclocal/ax_strings_strcasecmp.m4 --rw-r--r-- root/root usr/share/aclocal/ax_struct_semun.m4 --rw-r--r-- root/root usr/share/aclocal/ax_subdir_files.m4 --rw-r--r-- root/root usr/share/aclocal/ax_subst_with.m4 --rw-r--r-- root/root usr/share/aclocal/ax_swig_enable_cxx.m4 --rw-r--r-- root/root usr/share/aclocal/ax_swig_multi_module_support.m4 --rw-r--r-- root/root usr/share/aclocal/ax_swig_python.m4 --rw-r--r-- root/root usr/share/aclocal/ax_switch_flags.m4 --rw-r--r-- root/root usr/share/aclocal/ax_sys_dev_poll.m4 --rw-r--r-- root/root usr/share/aclocal/ax_sys_largefile_sensitive.m4 --rw-r--r-- root/root usr/share/aclocal/ax_sys_perlsharpbang.m4 --rw-r--r-- root/root usr/share/aclocal/ax_sys_weak_alias.m4 --rw-r--r-- root/root usr/share/aclocal/ax_sysv_ipc.m4 --rw-r--r-- root/root usr/share/aclocal/ax_tls.m4 --rw-r--r-- root/root usr/share/aclocal/ax_trilinos_amesos.m4 --rw-r--r-- root/root usr/share/aclocal/ax_trilinos_base.m4 --rw-r--r-- root/root usr/share/aclocal/ax_trilinos_epetra.m4 --rw-r--r-- root/root usr/share/aclocal/ax_trilinos_epetraext.m4 --rw-r--r-- root/root usr/share/aclocal/ax_trilinos_epetraext_hdf5.m4 --rw-r--r-- root/root usr/share/aclocal/ax_trilinos_rtop.m4 --rw-r--r-- root/root usr/share/aclocal/ax_trilinos_rythmos.m4 --rw-r--r-- root/root usr/share/aclocal/ax_trilinos_teuchos.m4 --rw-r--r-- root/root usr/share/aclocal/ax_trilinos_thyra.m4 --rw-r--r-- root/root usr/share/aclocal/ax_trilinos_thyra_epetra.m4 --rw-r--r-- root/root usr/share/aclocal/ax_trilinos_thyra_epetraext.m4 --rw-r--r-- root/root usr/share/aclocal/ax_try_awk_anyout.m4 --rw-r--r-- root/root usr/share/aclocal/ax_try_awk_expout.m4 --rw-r--r-- root/root usr/share/aclocal/ax_try_compile_java.m4 --rw-r--r-- root/root usr/share/aclocal/ax_try_run_java.m4 --rw-r--r-- root/root usr/share/aclocal/ax_type_socklen_t.m4 --rw-r--r-- root/root usr/share/aclocal/ax_upload.m4 --rw-r--r-- root/root usr/share/aclocal/ax_valgrind_check.m4 --rw-r--r-- root/root usr/share/aclocal/ax_var_pop.m4 --rw-r--r-- root/root usr/share/aclocal/ax_var_push.m4 --rw-r--r-- root/root usr/share/aclocal/ax_var_timezone_externals.m4 --rw-r--r-- root/root usr/share/aclocal/ax_very_nice.m4 --rw-r--r-- root/root usr/share/aclocal/ax_warning_default_aclocaldir.m4 --rw-r--r-- root/root usr/share/aclocal/ax_warning_default_pkgconfig.m4 --rw-r--r-- root/root usr/share/aclocal/ax_wint_t.m4 --rw-r--r-- root/root usr/share/aclocal/ax_with_apxs.m4 --rw-r--r-- root/root usr/share/aclocal/ax_with_build_path.m4 --rw-r--r-- root/root usr/share/aclocal/ax_with_curses.m4 --rw-r--r-- root/root usr/share/aclocal/ax_with_curses_extra.m4 --rw-r--r-- root/root usr/share/aclocal/ax_with_dmalloc.m4 --rw-r--r-- root/root usr/share/aclocal/ax_with_mpatrol.m4 --rw-r--r-- root/root usr/share/aclocal/ax_with_prog.m4 --rw-r--r-- root/root usr/share/aclocal/ax_xercesc.m4 --rw-r--r-- root/root usr/share/aclocal/ax_xsdcxx.m4 --rw-r--r-- root/root usr/share/aclocal/ax_xtra_classpath.m4 --rw-r--r-- root/root usr/share/aclocal/ax_zmq.m4 --rw-r--r-- root/root usr/share/aclocal/ax_zoneinfo.m4 -drwxr-xr-x root/root usr/share/autoconf-archive/ --rw-r--r-- root/root usr/share/autoconf-archive/AUTHORS --rw-r--r-- root/root usr/share/autoconf-archive/COPYING --rw-r--r-- root/root usr/share/autoconf-archive/COPYING.EXCEPTION --rw-r--r-- root/root usr/share/autoconf-archive/README diff --git a/autoconf-archive/.signature b/autoconf-archive/.signature deleted file mode 100644 index e2fb7da36..000000000 --- a/autoconf-archive/.signature +++ /dev/null @@ -1,5 +0,0 @@ -untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/eLSzF8N5QY9owywBgdCtLQ+EpvNSpKHrmINEXzJgyVMvR3dbVoXnAj8aRpCMs6FlRjOV84FzkbuiIeXdCH9AAU= -SHA256 (Pkgfile) = f3ddfdb1a0aa06bde07e856770b7af7df9a290209f79cea485ca7330f5b1ac6f -SHA256 (.footprint) = 5de2fdd956740c0eef1049f204c532241d0ae5ccedfd457b3e422a74eb904874 -SHA256 (autoconf-archive-2017.03.21.tar.xz) = 386ad455f12bdeb3a7d19280441a5ab77355142349200ff11040a8d9d455d765 diff --git a/autoconf-archive/Pkgfile b/autoconf-archive/Pkgfile deleted file mode 100644 index 8e2a24bbf..000000000 --- a/autoconf-archive/Pkgfile +++ /dev/null @@ -1,19 +0,0 @@ -# Description: A collection of freely re-usable Autoconf macros. -# URL: http://www.gnu.org/software/autoconf-archive/ -# Maintainer: Danny Rawlins, crux at romster dot me -# Packager: Danny Rawlins, crux at romster dot me - -name=autoconf-archive -version=2017.03.21 -release=1 -source=(http://ftpmirror.gnu.org/$name/$name-$version.tar.xz) - -build() { - cd $name-$version - - ./configure --prefix=/usr - make - make DESTDIR=$PKG install - - rm -r $PKG/usr/share/info -}

1 0

ports/contrib (3.4): [notify] gst-libav: change build system to meson, dependency change: - autoconf-archive + ffmpeg
by crux＠crux.nu 02 May '19

02 May '19

commit bc2490d1ba4a3a286c845c679d34dbe5dcf063f9 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Thu May 2 19:24:11 2019 +1000 [notify] gst-libav: change build system to meson, dependency change: - autoconf-archive + ffmpeg diff --git a/gst-libav/.footprint b/gst-libav/.footprint index 7e48a6de..4d37e591 100644 --- a/gst-libav/.footprint +++ b/gst-libav/.footprint @@ -1,6 +1,4 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/gstreamer-1.0/ --rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstlibav.la -rwxr-xr-x root/root usr/lib/gstreamer-1.0/libgstlibav.so -drwxr-xr-x root/root usr/share/ diff --git a/gst-libav/.signature b/gst-libav/.signature index d7a83bae..26476dc8 100644 --- a/gst-libav/.signature +++ b/gst-libav/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3/hqLGNXCptFJVMge/rJBcFCLvPOTF5gJ/kfP7JqCHjll+mLBq0Z2PNDneoqXI5uWJGFUnYH/CxsN1ROEwJTpgU= -SHA256 (Pkgfile) = 84d6e276bb37b251145efa60c43709f348663ea434b405f11fdd6c31bc48008c -SHA256 (.footprint) = d74c92d6ce61aa73f319dc0142b76031fc1eed2bf3609fbe282054e9dc1e06de +RWSagIOpLGJF3633opyJLe3wRjRVATXilJPoAq8sHyo3YoM0O6QyKxNWi//Ou9ci3DN6By5WgFpiQZ/QMD/A/DwLXZlYZcA68gg= +SHA256 (Pkgfile) = da4b1b230d638f752d2d92937d6502c9d5d9475d54a73c61893e72556acc4844 +SHA256 (.footprint) = 2b4603029b15032a74098cf497de9777c10b2c1d1fcca733daa90fdac79a1073 SHA256 (gst-libav-1.16.0.tar.xz) = dfac119043a9cfdcacd7acde77f674ab172cf2537b5812be52f49e9cddc53d9a diff --git a/gst-libav/Pkgfile b/gst-libav/Pkgfile index a15d11a1..b588ae82 100644 --- a/gst-libav/Pkgfile +++ b/gst-libav/Pkgfile @@ -1,24 +1,16 @@ # Description: Gstreamer libav Plugin. # URL: https://gstreamer.freedesktop.org/modules/gst-libav.html # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: autoconf-archive gst-plugins-base yasm +# Depends on: ffmpeg gst-plugins-base name=gst-libav version=1.16.0 -release=1 +release=2 source=(https://gstreamer.freedesktop.org/src/$name/$name-$version.tar.xz) build() { cd $name-$version - - ./configure \ - --prefix=/usr \ - --without-system-libav - - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - - make - make DESTDIR=$PKG install - - rm -r $PKG/usr/share/gtk-doc + meson build --prefix /usr + ninja -C build -j ${JOBS:-1} + DESTDIR="$PKG" ninja -C build install }

1 0

ports/opt (3.4): samba: update to 4.9.7
by crux＠crux.nu 01 May '19

01 May '19

commit 021f0e806072c51924b0d38be872a32772802898 Author: Juergen Daubert <jue(a)jue.li> Date: Wed May 1 15:22:23 2019 +0200 samba: update to 4.9.7 diff --git a/samba/.footprint b/samba/.footprint index 1b25cbc93..1cdf0c577 100644 --- a/samba/.footprint +++ b/samba/.footprint @@ -171,9 +171,9 @@ lrwxrwxrwx root/root usr/lib/libsamba-errors.so -> libsamba-errors.so.1 lrwxrwxrwx root/root usr/lib/libsamba-hostconfig.so -> libsamba-hostconfig.so.0.0.1 lrwxrwxrwx root/root usr/lib/libsamba-hostconfig.so.0 -> libsamba-hostconfig.so.0.0.1 -rwxr-xr-x root/root usr/lib/libsamba-hostconfig.so.0.0.1 -lrwxrwxrwx root/root usr/lib/libsamba-passdb.so -> libsamba-passdb.so.0.27.1 -lrwxrwxrwx root/root usr/lib/libsamba-passdb.so.0 -> libsamba-passdb.so.0.27.1 --rwxr-xr-x root/root usr/lib/libsamba-passdb.so.0.27.1 +lrwxrwxrwx root/root usr/lib/libsamba-passdb.so -> libsamba-passdb.so.0.27.2 +lrwxrwxrwx root/root usr/lib/libsamba-passdb.so.0 -> libsamba-passdb.so.0.27.2 +-rwxr-xr-x root/root usr/lib/libsamba-passdb.so.0.27.2 lrwxrwxrwx root/root usr/lib/libsamba-util.so -> libsamba-util.so.0.0.1 lrwxrwxrwx root/root usr/lib/libsamba-util.so.0 -> libsamba-util.so.0.0.1 -rwxr-xr-x root/root usr/lib/libsamba-util.so.0.0.1 diff --git a/samba/.signature b/samba/.signature index bc9a4f22e..11b4ad783 100644 --- a/samba/.signature +++ b/samba/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/boIsSTW+BluAPFFE48vLnvTF/34PcDhqUiAlX4jll7J6mqItjOusFh1yc2qepgic4noChp7qF3TrT5FBdTdmgY= -SHA256 (Pkgfile) = 762380eddecfecf1e78b2eb853909309f49a01be3c7b810b68bf93adcb25b054 -SHA256 (.footprint) = d92cf43b3d5035118b39c6aa39de9d24ac90ab1401abb2450cc024e895cff26d -SHA256 (samba-4.9.6.tar.gz) = c9205a651a83d69e200fec9dd65e9fa360f0c75ab3275b3dcb74e5cbaec60807 +RWSE3ohX2g5d/e0Z34TPbvszpfo811uT7u0L2g7l8gRpBPvEwahk0giUrRpOSPr3z8PItc27aGDZYfPuxSQ2Awr3qkQxaZZNVgc= +SHA256 (Pkgfile) = bd71c073b35ede3f1749c175af9c6a908c9890fdbca9cce43bd32dbd5144e3f1 +SHA256 (.footprint) = bc577fa239e32fa537732dfd4343614763a1c0632edec5f4bb6c435e948427ac +SHA256 (samba-4.9.7.tar.gz) = 44e5bc58dcae6d86ca8d5f269fa927f20ff91bce97cde86fe4e83addcb89c001 SHA256 (samba) = 75bccea892422b5aebe8d2f9ce9b9c42ddc3cbdeccfd16f3161c07c1eb3feff0 diff --git a/samba/Pkgfile b/samba/Pkgfile index 96805cb47..d9df06e41 100644 --- a/samba/Pkgfile +++ b/samba/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libarchive libcap popt tdb tevent name=samba -version=4.9.6 +version=4.9.7 release=1 source=(https://www.samba.org/samba/ftp/stable/$name-$version.tar.gz \ samba)

1 0

ports/opt (3.4): poppler-qt5: update to 0.76.1
by crux＠crux.nu 01 May '19

01 May '19

commit 797910f69c0323fa5834944d443bafae15c742b6 Author: Juergen Daubert <jue(a)jue.li> Date: Wed May 1 15:09:20 2019 +0200 poppler-qt5: update to 0.76.1 diff --git a/poppler-qt5/.signature b/poppler-qt5/.signature index 08c55c4b3..a467198c7 100644 --- a/poppler-qt5/.signature +++ b/poppler-qt5/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/REet8E36Z9rHluxrkQPn0hz/bMDbZqr+a6EWHvmMtQw+EURGu1mOrnctDW13QFjFFOG+e8jWs5tqottX5tfRQQ= -SHA256 (Pkgfile) = bc07a654b0f6f9a2e7b2dfee52a959750871c6d2c9dca2ef6590ae1138c1f863 +RWSE3ohX2g5d/QQWn3zlmcsPqnJNCtRITvErLKtcLwUGnZ9tkGXqVN+8UntMVkqjepdJQsGglkrKt74bGduQK6oGxvVSRGIjAw0= +SHA256 (Pkgfile) = 1126837aac035f6add157af620d88bfe85828b9bc68eeb419d64d666d453db85 SHA256 (.footprint) = 84dc646bbfed26f23c3c13e0bee2bf7f75062707eb7da1c4bc54debfb9e0046c -SHA256 (poppler-0.76.0.tar.xz) = 370f5fcfe2bbf0c76fc394d338cd72ed7f2044b67f4eb4b115eb074ccfc70d63 +SHA256 (poppler-0.76.1.tar.xz) = e62cd4053f851eecc4a6aa2b81d739fbab1d67b3c60b31ebac7049483cc617b1 diff --git a/poppler-qt5/Pkgfile b/poppler-qt5/Pkgfile index 49b30cbc1..fa84ba75d 100644 --- a/poppler-qt5/Pkgfile +++ b/poppler-qt5/Pkgfile @@ -4,7 +4,7 @@ # Depends on: qt5 poppler name=poppler-qt5 -version=0.76.0 +version=0.76.1 release=1 source=(https://poppler.freedesktop.org/poppler-$version.tar.xz)

1 0

ports/opt (3.4): poppler-glib: update to 0.76.1
by crux＠crux.nu 01 May '19

01 May '19

commit a689c3f61f98c91163446c93b5e6c757736764cd Author: Juergen Daubert <jue(a)jue.li> Date: Wed May 1 15:09:08 2019 +0200 poppler-glib: update to 0.76.1 diff --git a/poppler-glib/.signature b/poppler-glib/.signature index 933cd239a..236262ed3 100644 --- a/poppler-glib/.signature +++ b/poppler-glib/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/VwbghMb1fx6oM7Qa2717JILCbNk2fy7W/LxlL5whChDaAAnuxveF2ROoNYsMbwLcr2qveHcDX+58F1YT/HZfgQ= -SHA256 (Pkgfile) = b5071f732dcfdc1acc12f58f1c78e1530af55a17fdf308ed67245bee33369dbd +RWSE3ohX2g5d/TPp1uHWxFO0RS+sB+nClvzLflezj3O/XECc7KSPSGo8yshzuVM5jjCDJmKeVZsaQB3M+gp+o36I+mvvhDe03wA= +SHA256 (Pkgfile) = b3b474ffc00aa81736c32c3ff56c561e38f36aceaf3530a9b0af7b0043f2f407 SHA256 (.footprint) = 5ced2b50a88da1830adf5079b27aed506ed33a3b67794813290903cc612c7df2 -SHA256 (poppler-0.76.0.tar.xz) = 370f5fcfe2bbf0c76fc394d338cd72ed7f2044b67f4eb4b115eb074ccfc70d63 +SHA256 (poppler-0.76.1.tar.xz) = e62cd4053f851eecc4a6aa2b81d739fbab1d67b3c60b31ebac7049483cc617b1 diff --git a/poppler-glib/Pkgfile b/poppler-glib/Pkgfile index bcc0d1d00..53d74f615 100644 --- a/poppler-glib/Pkgfile +++ b/poppler-glib/Pkgfile @@ -4,7 +4,7 @@ # Depends on: gobject-introspection poppler name=poppler-glib -version=0.76.0 +version=0.76.1 release=1 source=(https://poppler.freedesktop.org/poppler-$version.tar.xz)

1 0

ports/opt (3.4): poppler: update to 0.76.1
by crux＠crux.nu 01 May '19

01 May '19

commit eddce199f0bfee25bfd4c316aaae99ca620eb679 Author: Juergen Daubert <jue(a)jue.li> Date: Wed May 1 15:08:46 2019 +0200 poppler: update to 0.76.1 diff --git a/poppler/.signature b/poppler/.signature index 924024fd2..315f145fb 100644 --- a/poppler/.signature +++ b/poppler/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/dXvnBE9qS6PfcjvQoo2r7U2+mVw1RPjKwY5Uuk+wC6rAebdiPOHqQ2360UU24FhGDYkbtw4PTLHCDsloebycQ8= -SHA256 (Pkgfile) = 85459a071e92dbd30e5ace3652099c4816a638330803d73ce262aab1625a5b82 +RWSE3ohX2g5d/e0YPfiZyN3Y/DdA5RaXI15g9wdhHXcJj8MasJJVrLl1WxbnZLHXrlb/uBo7QKV/vfXJ3Slroro8dVfXuwuGPwA= +SHA256 (Pkgfile) = 970896d3d3f19a89995d912ceffed85033397988a994bc3f37a2933cabc88b8a SHA256 (.footprint) = d9ca35063e978758734c9af63208fbf55e33f345d79827914d63baee55e9780e -SHA256 (poppler-0.76.0.tar.xz) = 370f5fcfe2bbf0c76fc394d338cd72ed7f2044b67f4eb4b115eb074ccfc70d63 +SHA256 (poppler-0.76.1.tar.xz) = e62cd4053f851eecc4a6aa2b81d739fbab1d67b3c60b31ebac7049483cc617b1 diff --git a/poppler/Pkgfile b/poppler/Pkgfile index d48ac9bd8..636017c4a 100644 --- a/poppler/Pkgfile +++ b/poppler/Pkgfile @@ -4,7 +4,7 @@ # Depends on: cmake cairo lcms2 name=poppler -version=0.76.0 +version=0.76.1 release=1 source=(https://poppler.freedesktop.org/poppler-$version.tar.xz)

1 0