gentoo resync : 07.10.2018

6 files changed, 157 insertions, 9 deletions

diff --git a/media-libs/libtheora/Manifest b/media-libs/libtheora/Manifest
index 6c3cb751d018..f160a76eb13e 100644
--- a/media-libs/libtheora/Manifest
+++ b/media-libs/libtheora/Manifest
@@ -1,6 +1,8 @@
-AUX libtheora-1.0_beta2-flags.patch 763 BLAKE2B 69058f8babeeacd7d382d173376af7093a4972b0e295c42bd4d422595b16ff0a9bd0101bba5eafc3f0cad3f6f98a4fb44fdbd30a7bce38852ae287af8ab6362b SHA512 72916c4ed0f9609b84af7c72b35b558ecfb2ed7533739e170ed088e06d0e82a585dcc1185f3c5a5d0644d30901459813b635df2ba951e2290bcd4303cfebc20b
-AUX libtheora-1.1.1-libpng16.patch 512 BLAKE2B 95b35dbdfce9352e63deacef7dcaa5b6e462e90257eac78e5bb43235aea2ab2b2a8365dcb70309b4427c6ed0693f2ccbef4c92dfe0229b495162542b47ff6d47 SHA512 856da5da7788863c59c9cb6c4fa102d250e60d6b302a5c118799169bcbc5350ab0bf6798f2ae2586f1d361ff9030d1d715214d8df900d7e1aa4a4e1d58f44276
-AUX libtheora-1.1.1-underlinking.patch 477 BLAKE2B 253ec0f7195abd532ebf3f0ec8e0009cbfe19ff6a27391cb4b899215e8a6b38cc9d4c49814de8ee487a4599edf95b9ed74afdf541da52730e35f634940517fc1 SHA512 00d02a773d5c95361d2d582d0147d4469ac4c882e62e25452908329b536261e9f09de82db8280fdc42985d0d8d5cdfa2f4866c76da03aca8f29237799b70a080
+AUX libtheora-1.0_beta2-flags.patch 724 BLAKE2B f8a1bed5d75fdc39ab8e0b04f24e60bbe694e49a08c7f91aaaa94f4aa8c15b3a2b557d686c59d70ff554b3245235f725fdfe845f39e43670d0eef0c6bc7a5d4e SHA512 31463b0b3d7d2b701d3cc5e1aa6dcea4144d7f562727afa0df7d97a49e04f39e7922cff32e3f4b5b3afe8e3e3c1a76dc9eb456bdca8607a0f397380685708f32
+AUX libtheora-1.1.1-fix-UB.patch 1499 BLAKE2B b2336cac99a2810d1ba5733e09dde80d42c1c91addb434fedb816634b8913ebd4ce2cd5e39df5da2813248147018b9053f30f39947e061fc11014fa0d69adf18 SHA512 9fe418951099cb87dc178b06165e7354130fc81914e5b8e77316438eb0a1af23c0c7e79a5650b19f38a8be2789a013be2bdf9b49ab87d1b682fae5f7227f987f
+AUX libtheora-1.1.1-libpng16.patch 516 BLAKE2B 7c4d6fd0e086b74f68cbc3e46e43879b42ef39f0f83d306666caf80808de023e2c4c77de51009c5dd668e230b169e5073539ee11e69e3e0201d6def1a4c7401d SHA512 5ed8c35eee6fb533fbbfc835fe62eddea18ddc956b453b1062a4d1534b6d69db2e70a03bdf3300a8b1a5832feef2c7536bfad4274e8e89769e07a8a3f635b1b5
+AUX libtheora-1.1.1-underlinking.patch 481 BLAKE2B 0939e1789eee97d999d229bb37620fe787b0da17253e15e6fbdf3109dd2c11cf201c6d77133529a779730acdd23806a52bb033d909509a6065ff6ac08db4b4d5 SHA512 9e8219ab32993470a4566b59b544eb04175577f4c82174924aa53b2ef61f0b94496a0de5afa630da291322fc6fbc640978152de8b61edd50231818838a330b0b
 DIST libtheora-1.1.1.tar.bz2 1903175 BLAKE2B 261655cfdb8ba38a462e4701d69a074c6d8d81fb801359059b1c2c11592fd5ab1b724652e667aa5c1f117dbbc198b7794d22a7b1c9782e2b6dabe5fb62524be8 SHA512 9ab9b3af1c35d16a7d6d84f61f59ef3180132e30c27bdd7c0fa2683e0d00e2c791accbc7fd2c90718cc947d8bd10ee4a5940fb55f90f1fd7b0ed30583a47dbbd
 EBUILD libtheora-1.1.1-r1.ebuild 2281 BLAKE2B 07dddc9f1faf461c15a81ce1fb8d6026c0de6d103589e7f1baa61370e890b5a5fa5b467667e8e53c87eefbb865e4cf4b09ebdca843e61b1b57e82e5d32e40597 SHA512 931f75c09195a979b830a824b053db327ae5e52bd5bc5da2b23d3b1ed0acd1ec1a862b9a68d0582143e2ef0d4a4b72848454ca365b59f780f6e8bc59f16de1b5
