Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/media-video/guvcview
diff options
context:
space:
mode:
Diffstat (limited to 'media-video/guvcview')
-rw-r--r--media-video/guvcview/ChangeLog13
-rw-r--r--media-video/guvcview/Manifest20
-rw-r--r--media-video/guvcview/files/guvcview-0.9.6-implicit_declaration_setlocale.patch11
-rw-r--r--media-video/guvcview/files/guvcview-1.0.5-implicit_declaration_setlocale.patch14
-rw-r--r--media-video/guvcview/guvcview-0.9.6.ebuild44
-rw-r--r--media-video/guvcview/guvcview-1.0.5.ebuild21
-rw-r--r--media-video/guvcview/metadata.xml8
7 files changed, 40 insertions, 91 deletions
diff --git a/media-video/guvcview/ChangeLog b/media-video/guvcview/ChangeLog
index 344331678a71..6b7b16ef6729 100644
--- a/media-video/guvcview/ChangeLog
+++ b/media-video/guvcview/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for media-video/guvcview
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/guvcview/ChangeLog,v 1.4 2009/04/23 05:56:27 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/guvcview/ChangeLog,v 1.5 2009/04/29 12:38:18 ssuominen Exp $
+
+ 29 Apr 2009; Samuli Suominen <ssuominen@gentoo.org>
+ -files/guvcview-0.9.6-implicit_declaration_setlocale.patch,
+ +files/guvcview-1.0.5-implicit_declaration_setlocale.patch,
+ -guvcview-0.9.6.ebuild, guvcview-1.0.5.ebuild:
+ Add include for locale.h to get setlocale wrt #267862, thanks to Ivan
+ Miljenovic.
*guvcview-1.0.5 (23 Apr 2009)
@@ -10,7 +17,7 @@
17 Dec 2008; Steve Dibb <beandog@gentoo.org> guvcview-0.9.6.ebuild:
Add ~amd64, bug 250621
- 10 Dec 2008; <ssuominen@gentoo.org>
+ 10 Dec 2008; Samuli Suominen <ssuominen@gentoo.org>
+files/guvcview-0.9.6-implicit_declaration_setlocale.patch,
guvcview-0.9.6.ebuild:
Add include for locale.h to get setlocale wrt #250495, thanks to Ivan
@@ -18,7 +25,7 @@
*guvcview-0.9.6 (09 Dec 2008)
- 09 Dec 2008; <ssuominen@gentoo.org> +guvcview-0.9.6.ebuild:
+ 09 Dec 2008; Samuli Suominen <ssuominen@gentoo.org> +guvcview-0.9.6.ebuild:
Initial commit from Gentoo forums, thanks to RMX for pointing this
application out for me.
diff --git a/media-video/guvcview/Manifest b/media-video/guvcview/Manifest
index 32cc4574e670..5cc2279f352f 100644
--- a/media-video/guvcview/Manifest
+++ b/media-video/guvcview/Manifest
@@ -1,17 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX guvcview-0.9.6-implicit_declaration_setlocale.patch 423 RMD160 df42d7e1d840d19403b68c9ef4262c03a6cafb1e SHA1 773654f98f0aef4de501e3d7c7f5179c30c9e147 SHA256 f5b3dcc80b5a159cf457759eed0ab2425080bc8d7bcbd8c94fb3f4efaac586a9
-DIST guvcview-src-0.9.6.tar.gz 734146 RMD160 dbfea6d533fb806448feb231d33a8ca2ede17ec6 SHA1 5b94d23947a29a5b1b5cb612694728bff6fbe3a7 SHA256 6d054e04981fb030c25680afc080b1afd4b60e944f8de41d19a0596095cf4f0a
+AUX guvcview-1.0.5-implicit_declaration_setlocale.patch 585 RMD160 fe183ab85282bd927f247c070cc59885d1036510 SHA1 94b5bbd271663d0218c245cb6397d18e85a1afb3 SHA256 dd231e49540a0ed4604f4a37ed14608a24e074dc590d469912ca457769d35904
DIST guvcview-src-1.0.5.tar.gz 529290 RMD160 3da44bbd9b127b3bbdd1d77a0f0a47eafb0957c6 SHA1 83190eab57458a92fc748047503c80155c934522 SHA256 050310f1e5c2778b1af98bd8d343b4ebdb4f8c717dbf05c33a15dd6d58f76d82
-EBUILD guvcview-0.9.6.ebuild 1036 RMD160 3711b8342056b5599c47e01fe4f6e45ef4e55bac SHA1 fd6ecba39f555a6762378f8b9de38c4c3096a2b6 SHA256 53f515e489034bba95df75ac501557c1b4b60136c4528036790dcbe74660ff07
-EBUILD guvcview-1.0.5.ebuild 1027 RMD160 7d60cae5be1facd9867bc1d6269d84e83ee297f4 SHA1 8f66439831156b0886cd87e4aaabe8a3c69008c8 SHA256 679ea0700a23cde5469be0655df286f078b73ce888e607d70d7bf7eafdc83840
-MISC ChangeLog 830 RMD160 7760aef8c7786aa35b7c2563918ef6919e965c96 SHA1 4b1a0f416b2e9ed3f0c0765a7331628f89b0da20 SHA256 6ed6bb488da2b8377cd035b4e628bc3e8058b19c57a2ac3395c16883c5159870
-MISC metadata.xml 224 RMD160 a894a47c3ba494f6e918fe6ebc70da6877385457 SHA1 d53ccf04d9b49b1152b19604732fa1c842a70cb6 SHA256 888efa552a0159d0de6ea80ae3d38ab453c12fcc62a0ede08e26ddc35fc1ed2d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAknwAyEACgkQ/ejvha5XGaOT6wCdGkhzY805s32kh32Cr2trywBc
-y3wAoNfLzcLe0Bo31a6Sg6MW8JhF+y//
-=rtAH
------END PGP SIGNATURE-----
+EBUILD guvcview-1.0.5.ebuild 955 RMD160 33db1c09cc21397015564b5ac4cd79a34fc8ab31 SHA1 32c820a1ed38bf72e6a28eaa8bfc9f0937f7aad4 SHA256 8a094fb7a228950dd8d415333d66e2d8432078382069298171602ae46648e470
+MISC ChangeLog 1178 RMD160 8e606130909b3c08fc0fe2d248808327ac4a707b SHA1 c61b45c753770122ee03b90aa4084ce6d321a15c SHA256 2361f6d6e8923fc04aabd2664134fad6f0a55268117059f25f4ae4f8e734d0c9
+MISC metadata.xml 228 RMD160 3071d739d8e15041d594882afdfc434453568466 SHA1 06e3ee83b7a5a910d2d63ea77afb2e5a292606f6 SHA256 060670a1a67923937e4bf55598ae59368d5e716b0b618dedaf12b15f45e8e234
diff --git a/media-video/guvcview/files/guvcview-0.9.6-implicit_declaration_setlocale.patch b/media-video/guvcview/files/guvcview-0.9.6-implicit_declaration_setlocale.patch
deleted file mode 100644
index f2584c24559a..000000000000
--- a/media-video/guvcview/files/guvcview-0.9.6-implicit_declaration_setlocale.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur guvcview-src-0.9.6.orig/src/guvcview.c guvcview-src-0.9.6/src/guvcview.c
---- guvcview-src-0.9.6.orig/src/guvcview.c 2008-12-06 20:51:44.000000000 +0200
-+++ guvcview-src-0.9.6/src/guvcview.c 2008-12-10 12:19:34.000000000 +0200
-@@ -29,6 +29,7 @@
- #include <sys/file.h>
- #include <string.h>
- #include <pthread.h>
-+#include <locale.h>
- #include <SDL/SDL.h>
- //#include <SDL/SDL_thread.h>
- //#include <SDL/SDL_audio.h>
diff --git a/media-video/guvcview/files/guvcview-1.0.5-implicit_declaration_setlocale.patch b/media-video/guvcview/files/guvcview-1.0.5-implicit_declaration_setlocale.patch
new file mode 100644
index 000000000000..d360a9b4ffa1
--- /dev/null
+++ b/media-video/guvcview/files/guvcview-1.0.5-implicit_declaration_setlocale.patch
@@ -0,0 +1,14 @@
+Missing locale.h for setlocale function, http://bugs.gentoo.org/267862.
+
+diff -ur guvcview-src-1.0.5.orig/src/guvcview.c guvcview-src-1.0.5/src/guvcview.c
+--- guvcview-src-1.0.5.orig/src/guvcview.c 2009-04-03 20:25:59.000000000 +0000
++++ guvcview-src-1.0.5/src/guvcview.c 2009-04-29 15:33:45.000000000 +0000
+@@ -23,7 +23,7 @@
+ # #
+ ********************************************************************************/
+
+-
++#include <locale.h>
+ #include <SDL/SDL.h>
+ #include <glib.h>
+ #include <glib/gprintf.h>
diff --git a/media-video/guvcview/guvcview-0.9.6.ebuild b/media-video/guvcview/guvcview-0.9.6.ebuild
deleted file mode 100644
index 52782e698fd0..000000000000
--- a/media-video/guvcview/guvcview-0.9.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/guvcview/guvcview-0.9.6.ebuild,v 1.4 2009/01/07 14:11:40 ssuominen Exp $
-
-inherit eutils
-
-MY_P=${PN}-src-${PV}
-
-DESCRIPTION="GTK+ UVC Viewer"
-HOMEPAGE="http://guvcview.berlios.de"
-SRC_URI="mirror://berlios/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.10
- >=media-libs/libsdl-1.2.10
- >=media-libs/portaudio-19_pre
- media-libs/libpng
- media-sound/twolame"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- sys-devel/gettext"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${P}-implicit_declaration_setlocale.patch
-}
-
-src_compile() {
- econf --disable-dependency-tracking
- emake || die "emake failed."
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed."
- rm -rf "${D}"/usr/share/doc/${PN} "${D}"/usr/share/menu || die "rm -rf failed."
- dodoc AUTHORS ChangeLog README
-}
diff --git a/media-video/guvcview/guvcview-1.0.5.ebuild b/media-video/guvcview/guvcview-1.0.5.ebuild
index f2a7fe35141d..60c197952035 100644
--- a/media-video/guvcview/guvcview-1.0.5.ebuild
+++ b/media-video/guvcview/guvcview-1.0.5.ebuild
@@ -1,7 +1,8 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/guvcview/guvcview-1.0.5.ebuild,v 1.1 2009/04/23 05:56:27 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/guvcview/guvcview-1.0.5.ebuild,v 1.2 2009/04/29 12:38:18 ssuominen Exp $
+EAPI=2
inherit eutils
MY_P=${PN}-src-${PV}
@@ -15,8 +16,8 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-RDEPEND=">=x11-libs/gtk+-2.10
- >=dev-libs/glib-2
+RDEPEND=">=x11-libs/gtk+-2.10:2
+ >=dev-libs/glib-2:2
>=media-video/ffmpeg-0.4.9_p20090201
>=media-libs/libsdl-1.2.10
>=media-libs/portaudio-19_pre
@@ -28,18 +29,12 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${MY_P}
-src_unpack() {
- unpack ${A}
- cd "${S}"
-}
-
-src_compile() {
- econf --disable-dependency-tracking
- emake || die "emake failed."
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-implicit_declaration_setlocale.patch
}
src_install() {
- emake DESTDIR="${D}" install || die "emake install failed."
- rm -rf "${D}"/usr/share/doc/${PN} "${D}"/usr/share/menu || die "rm -rf failed."
+ emake DESTDIR="${D}" install || die "emake install failed"
+ rm -rf "${D}"/usr/share/{menu,doc/${PN}}
dodoc AUTHORS ChangeLog README
}
diff --git a/media-video/guvcview/metadata.xml b/media-video/guvcview/metadata.xml
index 2c5e04917119..0d9b0dcb7f33 100644
--- a/media-video/guvcview/metadata.xml
+++ b/media-video/guvcview/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>video</herd>
-<maintainer>
- <email>media-video@gentoo.org</email>
-</maintainer>
+ <herd>video</herd>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ </maintainer>
</pkgmetadata>