diff --git a/.gitignore b/.gitignore index 5794953..bd22157 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /aom-1.0.0.tar.gz +/aom-d0076f5.tar.gz diff --git a/0001-Add-symbol-exports-needed-by-examples-analyzer-and-e.patch b/0001-Add-symbol-exports-needed-by-examples-analyzer-and-e.patch new file mode 100644 index 0000000..e04fa56 --- /dev/null +++ b/0001-Add-symbol-exports-needed-by-examples-analyzer-and-e.patch @@ -0,0 +1,45 @@ +From 4b90cc60118f0aed08853ae102c560762fb74627 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= +Date: Fri, 14 Sep 2018 23:17:10 +0200 +Subject: [PATCH] Add symbol exports needed by examples/analyzer and + examples/inspect + +Added to aom/exports_com: +aom_free + +Added to av1/exports_com: +ifd_init +ifd_inspect + +BUG= aomedia:2161 + +Change-Id: Ide307b949c886fa8a0398e200980c80b58e3e74e +--- + aom/exports_com | 1 + + av1/exports_com | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/aom/exports_com b/aom/exports_com +index 2798bd51a..cf99bc5d9 100644 +--- a/aom/exports_com ++++ b/aom/exports_com +@@ -9,6 +9,7 @@ text aom_codec_iface_name + text aom_codec_version + text aom_codec_version_extra_str + text aom_codec_version_str ++text aom_free + text aom_img_alloc + text aom_img_alloc_with_border + text aom_img_flip +diff --git a/av1/exports_com b/av1/exports_com +index 5c8e0e09d..e49e0dc5f 100644 +--- a/av1/exports_com ++++ b/av1/exports_com +@@ -1,2 +1,4 @@ + text aom_read_obu_header_and_size + text av1_resize_frame420 ++text ifd_init ++text ifd_inspect +-- +2.17.1 + diff --git a/aom.spec b/aom.spec index 1836d56..5ebd1a1 100644 --- a/aom.spec +++ b/aom.spec @@ -1,22 +1,26 @@ %global sover 0 # Use commit with updated changelog for correct versioning -%global commit 0ddc150516b7672101265eac032a11a9aae4cb53 +%global commit d0076f507a6027455540e2e4f25f84ca38803e07 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global snapshotdate 20180911 +%global snapshotdate 20180925 +%global prerelease 1 Name: aom Version: 1.0.0 -Release: 4%{?dist} +Release: 5.%{?prerelease:%{snapshotdate}git%{shortcommit}}%{?dist} Summary: Royalty-free next-generation video format License: BSD URL: http://aomedia.org/ # We want to keep the git data for versioning aom.pc correctly # so we can't download the archive directly from the repo. -Source0: %{name}-%{version}.tar.gz +Source0: %{name}-%{shortcommit}.tar.gz Source1: makesrc.sh +# https://bugs.chromium.org/p/aomedia/issues/detail?id=2161 +Patch0: 0001-Add-symbol-exports-needed-by-examples-analyzer-and-e.patch + BuildRequires: gcc-c++ BuildRequires: gcc BuildRequires: cmake3 @@ -72,7 +76,7 @@ video format. %prep -%autosetup -p1 -n %{name}-%{version} +%autosetup -p1 -n %{name}-%{commit} %build @@ -97,7 +101,8 @@ mkdir _build && cd _build %endif -DCONFIG_WEBM_IO=1 \ -DENABLE_DOCS=1 \ - -DCONFIG_ANALYZER=1 + -DCONFIG_ANALYZER=1 \ + -DCONFIG_LOWBITDEPTH=1 %make_build @@ -134,6 +139,11 @@ install -pm 0755 examples/analyzer %{buildroot}%{_bindir}/aomanalyzer %changelog +* Tue Sep 25 2018 Robert-André Mauchin - 1.0.0-5.20180925gitd0076f5 +- Update to commit d0076f507a6027455540e2e4f25f84ca38803e07 +- Set CONFIG_LOWBITDEPTH to 1 +- Fix #1632658 + * Thu Sep 13 2018 Robert-André Mauchin - 1.0.0-4 - Split the package into libs/tools diff --git a/makesrc.sh b/makesrc.sh index 79a7a3a..b382b6e 100755 --- a/makesrc.sh +++ b/makesrc.sh @@ -8,18 +8,18 @@ SHORT=${COMMIT:0:7} echo -e "\nCreate git snapshot\n" echo "Cloning..." -rm -rf $NAME-$VERSION -git clone https://aomedia.googlesource.com/aom $NAME-$VERSION +rm -rf $NAME-$COMMIT +git clone https://aomedia.googlesource.com/aom $NAME-$COMMIT echo "Getting commit..." -pushd $NAME-$VERSION +pushd $NAME-$COMMIT git checkout $COMMIT popd echo "Archiving..." -tar czf $NAME-$VERSION.tar.gz $NAME-$VERSION/ +tar czf $NAME-$SHORT.tar.gz $NAME-$COMMIT/ echo "Cleaning..." -rm -rf $NAME-$VERSION +rm -rf $NAME-$COMMIT echo "Done." diff --git a/sources b/sources index 42a6063..ee5b599 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aom-1.0.0.tar.gz) = 467aeaa02dee485a7f8d87abe1ab3ee3c847f355db8897250f300e47c35e678d8aa0e34e1a1faeeda57c0faabb5b2c6f99f0a82e6177dbda51d4d90de6c26d0f +SHA512 (aom-d0076f5.tar.gz) = 6fcbe7d76788544f59e1338084d4245077a986308e2405199531ca9b4d24c9b81d5a51e012118d9cedb4e3b813b7a608f8c000e746941c5886a95462f2438369