Fix automagic dependencies on jpeg and gd, bug #374371 by Enlik. Thanks also to marcusmeissner.

Package-Manager: portage-2.1.10.6/cvs/Linux x86_64

4 files changed, 278 insertions, 5 deletions

diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index b7b28b659c97..cb85c8790b7f 100644
--- a/media-libs/libgphoto2/ChangeLog
+++ b/media-libs/libgphoto2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libgphoto2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.192 2011/07/13 14:27:00 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.193 2011/07/18 18:52:31 pacho Exp $
+
+*libgphoto2-2.4.11-r1 (18 Jul 2011)
+
+  18 Jul 2011; Pacho Ramos <pacho@gentoo.org> +libgphoto2-2.4.11-r1.ebuild,
+  +files/libgphoto2-2.4.11-fix-automagic.patch:
+  Fix automagic dependencies on jpeg and gd, bug #374371 by Enlik. Thanks also
+  to marcusmeissner.
 
   13 Jul 2011; Pacho Ramos <pacho@gentoo.org> libgphoto2-2.4.11.ebuild:
   Fix udev location rules, bug #374989 by Jonathan Callen.
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 7d541b671ec0..c4ee9d68f4a5 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX libgphoto2-2.4.11-fix-automagic.patch 1911 RMD160 7f09f32c30708f7bf12b39f39e2c7cfd29397695 SHA1 85df7847c85af6b3696c8b61949b033c2999610d SHA256 69f97bfb5f20c4e532f730772dd51b86893b176c9504816cf57c13843bd9425a
 AUX libgphoto2-2.4.7-no-test-build.patch 910 RMD160 fbc59f08c752874df09f63beca0c89fc5e6a2e96 SHA1 4518c19cc1e21eac86cbbaf8ca3d33193ee6adc8 SHA256 a5d7ab59c51bb9751ade660828447d4767ab6266192345dbb22c820232e9291e
 AUX libgphoto2-2.4.7-respect-bonjour.patch 643 RMD160 09724f2d7ad94938785709548ca7d246aa3bfac4 SHA1 49334840e851f3ab0c632df5031acbbae7335c57 SHA256 00b09825d9b6493a2a65577c6bf0b2a5549c6901b8b5fb839f886d989e29c055
 AUX libgphoto2-2.4.8-increase_max_entries.patch 477 RMD160 4be0b81331eedd0233b577226f70e0c220b869ae SHA1 2b6cd2967b6d16ab13ef7826781a93b852be69a1 SHA256 596ab7c4edc7573044e89ac548505b82de18f791616126273ff4fe13c935b4f8
@@ -8,13 +9,14 @@ AUX libgphoto2-2.4.9-dnl.patch 471 RMD160 062158e62551d43f9515f64054dd37ad0c9b15
 DIST libgphoto2-2.4.10.tar.bz2 5699257 RMD160 d4f6e33c745910877ddc1f804911a76e47f5f5da SHA1 0fbbcfdfe13c3cf128505e3079faf55407b647c5 SHA256 8bb28232c246c19465724dbca2f511dd56feaee3cdb018589e8370c46f1cf1cd
 DIST libgphoto2-2.4.11.tar.bz2 4396949 RMD160 f4978edecd0869f91d15b0c9805dd856b856f14c SHA1 615776c8c0201e98bfe158ae8c2cec35f93236f0 SHA256 5116bbacea57dfe22585e8e939ea30b5fb99fe08de526002788c84e37105c423
 EBUILD libgphoto2-2.4.10.ebuild 6181 RMD160 213c4a690436147784034e1cd1cee5c80998bfdd SHA1 7f23c9a1c3ce222051468d6fcad83b8be13e9437 SHA256 e5b4299b49b2a6676ee2f291fe1b131f5db59d2ff13109f78eba102235d66822
+EBUILD libgphoto2-2.4.11-r1.ebuild 6232 RMD160 783453c9118f9742fe93095fecec4245da53f3a7 SHA1 13164ab339325260b4c8d604c95c33031719657c SHA256 3eb8054f29869e4c95d5b0427044b896fefbe783685ac714be24f4644b05c4d7
 EBUILD libgphoto2-2.4.11.ebuild 6036 RMD160 729fa98442ed20e14bc14c1b34d0ee40b15b44c8 SHA1 6185e6e2ba8b13cd0967d5f28095d60996b58ec2 SHA256 1ee370b082fdc255fec78347dc3292b5f912ee1a67c882d282d06d4f2f8fc46e