+EBUILD libtheora-1.1.1-r2.ebuild 2376 BLAKE2B eed6fdbb48d80f705b3271e4fe8d5accdbce6f3526938ea3251505eaad06fd0cefd250b6699de47aeeda4c2d7fe8ada671f1cd96bce5d2442bbe7a32b442d2a6 SHA512 7cdd9a27c6813303296eeffd7d837890a2484fde67ad05f70db374d66ef0401ab8dc4aa6397363d01631b7d6c3385db89c401be1e5f979e22166c1214cc0e59f
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-libs/libtheora/files/libtheora-1.0_beta2-flags.patch b/media-libs/libtheora/files/libtheora-1.0_beta2-flags.patch
index a47cc5771680..ffc6ab5802af 100644
--- a/media-libs/libtheora/files/libtheora-1.0_beta2-flags.patch
+++ b/media-libs/libtheora/files/libtheora-1.0_beta2-flags.patch
@@ -1,6 +1,6 @@
 diff -ur libtheora-1.0beta2.orig/configure.ac libtheora-1.0beta2/configure.ac
---- libtheora-1.0beta2.orig/configure.ac	2007-10-13 00:01:38.000000000 +0300
-+++ libtheora-1.0beta2/configure.ac	2007-11-25 22:44:49.000000000 +0200
+--- a/configure.ac	2007-10-13 00:01:38.000000000 +0300
++++ b/configure.ac	2007-11-25 22:44:49.000000000 +0200
 @@ -102,8 +102,8 @@
          case $host in 
          *)
diff --git a/media-libs/libtheora/files/libtheora-1.1.1-fix-UB.patch b/media-libs/libtheora/files/libtheora-1.1.1-fix-UB.patch
new file mode 100644
index 000000000000..862d6a3b8164
--- /dev/null
+++ b/media-libs/libtheora/files/libtheora-1.1.1-fix-UB.patch
@@ -0,0 +1,47 @@
+From 0ae66d565e6bead8604d312bc1a4e9dccf245c88 Mon Sep 17 00:00:00 2001
+From: Tim Terriberry <tterribe@xiph.org>
+Date: Tue, 8 May 2012 02:51:57 +0000
+Subject: [PATCH] Fix pp_sharp_mod calculation.
+
+This was broken when the dequant_tables indexing changed in commit
+ r16102, but it only affected post-processing quality, so we never
+ noticed.
+With gcc 4.8.0, this can now trigger a segfault during decoder
+ initialization.
+
+svn path=/trunk/theora/; revision=18268
+---
+ lib/decode.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+Note: The hunk header was modified from
+
+    @@ -400,10 +400,10 @@
+
+to
+
+    @@ -397,10 +397,10 @@
+
+to match the source code in the libtheora-1.1.1 tar-ball.
+
+diff --git a/lib/decode.c b/lib/decode.c
+index b803505..9f2516a 100644
+--- a/lib/decode.c
++++ b/lib/decode.c
+@@ -397,10 +397,10 @@ static int oc_dec_init(oc_dec_ctx *_dec,const th_info *_info,
+     int qsum;
+     qsum=0;
+     for(qti=0;qti<2;qti++)for(pli=0;pli<3;pli++){
+-      qsum+=_dec->state.dequant_tables[qti][pli][qi][12]+
+-       _dec->state.dequant_tables[qti][pli][qi][17]+
+-       _dec->state.dequant_tables[qti][pli][qi][18]+
+-       _dec->state.dequant_tables[qti][pli][qi][24]<<(pli==0);
++      qsum+=_dec->state.dequant_tables[qi][pli][qti][12]+
++       _dec->state.dequant_tables[qi][pli][qti][17]+
++       _dec->state.dequant_tables[qi][pli][qti][18]+
++       _dec->state.dequant_tables[qi][pli][qti][24]<<(pli==0);
+     }
+     _dec->pp_sharp_mod[qi]=-(qsum>>11);
+   }
+-- 
+2.10.2
diff --git a/media-libs/libtheora/files/libtheora-1.1.1-libpng16.patch b/media-libs/libtheora/files/libtheora-1.1.1-libpng16.patch
index 93da700c4d7a..46d933323909 100644
--- a/media-libs/libtheora/files/libtheora-1.1.1-libpng16.patch
+++ b/media-libs/libtheora/files/libtheora-1.1.1-libpng16.patch
@@ -1,8 +1,8 @@
 http://bugs.gentoo.org/465450
 http://trac.xiph.org/ticket/1947
 
