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
+}

Reply via email to