diff options
Diffstat (limited to 'media-libs/libgphoto2')
| -rw-r--r-- | media-libs/libgphoto2/ChangeLog | 12 | ||||
| -rw-r--r-- | media-libs/libgphoto2/files/libgphoto2-2.5.2-libxml2-detection.patch | 30 | ||||
| -rw-r--r-- | media-libs/libgphoto2/files/libgphoto2-2.5.2-libxml2-detection2.patch | 16 | ||||
| -rw-r--r-- | media-libs/libgphoto2/libgphoto2-2.5.2-r1.ebuild (renamed from media-libs/libgphoto2/libgphoto2-2.5.2.ebuild) | 28 |
4 files changed, 72 insertions, 14 deletions
diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog index fe5c3da91d63..402819a70968 100644 --- a/media-libs/libgphoto2/ChangeLog +++ b/media-libs/libgphoto2/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for media-libs/libgphoto2 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.238 2013/10/10 18:40:36 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.239 2013/11/22 20:59:58 pacho Exp $ + +*libgphoto2-2.5.2-r1 (22 Nov 2013) + + 22 Nov 2013; Pacho Ramos <pacho@gentoo.org> + +files/libgphoto2-2.5.2-libxml2-detection.patch, + +files/libgphoto2-2.5.2-libxml2-detection2.patch, +libgphoto2-2.5.2-r1.ebuild, + -libgphoto2-2.5.2.ebuild: + Apply important fixes: solve libxml2 detection, update configure options, rely + on udev >= 175, update cameras (#484276 by Nikoli and Evgeny Bobkin, also + solving #484276 by Michael Rowell); drop old. 10 Oct 2013; Pacho Ramos <pacho@gentoo.org> -libgphoto2-2.5.1.1.ebuild, libgphoto2-2.5.2.ebuild: diff --git a/media-libs/libgphoto2/files/libgphoto2-2.5.2-libxml2-detection.patch b/media-libs/libgphoto2/files/libgphoto2-2.5.2-libxml2-detection.patch new file mode 100644 index 000000000000..54f539f58f2a --- /dev/null +++ b/media-libs/libgphoto2/files/libgphoto2-2.5.2-libxml2-detection.patch @@ -0,0 +1,30 @@ +--- a/trunk/libgphoto2/configure.ac ++++ b/trunk/libgphoto2/configure.ac +@@ -273,22 +273,14 @@ + GP_CONFIG_MSG([JPEG mangling support],[${libjpeg_msg}]) + + dnl --------------------------------------------------------------------------- +-dnl check for libxml22 +-dnl --------------------------------------------------------------------------- +-LIBXML2="" +-libxml2_msg="no" +-AC_SUBST(LIBXML2) +-AC_ARG_WITH([libxml2], AS_HELP_STRING([--without-libxml2], [Build without libxml2 library (default: no)])) +-AS_IF([test "x$with_libxml2" != "xno"], [ +- AC_CHECK_LIB(xml2,xmlFirstElementChild,[ +- AC_CHECK_HEADER(libxml/parser.h,[ +- AC_DEFINE(HAVE_LIBXML2,1,[define if we found LIBXML2 and its headers]) +- LIBXML2="-lxml2" +- libxml2_msg="yes" +- ]) +- ]) +-]) +-GP_CONFIG_MSG([LIBXML2 to support Olympus E remote control],[${libxml2_msg}]) ++dnl check for libxml2 ++dnl --------------------------------------------------------------------------- ++GP_CONFIG_MSG([libxml2 support]) ++GP_CHECK_LIBRARY([LIBXML2],[libxml-2.0],[>= 2.0], ++ [libxml/parser.h],[xmlFirstElementChild],[],[], ++ [default-on], ++ [http://xmlsoft.org] ++) diff --git a/media-libs/libgphoto2/files/libgphoto2-2.5.2-libxml2-detection2.patch b/media-libs/libgphoto2/files/libgphoto2-2.5.2-libxml2-detection2.patch new file mode 100644 index 000000000000..a2d326bcd495 --- /dev/null +++ b/media-libs/libgphoto2/files/libgphoto2-2.5.2-libxml2-detection2.patch @@ -0,0 +1,16 @@ +--- a/trunk/libgphoto2/camlibs/ptp2/Makefile-files ++++ b/trunk/libgphoto2/camlibs/ptp2/Makefile-files +@@ -4,6 +4,7 @@ + + EXTRA_LTLIBRARIES += ptp2.la + ++ptp2_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) $(LIBXML2_CFLAGS) + ptp2_la_SOURCES = \ + ptp2/ptp.c ptp2/ptp.h \ + ptp2/library.c ptp2/usb.c ptp2/ptp-bugs.h \ +@@ -12,4 +13,4 @@ + ptp2/olympus-wrap.c ptp2/olympus-wrap.h + ptp2_la_LDFLAGS = $(camlib_ldflags) + ptp2_la_DEPENDENCIES = $(camlib_dependencies) +-ptp2_la_LIBADD = $(camlib_libadd) $(LTLIBICONV) $(LIBXML2) ++ptp2_la_LIBADD = $(camlib_libadd) $(LTLIBICONV) $(LIBXML2_LIBS) diff --git a/media-libs/libgphoto2/libgphoto2-2.5.2.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.2-r1.ebuild index 596e222d0430..45b9cfd9c4f1 100644 --- a/media-libs/libgphoto2/libgphoto2-2.5.2.ebuild +++ b/media-libs/libgphoto2/libgphoto2-2.5.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.5.2.ebuild,v 1.2 2013/10/10 18:40:36 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.5.2-r1.ebuild,v 1.1 2013/11/22 20:59:58 pacho Exp $ # TODO # 1. Track upstream bug --disable-docs does not work. @@ -38,10 +38,10 @@ IUSE_CAMERAS=" 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 + panasonic_coolshot panasonic_l859 panasonic_dc1000 panasonic_dc1580 pccam300 pccam600 pentax 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 tp6801 + samsung sierra sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55 soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z + toshiba_pdrm11 topfield tp6801 " for camera in ${IUSE_CAMERAS}; do @@ -50,6 +50,7 @@ done # libgphoto2 actually links to libtool RDEPEND=" + dev-libs/libxml2:2 sys-devel/libtool virtual/libusb:0 cameras_ax203? ( media-libs/gd:= ) @@ -69,16 +70,12 @@ DEPEND="${RDEPEND} # >=dev-util/gtk-doc-1.10 )" RDEPEND="${RDEPEND} - !<sys-fs/udev-136" + !<sys-fs/udev-175" pkg_pretend() { 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 } pkg_setup() { @@ -104,6 +101,9 @@ src_prepare() { # Fix USE=zeroconf, bug #283332 epatch "${FILESDIR}/${PN}-2.4.7-respect-bonjour.patch" + # Fix libxml2 detection, bug #491782 + epatch "${FILESDIR}"/${PN}-2.5.2-libxml2-detection{,2}.patch + eautoreconf } @@ -130,16 +130,18 @@ src_configure() { local myconf use doc || myconf="ac_cv_path_DOXYGEN=false" + + # Upstream doesn't default to --enable-option-checking due having another + # configure in libgphoto2_port/ that also needs to be checked on every bump 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-camlibs=${cameras} \ --with-doc-dir="${EPREFIX}"/usr/share/doc/${PF} \ --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \ --with-hotplug-doc-dir="${EPREFIX}"/usr/share/doc/${PF}/hotplug \ @@ -194,13 +196,13 @@ src_install() { mkdir -p "${ED}"/${udev_rules%/*} echo -e "# do not edit this file, it will be overwritten on update\n#" \ > "${ED}"/${udev_rules} - "${ED}"${cam_list} udev-rules version 136 group plugdev >> "${ED}"/${udev_rules} \ + "${ED}"${cam_list} udev-rules version 175 group plugdev >> "${ED}"/${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}" + eerror " ${cam_list} udev-rules version 175 group plugdev > ${udev_rules}" fi } |