From cdf9065afa775bb6e9d25f15b153fd3a24a483a5 Mon Sep 17 00:00:00 2001 From: Jeffrey Gardner Date: Fri, 26 Nov 2010 17:49:56 +0000 Subject: latest version, trying to escape compilation error in 2.4.10 - st2205/st2205_decode.c:425:1: error: expected identifier or '(' before '{' token svn path=/; revision=305 --- media-libs/libgphoto2/Manifest | 7 + .../files/libgphoto2-2.4.7-no-test-build.patch | 34 ++++ .../files/libgphoto2-2.4.7-respect-bonjour.patch | 12 ++ .../libgphoto2-2.4.8-increase_max_entries.patch | 15 ++ .../libgphoto2/files/libgphoto2-2.4.9-dnl.patch | 24 +++ media-libs/libgphoto2/libgphoto2-2.4.10.1.ebuild | 217 +++++++++++++++++++++ media-libs/libgphoto2/metadata.xml | 6 + 7 files changed, 315 insertions(+) create mode 100644 media-libs/libgphoto2/Manifest create mode 100644 media-libs/libgphoto2/files/libgphoto2-2.4.7-no-test-build.patch create mode 100644 media-libs/libgphoto2/files/libgphoto2-2.4.7-respect-bonjour.patch create mode 100644 media-libs/libgphoto2/files/libgphoto2-2.4.8-increase_max_entries.patch create mode 100644 media-libs/libgphoto2/files/libgphoto2-2.4.9-dnl.patch create mode 100644 media-libs/libgphoto2/libgphoto2-2.4.10.1.ebuild create mode 100644 media-libs/libgphoto2/metadata.xml diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest new file mode 100644 index 0000000..6e182c2 --- /dev/null +++ b/media-libs/libgphoto2/Manifest @@ -0,0 +1,7 @@ +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 +AUX libgphoto2-2.4.9-dnl.patch 471 RMD160 062158e62551d43f9515f64054dd37ad0c9b1517 SHA1 9dfbe07ccb18b57e545cdbd35f8654832727a62d SHA256 6f657277d3262d8295b35d5bd49c79a229fef5a9b587191d9e1a91ed73564bf5 +DIST libgphoto2-2.4.10.1.tar.bz2 5703000 RMD160 dd00646001a034a7da082401dec3d8e36dbd3c2c SHA1 2806b147d3cf2c3cfdcb5cb8db8b82c1180d5f36 SHA256 980ec6ab6f92bfe72bf955f6e00408b2d5042acbda591903be3795a9184ca98a +EBUILD libgphoto2-2.4.10.1.ebuild 6802 RMD160 eed3bf612e32b1e92f912f4d96cd07bea5f8b2f4 SHA1 2a05bddf4b3ef91913a3e2778799928569a00ce5 SHA256 35951b014c81b3b4858d43ee26bbc698f3a86a84ea6be78865e567c0e387262a +MISC metadata.xml 182 RMD160 5f49130c67eb53fd2c6ebe0de1fc022095660261 SHA1 5ae56f5c257c146dfe43fd8556cf742e79758f3a SHA256 6ce4ccce668fc2a8c0598e348462ae041f477022bd8bc407c7c5e4ba98eabc5b diff --git a/media-libs/libgphoto2/files/libgphoto2-2.4.7-no-test-build.patch b/media-libs/libgphoto2/files/libgphoto2-2.4.7-no-test-build.patch new file mode 100644 index 0000000..9fcabd9 --- /dev/null +++ b/media-libs/libgphoto2/files/libgphoto2-2.4.7-no-test-build.patch @@ -0,0 +1,34 @@ +# Do not build tests if not running make check +# Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=226241 +--- a/libgphoto2_port/test/Makefile.am 2010-01-07 01:04:40.000000000 +0100 ++++ b/libgphoto2_port/test/Makefile.am 2010-01-07 01:04:57.000000000 +0100 +@@ -1,4 +1,4 @@ +-noinst_PROGRAMS = test-gp-port ++check_PROGRAMS = test-gp-port + + test_gp_port_CPPFLAGS = \ + $(AM_CPPFLAGS) $(CPPFLAGS) \ +--- a/tests/Makefile.am 2010-01-07 00:56:14.000000000 +0100 ++++ b/tests/Makefile.am 2010-01-07 00:56:40.000000000 +0100 +@@ -2,7 +2,9 @@ + + check_PROGRAMS = \ + test-camera-list \ +- test-pedantic-c ++ test-pedantic-c \ ++ test-gphoto2 \ ++ test-filesys + + if HAVE_CXX + check_PROGRAMS += test-pedantic-cxx +@@ -22,10 +24,6 @@ + + CLEANFILES = $(check_SCRIPTS) + +-noinst_PROGRAMS = \ +- test-gphoto2 \ +- test-filesys +- + test_gphoto2_SOURCE = test-gphoto2.c + test_gphoto2_LDADD = \ + $(top_builddir)/libgphoto2/libgphoto2.la \ diff --git a/media-libs/libgphoto2/files/libgphoto2-2.4.7-respect-bonjour.patch b/media-libs/libgphoto2/files/libgphoto2-2.4.7-respect-bonjour.patch new file mode 100644 index 0000000..fc10aec --- /dev/null +++ b/media-libs/libgphoto2/files/libgphoto2-2.4.7-respect-bonjour.patch @@ -0,0 +1,12 @@ +# Make sure with_bonjour value gets set by corresponding AC_ARG_WITH +# Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=283332 +--- a/libgphoto2_port/configure.ac 2010-01-07 00:25:53.000000000 +0100 ++++ b/libgphoto2_port/configure.ac 2010-01-07 00:25:43.000000000 +0100 +@@ -161,7 +161,6 @@ + dnl --------------------------------------------------------------------------- + dnl Apple Bonjour / mDNSResponder multicast DNS queries. + dnl --------------------------------------------------------------------------- +-with_bonjour=no + AC_ARG_WITH([bonjour], + AS_HELP_STRING([--without-bonjour], [whether to exclude Bonjour PTP/IP autodetection]), + , diff --git a/media-libs/libgphoto2/files/libgphoto2-2.4.8-increase_max_entries.patch b/media-libs/libgphoto2/files/libgphoto2-2.4.8-increase_max_entries.patch new file mode 100644 index 0000000..16aadd1 --- /dev/null +++ b/media-libs/libgphoto2/files/libgphoto2-2.4.8-increase_max_entries.patch @@ -0,0 +1,15 @@ +Increase max entries from 1024 to 8192 until +http://sourceforge.net/tracker/index.php?func=detail&aid=1515453&group_id=8874&atid=108874 +fix is backported to 2.4 branch. +This fixes http://bugs.gentoo.org/show_bug.cgi?id=291049 +--- a/libgphoto2/gphoto2-list.c ++++ b/libgphoto2/gphoto2-list.c +@@ -72,7 +72,7 @@ + + #ifdef CAMERALIST_STRUCT_COMPATIBILITY + +-#define MAX_ENTRIES 1024 ++#define MAX_ENTRIES 8192 + #define MAX_LIST_STRING_LENGTH 128 + struct _CameraList { + int count; diff --git a/media-libs/libgphoto2/files/libgphoto2-2.4.9-dnl.patch b/media-libs/libgphoto2/files/libgphoto2-2.4.9-dnl.patch new file mode 100644 index 0000000..8ee30ba --- /dev/null +++ b/media-libs/libgphoto2/files/libgphoto2-2.4.9-dnl.patch @@ -0,0 +1,24 @@ +http://bugs.gentoo.org/336598 + +--- libgphoto2_port/m4/gp-libltdl.m4 ++++ libgphoto2_port/m4/gp-libltdl.m4 +@@ -23,7 +23,7 @@ + + Please make sure that the proper development package is installed + (libltdl-dev, libtool-ltdl-devel, etc.) +-])dnl ++])[]dnl + ])dnl + ]) + else +--- m4m/gp-libltdl.m4 ++++ m4m/gp-libltdl.m4 +@@ -23,7 +23,7 @@ + + Please make sure that the proper development package is installed + (libltdl-dev, libtool-ltdl-devel, etc.) +-])dnl ++])[]dnl + ])dnl + ]) + else diff --git a/media-libs/libgphoto2/libgphoto2-2.4.10.1.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.10.1.ebuild new file mode 100644 index 0000000..3752df2 --- /dev/null +++ b/media-libs/libgphoto2/libgphoto2-2.4.10.1.ebuild @@ -0,0 +1,217 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild,v 1.1 2010/11/21 22:29:53 eva 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="2" + +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 hal 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 ) + hal? ( + >=sys-apps/hal-0.5 + >=sys-apps/dbus-1 ) + 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} + ! /dev/null 2>&1; then + einfo "libgphoto2 supports: all ${IUSE_CAMERAS}" + einfo "All camera drivers will be built since you did not specify" + einfo "via the CAMERAS variable what camera you use." + einfo "NOTICE: Upstream will not support you if you do not compile all camera drivers first" + 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 copied libtool macro dnl problem, bug #336598 + epatch "${FILESDIR}/${PN}-2.4.9-dnl.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 + for cam in ${IUSE_CAMERAS} ; do + use "cameras_${cam}" && cameras="${cameras},${cam}" + done + + [ -z "${cameras}" ] \ + && cameras="all" \ + || cameras="${cameras:1}" + + einfo "Enabled camera drivers: ${cameras}" + [ "${cameras}" != "all" ] && \ + ewarn "Upstream will not support you if you do not compile all camera drivers first" + + econf \ + --disable-docs \ + --disable-gp2ddb \ + $(use_with zeroconf bonjour) \ + $(use_with hal) \ + $(use_enable nls) \ + $(use_with exif libexif auto) \ + --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=/$(get_libdir)/udev + +# FIXME: gtk-doc is currently broken +# $(use_enable doc docs) +} + +src_compile() { + emake || die "make failed" + + if use doc; then + doxygen doc/Doxyfile || die "Documentation generation failed" + fi +} + +src_install() { + emake DESTDIR="${D}" install || die "install failed" + + # Clean up unwanted files + rm "${D}/usr/share/doc/${PF}/"{ABOUT-NLS,COPYING} || die "rm failed" + dodoc ChangeLog NEWS* README* AUTHORS TESTERS MAINTAINERS HACKING || die "dodoc failed" + + if use examples; then + insinto /usr/share/doc/${PF}/examples + doins examples/README examples/*.c examples/*.h || die "examples installation failed" + 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 + + HAL_FDI="/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi" + UDEV_RULES="/$(get_libdir)/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}" + + if use hal && [ -n "$("${D}"${CAM_LIST} idlist)" ]; then + einfo "Generating HAL FDI files ..." + mkdir -p "${D}"/${HAL_FDI%/*} + "${D}"${CAM_LIST} hal-fdi >> "${D}"/${HAL_FDI} \ + || die "failed to create hal-fdi" + elif use hal; then + ewarn "No HAL FDI file generated because no real camera driver enabled" + fi + + 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 or HAL FDI files." + eerror "You will have to manually generate it by running:" + eerror " ${CAM_LIST} udev-rules version 136 group plugdev > ${UDEV_RULES}" + eerror " ${CAM_LIST} hal-fdi > ${HAL_FDI}" + 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 +} diff --git a/media-libs/libgphoto2/metadata.xml b/media-libs/libgphoto2/metadata.xml new file mode 100644 index 0000000..704693b --- /dev/null +++ b/media-libs/libgphoto2/metadata.xml @@ -0,0 +1,6 @@ + + + + gnome + graphics + -- cgit v1.2.3-65-gdbad