gentoo new year resync : 01.01.2021

3 files changed, 76 insertions, 16 deletions

diff --git a/media-video/frameworks/Manifest b/media-video/frameworks/Manifest
index d195ee6ac20d..e6e669a8fa07 100644
--- a/media-video/frameworks/Manifest
+++ b/media-video/frameworks/Manifest
@@ -1,5 +1,6 @@
 AUX frameworks-0.3.7-ceilf.patch 243 BLAKE2B 14f41042f2aaf23a1d6640b7716cfe7eeb746e8c847a10751c44ffd15e5f2eed715497fde75779ea41b614b9c5a664b42ff3638324430e9e036424f9231cfcba SHA512 68b094fa58f59aebb639b8799bf5a15ea7cf7916803744de26a138d8f9b34f43172719dbf73889039cdc7c87edac6a5525f0c0a35acbed353e29e17694e00d3c
+AUX frameworks-0.3.7-fno-common.patch 1589 BLAKE2B e8e4f3c46d84050f34818e1804c63fb0749600155eee9c730d2f392d673f32c0e34d411f57a6d2da61e46dc41432bda1c8f7a9a471ad977b3e1e2cb26d9e416c SHA512 86ef9c8a02ded2fb13b8ea6ade1bfc566f3d99af2646cf8df349f04f33a12b5bc9fba1095d8bd9fb32f83920970f89c37583c1451c6dd1e98da8bc4eff5ba2c6
 AUX frameworks-0.3.7-strcmp-and-datadir.patch 826 BLAKE2B aeacd7edbe01a5cf1616ac5291423dffb8163066e87c593838b3fc826c5d46a07569f544d87a983918529ca4f090f6238105d9c1e44f907fd2827bedf83bfebc SHA512 9987e0c4aff9b42ec8a826991e38638548614986fc83f12e46dc9e357f9f8f6e7d3be9de23c7012f5b36f7cadb5a3f144cc3d2b3615f69ae0f444c5c017675c6
 DIST frameworks-0.3.7.tar.gz 116266 BLAKE2B e1ff4d3144f926d82d83eb28e51e54003936c511836adcc540e5d0e5ea0efcf2d173282c0b52a0a2c9e568e8c48ad24532714e89994ea7381b3c1ea9c053836a SHA512 e146bf9e6c793fbfb809a47501fa4f9f12ba2a4f2e9e4e6c4acac8dda44421eefc4053b6cc01d98f4429e923ecd8322bc499a8a9fa39f41a334df322229df93d
-EBUILD frameworks-0.3.7-r1.ebuild 674 BLAKE2B 5ddc0ca8f5b1e6919667989de67dc3568defc7283cc067e6ddf587b9cf07106f33421959bdbaa9edcbf8a9182141af6906d514e85e90c81d512ff2bac5be7c74 SHA512 ab686c27918a1af8c7a50636dc001c509bf29ffc1418faabdc8fdd0c5e3d214aba170c8c474c2b59b919fe755857bb05fa7b5cdecd752ff1611024a9e8327f9e
+EBUILD frameworks-0.3.7-r1.ebuild 686 BLAKE2B 76f75444df56fd17016fd86c79259adb1a516a87bd607622b29e98b3cab58d16fc09d428bed2a4063ac47bbb7063f3113f07ff4807f0294088c17906c35e66f2 SHA512 5edd41daa5c881c55f5436bc06d8b4146488d30799dbeb777f7216b2b25f25ea8c211611a23863fc93712a43b70a9a34e0064428982ce09aa76d66d4213a1194
 MISC metadata.xml 369 BLAKE2B 3d1c690b2fd7efe93f63ac3b460cd0fd2c7b3e2a1ee31d02461619ab1c1e2c9679547912cffdf31545e10d3c66aede437b1dcbb576294245669c7951fbbb58d0 SHA512 447c8547b21a573156781ddefb9adc5c4010807b7ff5d8e5270b14f3bc512ca394a3d1d5a6e81cc459eccec60c7ade516de85a9a0b945c24a98c71b43fb59052