---- examples/png2theora.c
-+++ examples/png2theora.c
+--- a/examples/png2theora.c
++++ b/examples/png2theora.c
 @@ -462,9 +462,9 @@
    png_set_strip_alpha(png_ptr);
  
diff --git a/media-libs/libtheora/files/libtheora-1.1.1-underlinking.patch b/media-libs/libtheora/files/libtheora-1.1.1-underlinking.patch
index b45a368ebd76..7836e3abda23 100644
--- a/media-libs/libtheora/files/libtheora-1.1.1-underlinking.patch
+++ b/media-libs/libtheora/files/libtheora-1.1.1-underlinking.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/504270
 
---- examples/Makefile.am
-+++ examples/Makefile.am
+--- a/examples/Makefile.am
++++ b/examples/Makefile.am
 @@ -22,7 +22,7 @@
  
  player_example_SOURCES = player_example.c
diff --git a/media-libs/libtheora/libtheora-1.1.1-r2.ebuild b/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
new file mode 100644
index 000000000000..2ca7578d0ec0
--- /dev/null
+++ b/media-libs/libtheora/libtheora-1.1.1-r2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib-minimal
+
+DESCRIPTION="The Theora Video Compression Codec"
+HOMEPAGE="https://www.theora.org"
+SRC_URI="https://downloads.xiph.org/releases/theora/${P/_}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc +encode examples static-libs"
+
+REQUIRED_USE="examples? ( encode )" #285895
+
+RDEPEND="
+	>=media-libs/libogg-1.3.0:=[${MULTILIB_USEDEP}]
+	encode? ( >=media-libs/libvorbis-1.3.3-r1:=[${MULTILIB_USEDEP}] )
+	examples? (
+		media-libs/libpng:0=
+		>=media-libs/libsdl-0.11.0
+		media-libs/libvorbis:=
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${P/_}
+
+VARTEXFONTS=${T}/fonts
+
+DOCS=( AUTHORS CHANGES README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0_beta2-flags.patch
+	"${FILESDIR}"/${P}-underlinking.patch
+	"${FILESDIR}"/${P}-libpng16.patch # bug 465450
+	"${FILESDIR}"/${P}-fix-UB.patch # bug 620800
+)
+
+src_prepare() {
+	default
+
+	# bug 467006
+	sed -i "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" configure.ac || die
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+multilib_src_configure() {
+	use x86 && filter-flags -fforce-addr -frename-registers #200549
+	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
+
+	local myconf=(
+		--disable-spec
+		$(use_enable encode)
+		$(use_enable static-libs static)
+	)
+
+	if [[ "${ABI}" = "${DEFAULT_ABI}" ]] ; then
+		myconf+=( $(use_enable examples) )
+	else
+		# those will be overwritten anyway
+		myconf+=( --disable-examples )
+	fi
+
+	# --disable-spec because LaTeX documentation has been prebuilt
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		install
+
+	if use examples && [[] "${ABI}" = "${DEFAULT_ABI}" ]]; then
+		dobin examples/.libs/png2theora
+		for bin in dump_{psnr,video} {encoder,player}_example; do
+			newbin examples/.libs/${bin} theora_${bin}
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	find "${D}" -name '*.la' -delete || die
+	einstalldocs
+
+	if use examples && use doc; then
+		docinto examples
+		dodoc examples/*.[ch]
+		docompress -x /usr/share/doc/${PF}/examples
+		docinto .
+	fi
+}