diff options
| author |   Matthew Kennedy <mkennedy@gentoo.org> | 2002-06-15 04:13:05 +0000 |
|---|---|---|
| committer | Matthew Kennedy <mkennedy@gentoo.org> | 2002-06-15 04:13:05 +0000 |
| commit | 1eeacb01dcaa4f2caa28977bd8929096568f4e9c (patch) | |
| tree | ee6b254afd9accd490a99e086e560273f095686b | |
| parent | New version (diff) | |
| download | gentoo-2-1eeacb01dcaa4f2caa28977bd8929096568f4e9c.tar.gz gentoo-2-1eeacb01dcaa4f2caa28977bd8929096568f4e9c.tar.bz2 gentoo-2-1eeacb01dcaa4f2caa28977bd8929096568f4e9c.zip | |
Fixed broken gphoto code so this actually compiles.
| -rw-r--r-- | media-gfx/gphoto/ChangeLog | 11 | ||||
| -rw-r--r-- | media-gfx/gphoto/files/digest-gphoto-0.4.3-r2 | 1 | ||||
| -rw-r--r-- | media-gfx/gphoto/files/gphoto-0.4.3-sony-command.c-gentoo.patch | 17 | ||||
| -rw-r--r-- | media-gfx/gphoto/gphoto-0.4.3-r2.ebuild | 36 |
4 files changed, 64 insertions, 1 deletions
diff --git a/media-gfx/gphoto/ChangeLog b/media-gfx/gphoto/ChangeLog index d7644c091db0..83fcd630e977 100644 --- a/media-gfx/gphoto/ChangeLog +++ b/media-gfx/gphoto/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for media-gfx/gphoto # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto/ChangeLog,v 1.3 2002/03/17 22:20:46 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto/ChangeLog,v 1.4 2002/06/15 04:13:05 mkennedy Exp $ + +*gphoto-0.4.3-r2 (12 June 2002) + + 12 June 2002; Matthew Kennedy <mkennedy@gentoo.org> + files/digest-gphoto-0.4.3-r2, + files/gphoto-0.4.3-sony-command.c-gentoo.patch, + gphoto-0.4.3-r2.ebuild, ChangeLog : + + Fixed broken gphoto code so this actually compiles. *gphoto-2.0-r1 (16 March 2002) diff --git a/media-gfx/gphoto/files/digest-gphoto-0.4.3-r2 b/media-gfx/gphoto/files/digest-gphoto-0.4.3-r2 new file mode 100644 index 000000000000..5b969bfce3f4 --- /dev/null +++ b/media-gfx/gphoto/files/digest-gphoto-0.4.3-r2 @@ -0,0 +1 @@ +MD5 8b4e70df78870479d2d9a45c8f4db5f4 gphoto-0.4.3.tar.gz 709336 diff --git a/media-gfx/gphoto/files/gphoto-0.4.3-sony-command.c-gentoo.patch b/media-gfx/gphoto/files/gphoto-0.4.3-sony-command.c-gentoo.patch new file mode 100644 index 000000000000..bd35b74cf3ae --- /dev/null +++ b/media-gfx/gphoto/files/gphoto-0.4.3-sony-command.c-gentoo.patch @@ -0,0 +1,17 @@ +--- command.c 1999-05-27 13:32:06.000000000 -0500 ++++ command.c.tmp 2002-06-14 23:05:47.000000000 -0500 +@@ -288,11 +288,11 @@ + break;
+ }
+ sprintf(tmp_buf, "Total Pictures: %02d\n", pic_num);
+- strcat(status_buf, tmp_buf, sizeof(tmp_buf));
++ strncat(status_buf, tmp_buf, sizeof(tmp_buf));
+ sprintf(tmp_buf, "Date: %02d/%02d/%02d\n", month, date, year);
+- strcat(status_buf, tmp_buf, sizeof(tmp_buf));
++ strncat(status_buf, tmp_buf, sizeof(tmp_buf));
+ sprintf(tmp_buf, "Time: %02d:%02d\n",hour, minutes);
+- strcat(status_buf, tmp_buf, sizeof(tmp_buf));
++ strncat(status_buf, tmp_buf, sizeof(tmp_buf));
+ }
+ /* return (buf[2]); ok*/
+ strcpy(return_buf, status_buf);
diff --git a/media-gfx/gphoto/gphoto-0.4.3-r2.ebuild b/media-gfx/gphoto/gphoto-0.4.3-r2.ebuild new file mode 100644 index 000000000000..1c43e6a2ecba --- /dev/null +++ b/media-gfx/gphoto/gphoto-0.4.3-r2.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2002 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License, v2 or later +# Author AJ Lewis <aj@gentoo.org> +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gphoto/gphoto-0.4.3-r2.ebuild,v 1.1 2002/06/15 04:13:04 mkennedy Exp $ + + +S=${WORKDIR}/${P} +DESCRIPTION="free, redistributable digital camera software application" +SRC_URI="http://www.gphoto.net/dist/${P}.tar.gz" +HOMEPAGE="http://www.gphoto.org" + +DEPEND="virtual/glibc + >=media-libs/imlib-1.9.10-r1 + >=media-gfx/imagemagick-4.1" + +src_unpack() { + unpack ${A} + cd ${S}/sony + patch <${FILESDIR}/gphoto-0.4.3-sony-command.c-gentoo.patch +} + +src_compile() { + + # -pipe does no work + CFLAGS="${CFLAGS/-pipe}" + ./configure --prefix=/usr --sysconfdir=/etc/gnome || die + make clean || die + pmake || die +} + +src_install() { + make prefix=${D}/usr sysconfdir=${D}/etc/gnome install || die + dodoc AUTHORS CONTACTS COPYING ChangeLog FAQ MANUAL NEWS* PROGRAMMERS \ + README THANKS THEMES TODO +} + |