diff --git a/media-video/frameworks/files/frameworks-0.3.7-fno-common.patch b/media-video/frameworks/files/frameworks-0.3.7-fno-common.patch
new file mode 100644
index 000000000000..09e05d5ae441
--- /dev/null
+++ b/media-video/frameworks/files/frameworks-0.3.7-fno-common.patch
@@ -0,0 +1,63 @@
+--- a/src/callbacks.c
++++ b/src/callbacks.c
+@@ -1,5 +1,7 @@
+ #include "common.h"
+ 
++extern gboolean fwks_quit;
++
+ void on_main_window_delete(GtkWidget *widget, GdkEvent *event, struct Interface *interface)
+ {
+     frameworks_interface_quit(interface);
+--- a/src/camera.c
++++ b/src/camera.c
+@@ -1,6 +1,8 @@
+ #include <math.h>
+ #include "common.h"
+ 
++extern gboolean fwks_quit;
++
+ /* internal function prototypes */
+ gpointer read_thread(gpointer data);
+ void reset_buffer(struct Camera *camera, struct RawBuf *buf);
+--- a/src/colorspace.c
++++ b/src/colorspace.c
+@@ -14,7 +14,7 @@
+ #define BGR24_R(start) start+2
+ 
+ /* Global vars */
+-gint force_palette;
++extern gint force_palette;
+ 
+ void
+ compose_yuv_to_rgb(guint8 y, gint32 ug, gint32 ub, gint32 vg, gint32 vr,
+--- a/src/common.h
++++ b/src/common.h
+@@ -42,4 +42,5 @@
+ #include "frameworks.h"
+ 
+ /* global vars */
+-gboolean fwks_quit;
++extern gboolean fwks_quit;
++extern gint force_palette;
+--- a/src/frameworks.c
++++ b/src/frameworks.c
+@@ -32,7 +32,7 @@ gboolean fwks_quit = FALSE;
+ 
+ /* Hack to allow forcing of palette for webcams that lie about their paletter
+  * (or more likely bugs in frameworks decode the thing wrong... */
+-gint force_palette = -1;
++extern gint force_palette = -1;
+ 
+ int main(int argc, char *argv[])
+ {
+--- a/src/interface.c
++++ b/src/interface.c
+@@ -9,6 +9,8 @@
+ #define FWKS_OVERLAY_OPACITY 60  /* between 0..255, the opacity of the overlays */
+ #define FWKS_OPACITY_FULL 255  /* full opacity */
+ 
++extern gboolean fwks_quit;
++
+ gpointer test_thread(gpointer data);
+ 
+ gpointer display_thread(gpointer data);
diff --git a/media-video/frameworks/frameworks-0.3.7-r1.ebuild b/media-video/frameworks/frameworks-0.3.7-r1.ebuild
index 32b2c372bb81..bc2a76ae9d4e 100644
--- a/media-video/frameworks/frameworks-0.3.7-r1.ebuild
+++ b/media-video/frameworks/frameworks-0.3.7-r1.ebuild
@@ -1,36 +1,32 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit autotools
 
 DESCRIPTION="A small v4l frame capture utility especially suited for stop motion animation"
 SRC_URI="http://frameworks.polycrystal.org/release/${P}.tar.gz"
 HOMEPAGE="http://frameworks.polycrystal.org"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="
 	>=gnome-base/libglade-2
-	x11-libs/gtk+:2
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-DOCS=(
-	AUTHORS ChangeLog NEWS README TODO
-)
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.7-ceilf.patch
-	"${FILESDIR}"/${PN}-0.3.7-strcmp-and-datadir.patch
+	"${FILESDIR}"/${P}-ceilf.patch
+	"${FILESDIR}"/${P}-strcmp-and-datadir.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_prepare() {
 	default
-
+	mv configure.{in,ac} || die
 	eautoreconf
 }