rev bump for new canon ids support (#67238). thanks to Robert Davis <rdavis@unico.com>

7 files changed, 224 insertions, 102 deletions

diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index a6d22fa28dad..06ffa31ae214 100644
--- a/media-libs/libgphoto2/ChangeLog
+++ b/media-libs/libgphoto2/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/libgphoto2
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.35 2004/10/17 11:33:16 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.36 2004/10/22 23:26:51 liquidx Exp $
+
+*libgphoto2-2.1.4-r1 (23 Oct 2004)
+
+  23 Oct 2004; Alastair Tse <liquidx@gentoo.org>
+  +files/libgphoto2-2.1.4-canon.patch, -libgphoto2-2.1.3.ebuild,
+  +libgphoto2-2.1.4-r1.ebuild:
+  rev bump for new canon ids support (#67238). thanks to Robert Davis
+  <rdavis@unico.com>
 
   17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> libgphoto2-2.1.4.ebuild:
   stable on amd64.
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 57b142383e82..5cd5962ad3ad 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,15 +1,16 @@
 MD5 9f138f802ccda0b21d4e646a3e8886d5 ChangeLog 5981
 MD5 5486abc5e535376eed3bd94b7d947b8b libgphoto2-2.1.3-r1.ebuild 3622
-MD5 3d38d90a3725f02565866268fc5eb422 libgphoto2-2.1.3.ebuild 2884
 MD5 4ac7382e672633492fe9b4e501c1fe72 libgphoto2-2.1.4.ebuild 3876
 MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217
+MD5 7cae12ee7641c24f485de007585e9e37 libgphoto2-2.1.4-r1.ebuild 3952
 MD5 8fc24b590738d4420bb8df6521fbbda0 files/canon.powershot.usermap 4575
-MD5 ba2eb5dbe5b2b2214d41dafc6ec6993d files/digest-libgphoto2-2.1.3 70
 MD5 ba2eb5dbe5b2b2214d41dafc6ec6993d files/digest-libgphoto2-2.1.3-r1 70
 MD5 e396fe3bbcfd38d33ec78004f27db148 files/digest-libgphoto2-2.1.4 70
 MD5 ededea10cd8bf8a2f0d3f106c10b20ff files/libgphoto2-2.1.1-norpm.patch 533
 MD5 e860333a276c3461b4fc8cfdd0b09263 files/libgphoto2-2.1.2-canon.patch 4929
 MD5 91db4be9fea579f0440cef2d114fcab3 files/libgphoto2-2.1.2-norpm.patch 533
 MD5 1a200bb63548924b958987cd87c45dda files/libgphoto2-2.1.3-canon.patch 8487
-MD5 3b33f744c18b1251ef1d6ce48978dd6b files/libgphoto2-2.1.4-gcc2_fixes.patch 1680
 MD5 d9f7cf4aab81ea4981c30a5e313f3f8e files/libgphoto2-2.1.4-blink2.patch 1655
+MD5 3b33f744c18b1251ef1d6ce48978dd6b files/libgphoto2-2.1.4-gcc2_fixes.patch 1680
+MD5 f7704d68a87116356901f49376fa1778 files/libgphoto2-2.1.4-canon.patch 3594
+MD5 e396fe3bbcfd38d33ec78004f27db148 files/digest-libgphoto2-2.1.4-r1 70
diff --git a/media-libs/libgphoto2/files/digest-libgphoto2-2.1.3 b/media-libs/libgphoto2/files/digest-libgphoto2-2.1.3
deleted file mode 100644
index 2bef17c44e3f..000000000000
--- a/media-libs/libgphoto2/files/digest-libgphoto2-2.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 af200308629fcbe0b88d3802bba04779 libgphoto2-2.1.3.tar.bz2 1797303
diff --git a/media-libs/libgphoto2/files/digest-libgphoto2-2.1.4-r1 b/media-libs/libgphoto2/files/digest-libgphoto2-2.1.4-r1
new file mode 100644
index 000000000000..9244e6b04166
--- /dev/null
+++ b/media-libs/libgphoto2/files/digest-libgphoto2-2.1.4-r1
@@ -0,0 +1 @@
+MD5 a201650482bbc2edbd948449cf4d3f5a libgphoto2-2.1.4.tar.bz2 1819325
diff --git a/media-libs/libgphoto2/files/libgphoto2-2.1.4-canon.patch b/media-libs/libgphoto2/files/libgphoto2-2.1.4-canon.patch
new file mode 100644
index 000000000000..118d67926a5b
--- /dev/null
+++ b/media-libs/libgphoto2/files/libgphoto2-2.1.4-canon.patch
@@ -0,0 +1,92 @@
+--- camlibs/canon/canon.c	22 Aug 2004 22:19:30 -0000	1.248
++++ camlibs/canon/canon.c	9 Sep 2004 08:39:09 -0000
+@@ -184,6 +187,15 @@
+ 	/* PS G5 uses the same ProductID for PTP and Canon, with protocol autodetection */
+ 	{"Canon:PowerShot G5 (normal mode)",	CANON_PS_G5,	0x04A9, 0x3085, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
+ 	{"Canon:PowerShot A80 (normal mode)",CANON_PS_A80,      0x04A9, 0x309A, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
++	{"Canon:PowerShot S60 (normal mode)", CANON_PS_S60,     0x04A9, 0x30b2, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
++	{"Canon:Digital IXUS 500 (normal mode)",CANON_PS_S500,  0x04A9, 0x30b4, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
++	 {"Canon:PowerShot A75",        CANON_PS_A75, 	        0x04A9, 0x30b5, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
++	 {"Canon:PowerShot A400",	CANON_PS_A400,		0x0DA9, 0x30b7,	CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
++	{"Canon:PowerShot A310",        CANON_PS_A310,          0x04A9, 0x30b8, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL}, 
++	{"Canon:PowerShot S410 (normal mode)",CANON_PS_S410,  0x04A9, 0x30ba, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
++	{"Canon:Digital IXUS 430 (normal mode)",CANON_PS_S410,  0x04A9, 0x30ba, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
++	{"Canon:PowerShot A95 (normal mode)",CANON_PS_A95,  0x04A9, 0x30bb, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
++	{"Canon:PowerShot A85 (normal mode)",CANON_PS_A85,  0x04A9, 0x30be, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
+ 
+ 	{NULL}
+ 	/* *INDENT-ON* */
+diff -u -3 -p -r1.95 canon.h
+--- camlibs/canon/canon.h	14 Aug 2004 00:24:12 -0000	1.95
++++ camlibs/canon/canon.h	9 Sep 2004 08:39:09 -0000
+@@ -68,7 +68,10 @@
+  * @CANON_PS_A50: PowerShot A50
+  * @CANON_PS_A60: PowerShot A60
+  * @CANON_PS_A70: PowerShot A70
++ * @CANON_PS_A75: PowerShot A75
++ * @CANON_PS_A85: PowerShot A95
+  * @CANON_PS_A80: PowerShot A80
++ * @CANON_PS_A95: PowerShot A95
+  * @CANON_PS_PRO70: PowerShot Pro70
+  * @CANON_PS_S10: PowerShot S10
+  * @CANON_PS_S20: PowerShot S20
+@@ -91,11 +94,15 @@
+  * @CANON_PS_A300: PowerShot A300
+  * @CANON_PS_S200: PowerShot S200, Digital IXUS v2
+  * @CANON_PS_S330: Digital IXUS 330
++ * @CANON_PS_S410: Digital IXUS 430
++ * @CANON_PS_S500: Digital IXUS 500
+  * @CANON_PS_S45: PowerShot S45
++ * @CANON_PS_S60: PowerShot S60
+  * @CANON_PS_G3: PowerShot G3
+  * @CANON_PS_G5: PowerShot G5
+  * @CANON_PS_S230: PowerShot S230, Digital IXUS v3
+  * @CANON_MV630I: MV630i camcorder
++ * @CANON_MV650I: MV650i camcorder
+  * @CANON_EOS_10D: EOS 10D
+  * @CANON_OPT_10: Optura 10
+  * @CANON_OPT_20: Optura 20
+@@ -109,6 +116,7 @@
+  * @CANON_PS_S50: PowerShot S50
+  * @CANON_PS_S400: PowerShot S400, Digital IXUS 400
+  * @CANON_PS_SD100: PowerShot SD100, Digital IXUS II
++ * @CANON_PS_A400: PowerShot A400
+  *
+  * Enumeration of all camera types currently supported.
+  *
+@@ -119,7 +127,10 @@
+ 	CANON_PS_A50,
+ 	CANON_PS_A60,
+ 	CANON_PS_A70,
++	CANON_PS_A75,
+ 	CANON_PS_A80,
++	CANON_PS_A85,
++  	CANON_PS_A95,
+ 	CANON_PS_S10,
+ 	CANON_PS_S20,
+ 	CANON_PS_S30,
+@@ -141,11 +152,14 @@
+ 	CANON_PS_A100,
+ 	CANON_PS_A200,
+ 	CANON_PS_A300,
++	CANON_PS_A310,
++	CANON_PS_A400,
+ 	CANON_PS_S50,
+ 	CANON_PS_S45,
+ 	CANON_PS_G3,
+ 	CANON_PS_S230,
+ 	CANON_MV630I,
++	CANON_MV650I,
+ 	CANON_EOS_10D,
+ 	CANON_OPT_200,
+ 	/* In Mac OS Image Capture, but not yet seen in the wild. */
+@@ -156,6 +170,9 @@
+ 	CANON_PS_UNK5,
+ 	/* other cameras */
+ 	CANON_PS_S400,
++	CANON_PS_S410,
++	CANON_PS_S60,
++	CANON_PS_S500,
+ 	CANON_PS_SD100,
+ 	CANON_EOS_300D,
+ 	CANON_PS_G5,
diff --git a/media-libs/libgphoto2/libgphoto2-2.1.3.ebuild b/media-libs/libgphoto2/libgphoto2-2.1.3.ebuild
deleted file mode 100644
index f6b13b0fbd20..000000000000
--- a/media-libs/libgphoto2/libgphoto2-2.1.3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.3.ebuild,v 1.9 2004/10/07 02:50:44 eradicator Exp $
-
-inherit libtool eutils
-
-DESCRIPTION="Library that implements support for numerous digital cameras"
-HOMEPAGE="http://www.gphoto.org/"
-SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc amd64"
-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}
-	>=sys-devel/patch-2.5.9
-	dev-util/pkgconfig
-	doc? ( dev-util/gtk-doc )"
-
-# By default, drivers for all supported cards will be compiled.
-# If you want to only compile for specific card(s), set GPHOTO_LIBS
-# environment to a comma-separated list (no spaces) of drivers that 
-# you want to build.
-#
-# For example:
-#
-#   env GPHOTO_LIBS='canon,ptp2' emerge libgphoto2
-#
-# drivers: agfa-cl20, barbie, canon, casio, digita, dimera,
-#          directory, fuji, gsmart300, jamcam,
-#          jd11, kodak, konica, mustek, largan,
-#          minolta, panasonic, pccam300, pccam600,
-#          polaroid, ptp2, ricoh, samsung, smal,
-#          sierra, sipix, sonydscf1, sonydscf55,
-#          soundvision, spca50x, sq905, stv0680, sx330z
-#
-[ -z "${GPHOTO_LIBS}" ] && GPHOTO_LIBS="all"
-
-src_unpack() {
-	unpack ${A}
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.1.2-norpm.patch
-}
-
-src_compile() {
-	elibtoolize
-
-	local myconf
-
-	myconf="--with-rpmbuild=/bin/false"
-
-	myconf="--with-drivers=${GPHOTO_LIBS}"
-
-	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} || die "econf failed"
-	# or the documentation fails.
-	emake -j1 || 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 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/$(get_libdir)/libgphoto2/print-usb-usermap >> ${HOTPLUG_USERMAP}
-}
diff --git a/media-libs/libgphoto2/libgphoto2-2.1.4-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.1.4-r1.ebuild
new file mode 100644
index 000000000000..387e19ca5d82
--- /dev/null
+++ b/media-libs/libgphoto2/libgphoto2-2.1.4-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.4-r1.ebuild,v 1.1 2004/10/22 23:26:51 liquidx Exp $
+
+inherit libtool eutils
+
+DESCRIPTION="Library that implements support for numerous digital cameras"
+HOMEPAGE="http://www.gphoto.org/"
+SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~ia64 ~ppc64"
+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 )"
+
+# By default, drivers for all supported cards will be compiled.
+# If you want to only compile for specific card(s), set CAMERAS
+# environment to a comma-separated list (no spaces) of drivers that
+# you want to build.
+IUSE_CAMERAS="agfa-cl20 barbie canon casio digita dimera directory fuji gsmart300 jamcam jd11
+kodak konica mustek largan minolta panasonic pccam300 pccam600 polaroid ptp2 ricoh samsung
+smal sierra sipix sonydscf1 sonydscf55 soundvision spca50x sq905 stv0680 sx330z"
+
+pkg_setup() {
+	if [ -z "${CAMERAS}" ] ; then
+		ewarn "All camera drivers will be built since you did not specify"
+		ewarn "via the CAMERAS variable what camera you use."
+		einfo "libgphoto2 supports: all ${IUSE_CAMERAS}"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-2.1.2-norpm.patch
+	# add stylcam snap support (#52932)
+	epatch ${FILESDIR}/${PN}-2.1.4-blink2.patch
+	# Fix compilation under gcc-2.
+	epatch ${FILESDIR}/${P}-gcc2_fixes.patch
+	# add more canon cameras (#67238)
+	epatch ${FILESDIR}/${P}-canon.patch
+}
+
+src_compile() {
+	local cameras
+	local cam
+	for cam in ${CAMERAS} ; do
+		has ${cam} ${IUSE_CAMERAS} && cameras="${cameras},${cam}"
+	done
+	[ -z "${cameras}" ] \
+		&& cameras="all" \
+		|| cameras="${cameras:1}"
+	einfo $cameras
+
+	elibtoolize
+
+	local myconf
+
+	myconf="--with-rpmbuild=/bin/false"
+	myconf="--with-drivers=${cameras}"
+	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} || die "econf failed"
+	# or the documentation fails.
+	emake -j1 || 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 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
+}
+
+pkg_postinst() {
+	einfo "Generating usbcam-gphoto2.usermap .."
+	HOTPLUG_USERMAP="/etc/hotplug/usb/usbcam-gphoto2.usermap"
+	if [ -x ${ROOT}/usr/$(get_libdir)/libgphoto2/print-usb-usermap ]; then
+		echo "# !!! DO NOT EDIT THIS FILE !!! This file is automatically generated." > ${ROOT}/${HOTPLUG_USERMAP}
+		echo "# Put your custom entries in /etc/hotplug/usb/usbcam.usermap" >> ${ROOT}/${HOTPLUG_USERMAP}
+		${ROOT}/usr/$(get_libdir)/libgphoto2/print-usb-usermap >> ${ROOT}/${HOTPLUG_USERMAP}
+	else
+		eerror "Unable to find ${ROOT}/usr/$(get_libdir)/libgphoto2/print-usb-usermap"
+		eerror "and therefore unable to generate hotplug usermap."
+		eerror "You will have to manually generate it by running:"
+		eerror " /usr/$(get_libdir)/libgphoto2/print-usb-usermap > ${HOTPLUG_USERMAP}"
+	fi
+}