| 1 |
eva 08/11/29 21:50:48 |
| 2 |
|
| 3 |
Added: libgphoto2-2.4.3-automagic.patch |
| 4 |
Removed: libgphoto2-2.2.0-includes.patch |
| 5 |
libgphoto2-2.1.2-norpm.patch |
| 6 |
libgphoto2-2.2.1-backported-udev-fixes.diff |
| 7 |
libgphoto2-2.3.1-rpm.patch |
| 8 |
libgphoto2-2.3.1-udev-rules-fix3.diff |
| 9 |
libgphoto-2.2.1-new-dbus-api.patch |
| 10 |
libgphoto2-2.2.1-ngettext.patch |
| 11 |
Log: |
| 12 |
Bump to 2.4.3, fix automagic dependencies. Clean up old patches. |
| 13 |
(Portage version: 2.2_rc16/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64) |
| 14 |
|
| 15 |
Revision Changes Path |
| 16 |
1.1 media-libs/libgphoto2/files/libgphoto2-2.4.3-automagic.patch |
| 17 |
|
| 18 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libgphoto2/files/libgphoto2-2.4.3-automagic.patch?rev=1.1&view=markup |
| 19 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libgphoto2/files/libgphoto2-2.4.3-automagic.patch?rev=1.1&content-type=text/plain |
| 20 |
|
| 21 |
Index: libgphoto2-2.4.3-automagic.patch |
| 22 |
=================================================================== |
| 23 |
--- a/libgphoto2_port/configure.ac 2008-11-29 22:04:31.000000000 +0100 |
| 24 |
+++ b/libgphoto2_port/configure.ac 2008-11-29 22:10:50.000000000 +0100 |
| 25 |
@@ -161,14 +161,25 @@ |
| 26 |
]) |
| 27 |
]) |
| 28 |
|
| 29 |
+dnl --------------------------------------------------------------------------- |
| 30 |
dnl Apple Bonjour / mDNSResponder multicast DNS queries. |
| 31 |
+dnl --------------------------------------------------------------------------- |
| 32 |
+ |
| 33 |
MDNS_LIBS= |
| 34 |
-AC_CHECK_HEADER([dns_sd.h],[ |
| 35 |
- AC_CHECK_LIB(dns_sd,DNSServiceResolve,[ |
| 36 |
- MDNS_LIBS="-ldns_sd" |
| 37 |
- AC_DEFINE(HAVE_MDNS_BONJOUR,1,[Define if you have Bonjour/mDNSResponder.]) |
| 38 |
- ]) |
| 39 |
-]) |
| 40 |
+have_bonjour=false |
| 41 |
+ |
| 42 |
+AC_ARG_ENABLE([bonjour], |
| 43 |
+ AS_HELP_STRING([--disable-bonjour], [disable Bonjour support]), |
| 44 |
+ ,enable_bonjour=yes) |
| 45 |
+ |
| 46 |
+if test "x$enable_bonjour" = "xyes"; then |
| 47 |
+ AC_CHECK_HEADER([dns_sd.h],[ |
| 48 |
+ AC_CHECK_LIB(dns_sd,DNSServiceResolve,[ |
| 49 |
+ MDNS_LIBS="-ldns_sd" |
| 50 |
+ AC_DEFINE(HAVE_MDNS_BONJOUR,1,[Define if you have Bonjour/mDNSResponder.]) |
| 51 |
+ ]) |
| 52 |
+ ]) |
| 53 |
+fi |
| 54 |
|
| 55 |
dnl Check for mnt_mountp in struct mnttab |
| 56 |
AC_MSG_CHECKING([for mnt_mountp in struct mnttab]) |
| 57 |
@@ -347,15 +358,24 @@ |
| 58 |
dnl --------------------------------------------------------------------------- |
| 59 |
dnl disk - hal and various stuff |
| 60 |
dnl --------------------------------------------------------------------------- |
| 61 |
-PKG_CHECK_MODULES(HAL, [dbus-1 >= 0.31 hal >= 0.5.0], |
| 62 |
+have_hal=false |
| 63 |
+ |
| 64 |
+AC_ARG_ENABLE([hal], |
| 65 |
+ AS_HELP_STRING([--disable-hal], [disable HAL support]), |
| 66 |
+ ,enable_hal=yes) |
| 67 |
+ |
| 68 |
+if test "x$enable_hal" = "xyes"; then |
| 69 |
+ PKG_CHECK_MODULES(HAL, [dbus-1 >= 0.31 hal >= 0.5.0], |
| 70 |
[have_hal=true], |
| 71 |
[have_hal=false]) |
| 72 |
-if test "x$have_hal" = "xtrue"; then |
| 73 |
- AC_SUBST(HAL_CFLAGS) |
| 74 |
- AC_SUBST(HAL_LIBS) |
| 75 |
- AC_DEFINE(HAVE_HAL,1,[defined if HAL is available]) |
| 76 |
+ if test "x$have_hal" = "xtrue"; then |
| 77 |
+ AC_SUBST(HAL_CFLAGS) |
| 78 |
+ AC_SUBST(HAL_LIBS) |
| 79 |
+ AC_DEFINE(HAVE_HAL,1,[defined if HAL is available]) |
| 80 |
+ IOLIB_SUBDIRS="$IOLIB_SUBDIRS disk" |
| 81 |
+ fi |
| 82 |
fi |
| 83 |
-IOLIB_SUBDIRS="$IOLIB_SUBDIRS disk" |
| 84 |
+ |
| 85 |
|
| 86 |
dnl ptpip - works 'everywhere' with TCP/IP stack. |
| 87 |
IOLIB_SUBDIRS="$IOLIB_SUBDIRS ptpip" |
Archives