[patch] Revbump and revert C++11 usage.

0001-media-video-movit-revbump-revert-C-11-usage-per-upst.patch (text/plain), 8.05 KB, created by Mihai Moldovan on 2017-08-02 07:29:15 UTC

From 7e3cc32f98fa5e5ee910425e7e3c09e7b11b5003 Mon Sep 17 00:00:00 2001
From: Mihai Moldovan <[e-mail]>
Date: Wed, 2 Aug 2017 09:16:24 +0200
Subject: [PATCH 1/3] media-video/movit: revbump, revert C++11 usage per
 upstream patch.

---
 .../files/movit-revert-c++11-dependency.patch      | 144 +++++++++++++++++++++
 .../{movit-1.5.2.ebuild => movit-1.5.2-r1.ebuild}  |   4 +
 2 files changed, 148 insertions(+)
 create mode 100644 media-video/movit/files/movit-revert-c++11-dependency.patch
 rename media-video/movit/{movit-1.5.2.ebuild => movit-1.5.2-r1.ebuild} (90%)

diff --git a/media-video/movit/files/movit-revert-c++11-dependency.patch b/media-video/movit/files/movit-revert-c++11-dependency.patch
new file mode 100644
index 0000000..713f7cf
--- /dev/null
+++ b/media-video/movit/files/movit-revert-c++11-dependency.patch
@@ -0,0 +1,144 @@
+From: Steinar H. Gunderson <[e-mail]>
+Date: Tue, 1 Aug 2017 07:25:10 +0000 (+0200)
+Subject: Remove C++11 dependency from ResampleEffect.
+X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=8e9f58fec54a4c879035b214fd7411f6ff7b3a32
+
+Remove C++11 dependency from ResampleEffect.
+
+We really ought to allow C++11 in Movit soon, but 1.5.2 is not the right release.
+
+Reported by Etienne d'Hautefeuille.
+---
+
+diff --git a/resample_effect.cpp b/resample_effect.cpp
+index 30c40c4..86d574b 100644
+--- a/resample_effect.cpp
++++ b/resample_effect.cpp
+@@ -206,7 +206,7 @@ void normalize_sum(Tap<T>* vals, unsigned num)
+ //
+ // The greedy strategy for combining samples is optimal.
+ template<class DestFloat>
+-unsigned combine_many_samples(const Tap<float> *weights, unsigned src_size, unsigned src_samples, unsigned dst_samples, unique_ptr<Tap<DestFloat>[]> *bilinear_weights)
++unsigned combine_many_samples(const Tap<float> *weights, unsigned src_size, unsigned src_samples, unsigned dst_samples, Tap<DestFloat> **bilinear_weights)
+ {
+ 	float num_subtexels = src_size / movit_texel_subpixel_precision;
+ 	float inv_num_subtexels = movit_texel_subpixel_precision / src_size;
+@@ -221,9 +221,10 @@ unsigned combine_many_samples(const Tap<float> *weights, unsigned src_size, unsi
+ 
+ 	// Now that we know the right width, actually combine the samples.
+ 	unsigned src_bilinear_samples = src_samples - max_samples_saved;
+-	bilinear_weights->reset(new Tap<DestFloat>[dst_samples * src_bilinear_samples]);
++	if (*bilinear_weights != NULL) delete[] *bilinear_weights;
++	*bilinear_weights = new Tap<DestFloat>[dst_samples * src_bilinear_samples];
+ 	for (unsigned y = 0; y < dst_samples; ++y) {
+-		Tap<DestFloat> *bilinear_weights_ptr = bilinear_weights->get() + y * src_bilinear_samples;
++		Tap<DestFloat> *bilinear_weights_ptr = *bilinear_weights + y * src_bilinear_samples;
+ 		unsigned num_samples_saved = combine_samples(
+ 			weights + y * src_samples,
+ 			bilinear_weights_ptr,
+@@ -526,15 +527,15 @@ void SingleResamplePassEffect::update_texture(GLuint glsl_program_num, const str
+ 
+ 	GLenum type, internal_format;
+ 	void *pixels;
+-	assert((weights.bilinear_weights_fp16 == nullptr) != (weights.bilinear_weights_fp32 == nullptr));
+-	if (weights.bilinear_weights_fp32 != nullptr) {
++	assert((weights.bilinear_weights_fp16 == NULL) != (weights.bilinear_weights_fp32 == NULL));
++	if (weights.bilinear_weights_fp32 != NULL) {
+ 		type = GL_FLOAT;
+ 		internal_format = GL_RG32F;
+-		pixels = weights.bilinear_weights_fp32.get();
++		pixels = weights.bilinear_weights_fp32;
+ 	} else {
+ 		type = GL_HALF_FLOAT;
+ 		internal_format = GL_RG16F;
+-		pixels = weights.bilinear_weights_fp16.get();
++		pixels = weights.bilinear_weights_fp16;
+ 	}
+ 
+ 	if (int(weights.src_bilinear_samples) == last_texture_width &&
+@@ -550,6 +551,9 @@ void SingleResamplePassEffect::update_texture(GLuint glsl_program_num, const str
+ 		last_texture_internal_format = internal_format;
+ 	}
+ 	check_error();
++
++	delete[] weights.bilinear_weights_fp16;
++	delete[] weights.bilinear_weights_fp32;
+ }
+ 
+ ScalingWeights calculate_scaling_weights(unsigned src_size, unsigned dst_size, float zoom, float offset)
+@@ -632,7 +636,7 @@ ScalingWeights calculate_scaling_weights(unsigned src_size, unsigned dst_size, f
+ 	float radius_scaling_factor = min(scaling_factor, 1.0f);
+ 	int int_radius = lrintf(LANCZOS_RADIUS / radius_scaling_factor);
+ 	int src_samples = int_radius * 2 + 1;
+-	unique_ptr<Tap<float>[]> weights(new Tap<float>[dst_samples * src_samples]);
++	Tap<float> *weights = new Tap<float>[dst_samples * src_samples];
+ 	float subpixel_offset = offset - lrintf(offset);  // The part not covered by whole_pixel_offset.
+ 	assert(subpixel_offset >= -0.5f && subpixel_offset <= 0.5f);
+ 	for (unsigned y = 0; y < dst_samples; ++y) {
+@@ -656,14 +660,14 @@ ScalingWeights calculate_scaling_weights(unsigned src_size, unsigned dst_size, f
+ 	// Our tolerance level for total error is a bit higher than the one for invididual
+ 	// samples, since one would assume overall errors in the shape don't matter as much.
+ 	const float max_error = 2.0f / (255.0f * 255.0f);
+-	unique_ptr<Tap<fp16_int_t>[]> bilinear_weights_fp16;
+-	int src_bilinear_samples = combine_many_samples(weights.get(), src_size, src_samples, dst_samples, &bilinear_weights_fp16);
+-	unique_ptr<Tap<float>[]> bilinear_weights_fp32 = NULL;
++	Tap<fp16_int_t> *bilinear_weights_fp16 = NULL;
++	int src_bilinear_samples = combine_many_samples(weights, src_size, src_samples, dst_samples, &bilinear_weights_fp16);
++	Tap<float> *bilinear_weights_fp32 = NULL;
+ 	double max_sum_sq_error_fp16 = 0.0;
+ 	for (unsigned y = 0; y < dst_samples; ++y) {
+ 		double sum_sq_error_fp16 = compute_sum_sq_error(
+-			weights.get() + y * src_samples, src_samples,
+-			bilinear_weights_fp16.get() + y * src_bilinear_samples, src_bilinear_samples,
++			weights + y * src_samples, src_samples,
++			bilinear_weights_fp16 + y * src_bilinear_samples, src_bilinear_samples,
+ 			src_size);
+ 		max_sum_sq_error_fp16 = std::max(max_sum_sq_error_fp16, sum_sq_error_fp16);
+ 		if (max_sum_sq_error_fp16 > max_error) {
+@@ -672,16 +676,19 @@ ScalingWeights calculate_scaling_weights(unsigned src_size, unsigned dst_size, f
+ 	}
+ 
+ 	if (max_sum_sq_error_fp16 > max_error) {
+-		bilinear_weights_fp16.reset();
+-		src_bilinear_samples = combine_many_samples(weights.get(), src_size, src_samples, dst_samples, &bilinear_weights_fp32);
++		delete[] bilinear_weights_fp16;
++		bilinear_weights_fp16 = NULL;
++		src_bilinear_samples = combine_many_samples(weights, src_size, src_samples, dst_samples, &bilinear_weights_fp32);
+ 	}
+ 
++	delete[] weights;
++
+ 	ScalingWeights ret;
+ 	ret.src_bilinear_samples = src_bilinear_samples;
+ 	ret.dst_samples = dst_samples;
+ 	ret.num_loops = num_loops;
+-	ret.bilinear_weights_fp16 = move(bilinear_weights_fp16);
+-	ret.bilinear_weights_fp32 = move(bilinear_weights_fp32);
++	ret.bilinear_weights_fp16 = bilinear_weights_fp16;
++	ret.bilinear_weights_fp32 = bilinear_weights_fp32;
+ 	return ret;
+ }
+ 
+diff --git a/resample_effect.h b/resample_effect.h
+index 7538a68..7cd613f 100644
+--- a/resample_effect.h
++++ b/resample_effect.h
+@@ -18,7 +18,6 @@
+ #include <epoxy/gl.h>
+ #include <assert.h>
+ #include <stddef.h>
+-#include <memory>
+ #include <string>
+ 
+ #include "effect.h"
+@@ -41,8 +40,8 @@ struct ScalingWeights {
+ 	unsigned dst_samples, num_loops;
+ 
+ 	// Exactly one of these is set.
+-	std::unique_ptr<Tap<fp16_int_t>[]> bilinear_weights_fp16;
+-	std::unique_ptr<Tap<float>[]> bilinear_weights_fp32;
++	Tap<fp16_int_t> *bilinear_weights_fp16;
++	Tap<float> *bilinear_weights_fp32;
+ };
+ ScalingWeights calculate_scaling_weights(unsigned src_size, unsigned dst_size, float zoom, float offset);
+ 
diff --git a/media-video/movit/movit-1.5.2.ebuild b/media-video/movit/movit-1.5.2-r1.ebuild
similarity index 90%
rename from media-video/movit/movit-1.5.2.ebuild
rename to media-video/movit/movit-1.5.2-r1.ebuild
index 299342f..3f9c37d 100644
--- a/media-video/movit/movit-1.5.2.ebuild
+++ b/media-video/movit/movit-1.5.2-r1.ebuild
@@ -27,6 +27,10 @@ RDEPEND="media-libs/mesa
 	"
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-revert-c++11-dependency.patch"
+}
+
 src_compile() {
 	GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake
 }
-- 
2.13.3