-MISC ChangeLog 32013 RMD160 e3424b054673033e4c862d26bfe0f6930d2099d3 SHA1 0445b9295c11247a31c61591a4fe4251ad666d0f SHA256 dbcdb422c65bcaeaa74a8d63d8bab3863609031d624c142335316f629c759176
+MISC ChangeLog 32275 RMD160 4eff687576918070b2bfed0bf8015a9223170808 SHA1 1e34e9927c8481486537d7209a8c99fcf6ecc325 SHA256 054246f93ec343b2e35b5c86b05e127602ea5337a76ba47992bd1f64b2062404
 MISC metadata.xml 182 RMD160 5f49130c67eb53fd2c6ebe0de1fc022095660261 SHA1 5ae56f5c257c146dfe43fd8556cf742e79758f3a SHA256 6ce4ccce668fc2a8c0598e348462ae041f477022bd8bc407c7c5e4ba98eabc5b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4dqzoACgkQCaWpQKGI+9RdkgCfcrTwbgoDTRVEQsOVpn06cYM/
-ICYAn12wSnxo7oolZ+K1wc6jERfXMMF5
-=2XXF
+iEYEARECAAYFAk4kgPYACgkQCaWpQKGI+9SnKQCeP9yMD948oIsKQCQfouVz97oq
+Y9AAnjZW+JTIigthPo8zm9S5gdSm1PGl
+=wkq9
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libgphoto2/files/libgphoto2-2.4.11-fix-automagic.patch b/media-libs/libgphoto2/files/libgphoto2-2.4.11-fix-automagic.patch
new file mode 100644
index 000000000000..09eff5ade77b
--- /dev/null
+++ b/media-libs/libgphoto2/files/libgphoto2-2.4.11-fix-automagic.patch
@@ -0,0 +1,51 @@
+--- branches/libgphoto2-2_4/libgphoto2/configure.ac	2011/06/14 14:06:51	13653
++++ branches/libgphoto2-2_4/libgphoto2/configure.ac	2011/07/16 11:41:59	13663
+@@ -5,7 +5,7 @@
+ dnl       So lastversion.X.trunk for instance. Bump X if necessary.
+ 
+ dnl ******* THE NEXT RELEASE VERSION MUST BE 2.4.12 at least or higher!
+-AC_INIT([libgphoto2 photo camera library], [2.4.11], [gphoto-devel@lists.sourceforge.net], [libgphoto2])
++AC_INIT([libgphoto2 photo camera library], [2.4.11], [gphoto-devel@lists.sourceforge.net], [libgphoto2])
+ AC_CONFIG_SRCDIR([libgphoto2/gphoto2-version.c])
+ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_MACRO_DIR([auto-m4])
+@@ -259,11 +259,14 @@
+ LIBJPEG=""
+ libjpeg_msg="no"
+ AC_SUBST(LIBJPEG)
+-AC_CHECK_LIB(jpeg,jpeg_start_decompress,[
+-	AC_CHECK_HEADER(jpeglib.h,[
+-		AC_DEFINE(HAVE_LIBJPEG,1,[define if we found LIBJPEG and its headers])
+-		LIBJPEG="-ljpeg"
+-		libjpeg_msg="yes"
++AC_ARG_WITH([jpeg], AS_HELP_STRING([--without-jpeg], [Build without jpeg library (default: no)]))
++AS_IF([test "x$with_jpeg" != "xno"], [
++	AC_CHECK_LIB(jpeg,jpeg_start_decompress,[
++		AC_CHECK_HEADER(jpeglib.h,[
++			AC_DEFINE(HAVE_LIBJPEG,1,[define if we found LIBJPEG and its headers])
++			LIBJPEG="-ljpeg"
++			libjpeg_msg="yes"
++		])
+ 	])
+ ])
+ GP_CONFIG_MSG([JPEG mangling support],[${libjpeg_msg}])
+@@ -274,11 +277,14 @@
+ LIBGD=""
+ libgd_msg="no"
+ AC_SUBST(LIBGD)
+-AC_CHECK_LIB(gd,gdImageCreateTrueColor,[
+-	AC_CHECK_HEADER(gd.h,[
+-		AC_DEFINE(HAVE_GD,1,[define if we have LIBGD and its headers])
+-		LIBGD="-lgd"
+-		libgd_msg="yes"
++AC_ARG_WITH([gd], AS_HELP_STRING([--without-gd], [Build without GD library (default: no)]))
++AS_IF([test "x$with_gd" != "xno"], [
++	AC_CHECK_LIB(gd,gdImageCreateTrueColor,[
++		AC_CHECK_HEADER(gd.h,[
++			AC_DEFINE(HAVE_GD,1,[define if we have LIBGD and its headers])
++			LIBGD="-lgd"
++			libgd_msg="yes"
++		])
+ 	])
+ ])
+ GP_CONFIG_MSG([GD conversion support],[${libgd_msg}])
diff --git a/media-libs/libgphoto2/libgphoto2-2.4.11-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.11-r1.ebuild
new file mode 100644
index 000000000000..c51b8e1d240a
--- /dev/null
+++ b/media-libs/libgphoto2/libgphoto2-2.4.11-r1.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.11-r1.ebuild,v 1.1 2011/07/18 18:52:32 pacho Exp $
+
+# TODO
+# 1. Track upstream bug --disable-docs does not work.
+#	http://sourceforge.net/tracker/index.php?func=detail&aid=1643870&group_id=8874&atid=108874
+
+EAPI="4"
+
+inherit autotools eutils multilib
+
+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="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc examples exif gd jpeg nls kernel_linux zeroconf"
+
+# By default, drivers for all supported cameras will be compiled.
+# If you want to only compile for specific camera(s), set CAMERAS
+# environment to a space-separated list (no commas) of drivers that
+# you want to build.
+IUSE_CAMERAS="
+	adc65 agfa_cl20 aox ax203
+	barbie
+	canon casio_qv clicksmart310
+	digigr8 digita dimagev dimera3500 directory
+	enigma13
+	fuji
+	gsmart300
+	hp215
+	iclick
+	jamcam jd11 jl2005a jl2005c
+	kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200 konica konica_qm150
+	largan lg_gsm
+	mars mustek
+	panasonic_coolshot panasonic_l859 panasonic_dc1000 panasonic_dc1580 pccam300 pccam600 polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ptp2
+	ricoh ricoh_g3
+	samsung sierra sipix_blink sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55 soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z
+	template toshiba_pdrm11 topfield
+"
+
+for camera in ${IUSE_CAMERAS}; do
+	IUSE="${IUSE} cameras_${camera}"
+done
+
+# libgphoto2 actually links to libtool
+RDEPEND="virtual/libusb:0
+	cameras_ax203? ( media-libs/gd )
+	cameras_st2205? ( media-libs/gd )
+	zeroconf? ( || (
+		net-dns/avahi[mdnsresponder-compat]
+		net-misc/mDNSResponder ) )
+	exif? ( >=media-libs/libexif-0.5.9 )
+	gd? ( media-libs/gd[jpeg=] )
+	jpeg? ( virtual/jpeg )
+	sys-devel/libtool"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/flex
+	>=sys-devel/gettext-0.14.1
+	doc? ( app-doc/doxygen )"
+# FIXME: gtk-doc is broken
+#		>=dev-util/gtk-doc-1.10 )"
+
+RDEPEND="${RDEPEND}
+	!<sys-fs/udev-136"
+
+pkg_setup() {
+	if ! echo "${USE}" | grep "cameras_" > /dev/null 2>&1; then
+		einfo "No camera drivers will be built since you did not specify any."
+	fi
+
+	if use cameras_template || use cameras_sipix_blink; then
+		einfo "Upstream considers sipix_blink & template driver as obsolete"
+	fi
+
+	enewgroup plugdev
+}
+
+src_prepare() {
+	# Handle examples ourselves
+	sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
+		|| die "examples sed failed"
+
+	# Fix pkgconfig file when USE="-exif"
+	if ! use exif; then
+		sed -i "s/, @REQUIREMENTS_FOR_LIBEXIF@//" libgphoto2.pc.in || die " libgphoto2.pc sed failed"
+	fi
+
+	# Fix USE=zeroconf, bug #283332
+	epatch "${FILESDIR}/${PN}-2.4.7-respect-bonjour.patch"
+
+	# Do not build test if not running make check, bug #226241
+	epatch "${FILESDIR}/${PN}-2.4.7-no-test-build.patch"
+
+	# Increase max entries from 1024 to 8192 to fix bug #291049
+	epatch "${FILESDIR}/${PN}-2.4.8-increase_max_entries.patch"
+
+	# Fix automagic deps, bug #374371
+	epatch "${FILESDIR}/${PN}-2.4.11-fix-automagic.patch"
+
+	eautoreconf
+
+	# Fix bug #216206, libusb detection
+	sed -i "s:usb_busses:usb_find_busses:g" libgphoto2_port/configure || die "libusb sed failed"
+}
+
+src_configure() {
+	local cameras
+	local cam
+	local cam_warn=no
+	for cam in ${IUSE_CAMERAS} ; do
+		if use "cameras_${cam}"; then
+			cameras="${cameras},${cam}"
+		else
+			cam_warn=yes
+		fi
+	done
+
+	if [ "${cam_warn}" = "yes" ]; then
+		[ -z "${cameras}" ] || cameras="${cameras:1}"
+		einfo "Enabled camera drivers: ${cameras:-none}"
+		ewarn "Upstream will not support you if you do not compile all camera drivers first"
+	else
+		cameras="all"
+		einfo "Enabled camera drivers: all"
+	fi
+
+	local myconf
+	use doc || myconf="ac_cv_path_DOXYGEN=false"
+	econf \
+		--disable-docs \
+		--disable-gp2ddb \
+		$(use_with zeroconf bonjour) \
+		--without-hal \
+		$(use_enable nls) \
+		$(use_with exif libexif auto) \
+		$(use_with gd) \
+		$(use_with jpeg) \
+		--with-drivers=${cameras} \
+		--with-doc-dir=/usr/share/doc/${PF} \
+		--with-html-dir=/usr/share/doc/${PF}/html \
+		--with-hotplug-doc-dir=/usr/share/doc/${PF}/hotplug \
+		--with-rpmbuild=$(type -P true) \
+		udevscriptdir=/lib/udev \
+		${myconf}
+
+# FIXME: gtk-doc is currently broken
+#		$(use_enable doc docs)
+}
+
+src_compile() {
+	emake
+
+	if use doc; then
+		doxygen doc/Doxyfile || die "Documentation generation failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# Clean up unwanted files
+	rm "${D}/usr/share/doc/${PF}/"{ABOUT-NLS,COPYING} || die "rm failed"
+	dodoc ChangeLog NEWS* README* AUTHORS TESTERS MAINTAINERS HACKING
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/README examples/*.c examples/*.h
+	fi
+
+	# FIXME: fixup autoconf bug
+	if ! use doc && [ -d "${D}/usr/share/doc/${PF}/apidocs.html" ]; then
+		rm -fr "${D}/usr/share/doc/${PF}/apidocs.html"
+	fi
+	# end fixup
+
+	UDEV_RULES="/lib/udev/rules.d/70-libgphoto2.rules"
+	CAM_LIST="/usr/$(get_libdir)/libgphoto2/print-camera-list"
+
+	if [ -x "${D}"${CAM_LIST} ]; then
+		# Let print-camera-list find libgphoto2.so
+		export LD_LIBRARY_PATH="${D}/usr/$(get_libdir)"
+		# Let libgphoto2 find its camera-modules
+		export CAMLIBS="${D}/usr/$(get_libdir)/libgphoto2/${PV}"
+
+		einfo "Generating UDEV-rules ..."
+		mkdir -p "${D}"/${UDEV_RULES%/*}
+		echo -e "# do not edit this file, it will be overwritten on update\n#" \
+			> "${D}"/${UDEV_RULES}
+		"${D}"${CAM_LIST} udev-rules version 136 group plugdev >> "${D}"/${UDEV_RULES} \
+			|| die "failed to create udev-rules"
+	else
+		eerror "Unable to find print-camera-list"
+		eerror "and therefore unable to generate hotplug usermap."
+		eerror "You will have to manually generate it by running:"
+		eerror " ${CAM_LIST} udev-rules version 136 group plugdev > ${UDEV_RULES}"
+	fi
+
+}
+
+pkg_postinst() {
+	elog "Don't forget to add yourself to the plugdev group "
+	elog "if you want to be able to access your camera."
+	local OLD_UDEV_RULES="${ROOT}"etc/udev/rules.d/99-libgphoto2.rules
+	if [[ -f ${OLD_UDEV_RULES} ]]; then
+		rm -f "${OLD_UDEV_RULES}"
+	fi
+}