Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/media-libs
diff options
context:
space:
mode:
authorAlastair Tse <liquidx@gentoo.org>2003-09-06 16:02:55 +0000
committerAlastair Tse <liquidx@gentoo.org>2003-09-06 16:02:55 +0000
commite201ea0e8cd0c390b7597f1e1062dfe83880262a (patch)
treea36988107e92c5628f7e12130c6fdbcfa259e9f6 /media-libs
parentadded canon powershot usb ids compiled by user (diff)
downloadgentoo-2-e201ea0e8cd0c390b7597f1e1062dfe83880262a.tar.gz
gentoo-2-e201ea0e8cd0c390b7597f1e1062dfe83880262a.tar.bz2
gentoo-2-e201ea0e8cd0c390b7597f1e1062dfe83880262a.zip
added canon powershot usb ids compiled by user
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/libgphoto2/ChangeLog9
-rw-r--r--media-libs/libgphoto2/Manifest4
-rw-r--r--media-libs/libgphoto2/files/canon.powershot.usermap42
-rw-r--r--media-libs/libgphoto2/files/digest-libgphoto2-2.1.2-r11
-rw-r--r--media-libs/libgphoto2/libgphoto2-2.1.2-r1.ebuild79
5 files changed, 132 insertions, 3 deletions
diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index 8d3e66367fb1..5dcb04c94cae 100644
--- a/media-libs/libgphoto2/ChangeLog
+++ b/media-libs/libgphoto2/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for media-libs/libgphoto2
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.10 2003/09/02 23:13:53 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.11 2003/09/06 16:02:50 liquidx Exp $
+
+*libgphoto2-2.1.2-r1 (06 Sep 2003)
+
+ 06 Sep 2003; Alastair Tse <liquidx@gentoo.org> libgphoto2-2.1.2-r1.ebuild,
+ files/canon.powershot.usermap:
+ added Canon Powershow usb hotplug usermap. Compiled by james
+ <zeurx@hotmail.com> (#24988).
03 Sep 2003; Alastair Tse <liquidx@gentoo.org> libgphoto2-2.1.2.ebuild:
added usbutils dep to make sure we get the latest non-conflicting
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index eaa059ddbbe7..6b0937864e83 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,7 +1,7 @@
-MD5 496afbf5d51b7132fb33244265d54c6c ChangeLog 1948
+MD5 64410867ceda782fb89379d9054c1b11 ChangeLog 2190
MD5 f3bc84b09c705f02e55251e24c3488a9 libgphoto2-2.1.1-r2.ebuild 1398
MD5 192ed79a1946fdb0ae7b8f5bdcff8cbb libgphoto2-2.1.1-r3.ebuild 1968
-MD5 e3165bb604ff04e2dfc480f8f8d4ef85 libgphoto2-2.1.2-r1.ebuild 2196
+MD5 33fdec8076902e51b7c27f8da0efcf5e libgphoto2-2.1.2-r1.ebuild 2199
MD5 e9cc68302e6463363db48fe924465f96 libgphoto2-2.1.2.ebuild 2077
MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217
MD5 320495da537b3921df19e080aecc5e4c files/canon.powershot.usermap 4485
diff --git a/media-libs/libgphoto2/files/canon.powershot.usermap b/media-libs/libgphoto2/files/canon.powershot.usermap
new file mode 100644
index 000000000000..329178f1ccd1
--- /dev/null
+++ b/media-libs/libgphoto2/files/canon.powershot.usermap
@@ -0,0 +1,42 @@
+# Canon PowerShot A10
+usbcam 0x0003 0x04a9 0x304f 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
+# Canon PowerShot A100
+usbcam 0x0003 0x04a9 0x3061 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
+# Canon PowerShot A20
+usbcam 0x0003 0x04a9 0x304e 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
+# Canon PowerShot A200
+usbcam 0x0003 0x04a9 0x3062 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
+# Canon PowerShot A30
+usbcam 0x0003 0x04a9 0x3059 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
+# Canon PowerShot A40
+usbcam 0x0003 0x04a9 0x3058 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
+# Canon PowerShot A60
+usbcam 0x0003 0x04a9 0x3074 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
+# Canon PowerShot A70
+usbcam 0x0003 0x04a9 0x3073 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000" >> usb.usermap
+# Canon PowerShot S10
+usbcam 0x0003 0x04a9 0x3041 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
+# Canon PowerShot S100
+usbcam 0x0003 0x04a9 0x3045 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
+# Canon PowerShot S110
+usbcam 0x0003 0x04a9 0x3051 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
+# Canon PowerShot S20
+usbcam 0x0003 0x04a9 0x3043 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
+# Canon PowerShot S200
+usbcam 0x0003 0x04a9 0x3065 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
+# Canon PowerShot S230 (normal mode)
+usbcam 0x0003 0x04a9 0x3070 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
+# Canon PowerShot S230 (PTP mode)
+usbcam 0x0003 0x04a9 0x3071 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
+# Canon PowerShot S30
+usbcam 0x0003 0x04a9 0x3057 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
+# Canon PowerShot S300
+usbcam 0x0003 0x04a9 0x304c 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
+# Canon PowerShot S40
+usbcam 0x0003 0x04a9 0x3056 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
+# Canon PowerShot S45 (normal mode)
+usbcam 0x0003 0x04a9 0x306c 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
+# Canon PowerShot S45 (PTP mode)
+usbcam 0x0003 0x04a9 0x306d 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000
+# USB PTP Class Camera
+usbcam 0x0080 0x0000 0x0000 0x0000 0x0000 0x06 0x00 0x00 0x00 0x00 0x00 0x00000000
diff --git a/media-libs/libgphoto2/files/digest-libgphoto2-2.1.2-r1 b/media-libs/libgphoto2/files/digest-libgphoto2-2.1.2-r1
new file mode 100644
index 000000000000..32136093447d
--- /dev/null
+++ b/media-libs/libgphoto2/files/digest-libgphoto2-2.1.2-r1
@@ -0,0 +1 @@
+MD5 ded0d8262d02e4c215ffc0d73d5acbbb libgphoto2-2.1.2.tar.bz2 1743528
diff --git a/media-libs/libgphoto2/libgphoto2-2.1.2-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.1.2-r1.ebuild
new file mode 100644
index 000000000000..a3db4957d5ec
--- /dev/null
+++ b/media-libs/libgphoto2/libgphoto2-2.1.2-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.2-r1.ebuild,v 1.1 2003/09/06 16:02:50 liquidx Exp $
+
+inherit libtool
+
+MAKEOPTS="-j1" # or the documentation fails. bah!
+
+DESCRIPTION="free, redistributable digital camera software application"
+HOMEPAGE="http://www.gphoto.org/"
+SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc"
+IUSE="nls doc jpeg"
+
+# needs >usbutils-0.11-r2 to avoid /usr/lib/libusb* conflicts with dev-libs/libusb
+RDEPEND=">=dev-libs/libusb-0.1.6
+ >=sys-apps/usbutils-0.11-r2
+ sys-apps/hotplug
+ jpeg? ( >=media-libs/libexif-0.5.9 )"
+
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig
+ doc? ( dev-util/gtk-doc )"
+
+src_unpack() {
+ unpack ${A}
+ epatch ${FILESDIR}/${P}-norpm.patch
+}
+
+src_compile() {
+ elibtoolize
+
+ local myconf
+
+ myconf="--with-rpmbuild=/bin/false"
+
+ use jpeg \
+ && myconf="${myconf} --with-exif-prefix=/usr" \
+ || myconf="${myconf} --without-exif"
+
+ myconf="${myconf} `use_enable nls`"
+ myconf="${myconf} `use_enable doc docs`"
+
+ econf ${myconf}
+ emake || die "make failed"
+}
+
+src_install() {
+ make DESTDIR=${D} \
+ gphotodocdir=/usr/share/doc/${PF} \
+ HTML_DIR=/usr/share/doc/${PF}/sgml \
+ hotplugdocdir=/usr/share/doc/${PF}/linux-hotplug \
+ install || die "install failed"
+
+ # manually move apidocs
+ if [ -n "`use doc`" ]; then
+ dodir /usr/share/doc/${PF}/api
+ mv ${D}/usr/share/doc/libgphoto2/html/api/* ${D}/usr/share/doc/${PF}/api/
+ mv ${D}/usr/share/doc/libgphoto2_port/html/api/* ${D}/usr/share/doc/${PF}/api/
+ fi
+ rm -rf ${D}/usr/share/doc/libgphoto2
+ rm -rf ${D}/usr/share/doc/libgphoto2_port
+
+ dodoc ChangeLog NEWS* README AUTHORS TESTERS MAINTAINERS HACKING CHANGES
+
+ # install hotplug support
+ insinto /etc/hotplug/usb
+ newins ${S}/packaging/linux-hotplug/usbcam.console usbcam
+ chmod +x ${D}/etc/hotplug/usb/usbcam
+
+ HOTPLUG_USERMAP="${D}/etc/hotplug/usb/usbcam.usermap"
+ ${D}/usr/lib/libgphoto2/print-usb-usermap >> ${HOTPLUG_USERMAP}
+
+ # additional canon powershot usb ids. james <zeurx@hotmail.com> (#24988)
+ doins ${FILESDIR}/canon.powershot.usermap
+}