1 |
commit: 53d9d8131a66a49878ed04a97947b14229065bd8 |
2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
3 |
AuthorDate: Mon Dec 28 12:42:54 2020 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 28 12:42:54 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53d9d813 |
7 |
|
8 |
media-video/frameworks: Port to EAPI 7 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/706710 |
11 |
Package-Manager: Portage-3.0.9, Repoman-3.0.1 |
12 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
13 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
14 |
|
15 |
.../files/frameworks-0.3.7-fno-common.patch | 63 ++++++++++++++++++++++ |
16 |
media-video/frameworks/frameworks-0.3.7-r1.ebuild | 26 ++++----- |
17 |
2 files changed, 74 insertions(+), 15 deletions(-) |
18 |
|
19 |
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 |
20 |
new file mode 100644 |
21 |
index 00000000000..09e05d5ae44 |
22 |
--- /dev/null |
23 |
+++ b/media-video/frameworks/files/frameworks-0.3.7-fno-common.patch |
24 |
@@ -0,0 +1,63 @@ |
25 |
+--- a/src/callbacks.c |
26 |
++++ b/src/callbacks.c |
27 |
+@@ -1,5 +1,7 @@ |
28 |
+ #include "common.h" |
29 |
+ |
30 |
++extern gboolean fwks_quit; |
31 |
++ |
32 |
+ void on_main_window_delete(GtkWidget *widget, GdkEvent *event, struct Interface *interface) |
33 |
+ { |
34 |
+ frameworks_interface_quit(interface); |
35 |
+--- a/src/camera.c |
36 |
++++ b/src/camera.c |
37 |
+@@ -1,6 +1,8 @@ |
38 |
+ #include <math.h> |
39 |
+ #include "common.h" |
40 |
+ |
41 |
++extern gboolean fwks_quit; |
42 |
++ |
43 |
+ /* internal function prototypes */ |
44 |
+ gpointer read_thread(gpointer data); |
45 |
+ void reset_buffer(struct Camera *camera, struct RawBuf *buf); |
46 |
+--- a/src/colorspace.c |
47 |
++++ b/src/colorspace.c |
48 |
+@@ -14,7 +14,7 @@ |
49 |
+ #define BGR24_R(start) start+2 |
50 |
+ |
51 |
+ /* Global vars */ |
52 |
+-gint force_palette; |
53 |
++extern gint force_palette; |
54 |
+ |
55 |
+ void |
56 |
+ compose_yuv_to_rgb(guint8 y, gint32 ug, gint32 ub, gint32 vg, gint32 vr, |
57 |
+--- a/src/common.h |
58 |
++++ b/src/common.h |
59 |
+@@ -42,4 +42,5 @@ |
60 |
+ #include "frameworks.h" |
61 |
+ |
62 |
+ /* global vars */ |
63 |
+-gboolean fwks_quit; |
64 |
++extern gboolean fwks_quit; |
65 |
++extern gint force_palette; |
66 |
+--- a/src/frameworks.c |
67 |
++++ b/src/frameworks.c |
68 |
+@@ -32,7 +32,7 @@ gboolean fwks_quit = FALSE; |
69 |
+ |
70 |
+ /* Hack to allow forcing of palette for webcams that lie about their paletter |
71 |
+ * (or more likely bugs in frameworks decode the thing wrong... */ |
72 |
+-gint force_palette = -1; |
73 |
++extern gint force_palette = -1; |
74 |
+ |
75 |
+ int main(int argc, char *argv[]) |
76 |
+ { |
77 |
+--- a/src/interface.c |
78 |
++++ b/src/interface.c |
79 |
+@@ -9,6 +9,8 @@ |
80 |
+ #define FWKS_OVERLAY_OPACITY 60 /* between 0..255, the opacity of the overlays */ |
81 |
+ #define FWKS_OPACITY_FULL 255 /* full opacity */ |
82 |
+ |
83 |
++extern gboolean fwks_quit; |
84 |
++ |
85 |
+ gpointer test_thread(gpointer data); |
86 |
+ |
87 |
+ gpointer display_thread(gpointer data); |
88 |
|
89 |
diff --git a/media-video/frameworks/frameworks-0.3.7-r1.ebuild b/media-video/frameworks/frameworks-0.3.7-r1.ebuild |
90 |
index 32b2c372bb8..bc2a76ae9d4 100644 |
91 |
--- a/media-video/frameworks/frameworks-0.3.7-r1.ebuild |
92 |
+++ b/media-video/frameworks/frameworks-0.3.7-r1.ebuild |
93 |
@@ -1,36 +1,32 @@ |
94 |
-# Copyright 1999-2019 Gentoo Authors |
95 |
+# Copyright 1999-2020 Gentoo Authors |
96 |
# Distributed under the terms of the GNU General Public License v2 |
97 |
|
98 |
-EAPI=6 |
99 |
+EAPI=7 |
100 |
+ |
101 |
inherit autotools |
102 |
|
103 |
DESCRIPTION="A small v4l frame capture utility especially suited for stop motion animation" |
104 |
SRC_URI="http://frameworks.polycrystal.org/release/${P}.tar.gz" |
105 |
HOMEPAGE="http://frameworks.polycrystal.org" |
106 |
|
107 |
-SLOT="0" |
108 |
LICENSE="GPL-2" |
109 |
+SLOT="0" |
110 |
KEYWORDS="~amd64 ~ppc ~x86" |
111 |
|
112 |
RDEPEND=" |
113 |
>=gnome-base/libglade-2 |
114 |
- x11-libs/gtk+:2 |
115 |
-" |
116 |
-DEPEND=" |
117 |
- ${RDEPEND} |
118 |
- virtual/pkgconfig |
119 |
-" |
120 |
+ x11-libs/gtk+:2" |
121 |
+DEPEND="${RDEPEND}" |
122 |
+BDEPEND="virtual/pkgconfig" |
123 |
|
124 |
-DOCS=( |
125 |
- AUTHORS ChangeLog NEWS README TODO |
126 |
-) |
127 |
PATCHES=( |
128 |
- "${FILESDIR}"/${PN}-0.3.7-ceilf.patch |
129 |
- "${FILESDIR}"/${PN}-0.3.7-strcmp-and-datadir.patch |
130 |
+ "${FILESDIR}"/${P}-ceilf.patch |
131 |
+ "${FILESDIR}"/${P}-strcmp-and-datadir.patch |
132 |
+ "${FILESDIR}"/${P}-fno-common.patch |
133 |
) |
134 |
|
135 |
src_prepare() { |
136 |
default |
137 |
- |
138 |
+ mv configure.{in,ac} || die |
139 |
eautoreconf |
140 |
} |