| 1 |
pacho 13/11/22 20:59:58 |
| 2 |
|
| 3 |
Added: libgphoto2-2.5.2-libxml2-detection2.patch |
| 4 |
libgphoto2-2.5.2-libxml2-detection.patch |
| 5 |
Log: |
| 6 |
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. |
| 7 |
|
| 8 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 media-libs/libgphoto2/files/libgphoto2-2.5.2-libxml2-detection2.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/files/libgphoto2-2.5.2-libxml2-detection2.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/files/libgphoto2-2.5.2-libxml2-detection2.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: libgphoto2-2.5.2-libxml2-detection2.patch |
| 17 |
=================================================================== |
| 18 |
--- a/trunk/libgphoto2/camlibs/ptp2/Makefile-files |
| 19 |
+++ b/trunk/libgphoto2/camlibs/ptp2/Makefile-files |
| 20 |
@@ -4,6 +4,7 @@ |
| 21 |
|
| 22 |
EXTRA_LTLIBRARIES += ptp2.la |
| 23 |
|
| 24 |
+ptp2_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) $(LIBXML2_CFLAGS) |
| 25 |
ptp2_la_SOURCES = \ |
| 26 |
ptp2/ptp.c ptp2/ptp.h \ |
| 27 |
ptp2/library.c ptp2/usb.c ptp2/ptp-bugs.h \ |
| 28 |
@@ -12,4 +13,4 @@ |
| 29 |
ptp2/olympus-wrap.c ptp2/olympus-wrap.h |
| 30 |
ptp2_la_LDFLAGS = $(camlib_ldflags) |
| 31 |
ptp2_la_DEPENDENCIES = $(camlib_dependencies) |
| 32 |
-ptp2_la_LIBADD = $(camlib_libadd) $(LTLIBICONV) $(LIBXML2) |
| 33 |
+ptp2_la_LIBADD = $(camlib_libadd) $(LTLIBICONV) $(LIBXML2_LIBS) |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.1 media-libs/libgphoto2/files/libgphoto2-2.5.2-libxml2-detection.patch |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/files/libgphoto2-2.5.2-libxml2-detection.patch?rev=1.1&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/files/libgphoto2-2.5.2-libxml2-detection.patch?rev=1.1&content-type=text/plain |
| 41 |
|
| 42 |
Index: libgphoto2-2.5.2-libxml2-detection.patch |
| 43 |
=================================================================== |
| 44 |
--- a/trunk/libgphoto2/configure.ac |
| 45 |
+++ b/trunk/libgphoto2/configure.ac |
| 46 |
@@ -273,22 +273,14 @@ |
| 47 |
GP_CONFIG_MSG([JPEG mangling support],[${libjpeg_msg}]) |
| 48 |
|
| 49 |
dnl --------------------------------------------------------------------------- |
| 50 |
-dnl check for libxml22 |
| 51 |
-dnl --------------------------------------------------------------------------- |
| 52 |
-LIBXML2="" |
| 53 |
-libxml2_msg="no" |
| 54 |
-AC_SUBST(LIBXML2) |
| 55 |
-AC_ARG_WITH([libxml2], AS_HELP_STRING([--without-libxml2], [Build without libxml2 library (default: no)])) |
| 56 |
-AS_IF([test "x$with_libxml2" != "xno"], [ |
| 57 |
- AC_CHECK_LIB(xml2,xmlFirstElementChild,[ |
| 58 |
- AC_CHECK_HEADER(libxml/parser.h,[ |
| 59 |
- AC_DEFINE(HAVE_LIBXML2,1,[define if we found LIBXML2 and its headers]) |
| 60 |
- LIBXML2="-lxml2" |
| 61 |
- libxml2_msg="yes" |
| 62 |
- ]) |
| 63 |
- ]) |
| 64 |
-]) |
| 65 |
-GP_CONFIG_MSG([LIBXML2 to support Olympus E remote control],[${libxml2_msg}]) |
| 66 |
+dnl check for libxml2 |
| 67 |
+dnl --------------------------------------------------------------------------- |
| 68 |
+GP_CONFIG_MSG([libxml2 support]) |
| 69 |
+GP_CHECK_LIBRARY([LIBXML2],[libxml-2.0],[>= 2.0], |
| 70 |
+ [libxml/parser.h],[xmlFirstElementChild],[],[], |
| 71 |
+ [default-on], |
| 72 |
+ [http://xmlsoft.org] |
| 73 |
+) |
Archives