[gentoo-commits] repo/gentoo:master commit in: media-video/frameworks/, media-video/frameworks/files/

[gentoo-commits] repo/gentoo:master commit in: media-video/frameworks/, media-video/frameworks/files/

[Jeroen Roovers]

commit:     d8743c624137dc9ca657152eeefd676f751ab52b
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 20 12:46:11 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Aug 20 12:46:55 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8743c62

media-video/frameworks: Fix linking issue (bug #516280). Fix glade file location. Fix compiler warning.

Package-Manager: portage-2.3.0

 .../frameworks/files/frameworks-0.3.7-ceilf.patch  | 10 ++++++
 .../frameworks-0.3.7-strcmp-and-datadir.patch      | 24 ++++++++++++++
 media-video/frameworks/frameworks-0.3.7-r1.ebuild  | 37 ++++++++++++++++++++++
 3 files changed, 71 insertions(+)

diff --git a/media-video/frameworks/files/frameworks-0.3.7-ceilf.patch b/media-video/frameworks/files/frameworks-0.3.7-ceilf.patch
new file mode 100644
index 0000000..6ccc271
--- /dev/null
+++ b/media-video/frameworks/files/frameworks-0.3.7-ceilf.patch
@@ -0,0 +1,10 @@
+--- a/configure.in
++++ b/configure.in
+@@ -12,6 +12,7 @@
+ AC_PROG_INSTALL
+ 
+ # Checks for libraries
++AC_SEARCH_LIBS(ceil, m)
+ pkg_modules="gtk+-2.0 gthread-2.0 libglade-2.0"
+ PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
+ AC_SUBST(PACKAGE_CFLAGS)

diff --git a/media-video/frameworks/files/frameworks-0.3.7-strcmp-and-datadir.patch b/media-video/frameworks/files/frameworks-0.3.7-strcmp-and-datadir.patch
new file mode 100644
index 0000000..1550a21
--- /dev/null
+++ b/media-video/frameworks/files/frameworks-0.3.7-strcmp-and-datadir.patch
@@ -0,0 +1,24 @@
+--- a/src/interface.c
++++ b/src/interface.c
+@@ -258,8 +258,8 @@
+ 
+     /* find our glade interface file */
+     datadir = g_string_new(DATADIR);
+-    if (datadir->str != "" || datadir->str != NULL)
+-        datadir = g_string_append(datadir, "/");
++    if (strcmp(datadir->str, "") || datadir->str != NULL)
++        datadir = g_string_append(datadir, "/frameworks/");
+     filename = g_string_new("frameworks.glade");
+ 
+     if (g_file_test(filename->str, G_FILE_TEST_EXISTS) == TRUE) {
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -8,7 +8,7 @@
+ EXTRA_DIST = template.glade template.gladep
+ 
+ bin_PROGRAMS = frameworks
+-data_DATA = frameworks.glade
++pkgdata_DATA = frameworks.glade
+ 
+ frameworks_SOURCES = frameworks.c frameworks.h common.h videodev.h \
+ 	camera.c camera.h interface.c interface.h callbacks.c callbacks.h \

diff --git a/media-video/frameworks/frameworks-0.3.7-r1.ebuild b/media-video/frameworks/frameworks-0.3.7-r1.ebuild
new file mode 100644
index 0000000..f113a25
--- /dev/null
+++ b/media-video/frameworks/frameworks-0.3.7-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+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"
+KEYWORDS="~ppc ~x86 ~amd64"
+
+RDEPEND="
+	>=gnome-base/libglade-2
+	x11-libs/gtk+:2
+"
+DEPEND="
+	${RDEPEND}
+	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
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}

[gentoo-commits] repo/gentoo:master commit in: media-video/frameworks/, media-video/frameworks/files/

[David Seifert]

commit:     53d9d8131a66a49878ed04a97947b14229065bd8
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Mon Dec 28 12:42:54 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 12:42:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53d9d813

media-video/frameworks: Port to EAPI 7

Closes: https://bugs.gentoo.org/706710
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../files/frameworks-0.3.7-fno-common.patch        | 63 ++++++++++++++++++++++
 media-video/frameworks/frameworks-0.3.7-r1.ebuild  | 26 ++++-----
 2 files changed, 74 insertions(+), 15 deletions(-)

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 00000000000..09e05d5ae44
--- /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 32b2c372bb8..bc2a76ae9d4 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
 }