summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libgphoto2_port/ChangeLog6
-rw-r--r--libgphoto2_port/NEWS15
-rw-r--r--libgphoto2_port/configure.ac27
3 files changed, 44 insertions, 4 deletions
diff --git a/libgphoto2_port/ChangeLog b/libgphoto2_port/ChangeLog
index fa2ebafc7..7a8e64e98 100644
--- a/libgphoto2_port/ChangeLog
+++ b/libgphoto2_port/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-28 Marcus Meissner <marcus@jet.franken.de>
+
+ * Migrated libgphoto2_port to use symbol versions.
+
+ This allows reverting the major version change.
+
2007-10-28 Dan Fandrich <dan@coneharvesters.com>
* libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c: Be
more resiliant in case of errors enumerating a port library.
diff --git a/libgphoto2_port/NEWS b/libgphoto2_port/NEWS
index 7fe577bd0..2696cf6bd 100644
--- a/libgphoto2_port/NEWS
+++ b/libgphoto2_port/NEWS
@@ -1,3 +1,18 @@
+libgphoto2_port 0.8.2
+
+Build:
+ * Switch build to use ELF symbol versions to avoid
+ major version bumps. Introduced LIBGPHOTO2_0_0
+ and LIBGPHOTO2_5_0 ELF versions.
+
+ libgphoto2_port.sym is now libgphoto2_port.ver
+ but with similar tasks.
+
+Library Loader:
+ * Bumped the GPPortInfo path size to 4096, since 64byte
+ is not sufficient for paths on UNIX systems when using
+ disk:
+
libgphoto2_port 0.8.1
Build:
diff --git a/libgphoto2_port/configure.ac b/libgphoto2_port/configure.ac
index 532817230..c06d2bd48 100644
--- a/libgphoto2_port/configure.ac
+++ b/libgphoto2_port/configure.ac
@@ -41,9 +41,9 @@ dnl A:R:C=6:1:6 libgphoto2_port-0.6.1 libgphoto2-2.2.1
dnl A:R:C=7:0:7 libgphoto2_port-0.7.0 libgphoto2-2.3
dnl A:R:C=7:1:7 libgphoto2_port-0.7.1 libgphoto2-2.3.x
dnl A:R:C=8:0:8 libgphoto2_port-0.8.0 libgphoto2-2.4.x
-dnl A:R:C=9:0:9 libgphoto2_port-0.9.0 libgphoto2-2.5.x
-AC_SUBST([LIBGPHOTO2_PORT_AGE], [0])
-AC_SUBST([LIBGPHOTO2_PORT_REVISION], [0])
+dnl A:R:C=9:1:9 libgphoto2_port-0.9.1 libgphoto2-2.5.x
+AC_SUBST([LIBGPHOTO2_PORT_AGE], [9])
+AC_SUBST([LIBGPHOTO2_PORT_REVISION], [1])
AC_SUBST([LIBGPHOTO2_PORT_CURRENT], [9])
AC_SUBST([LIBGPHOTO2_PORT_CURRENT_MIN],
[`expr $LIBGPHOTO2_PORT_CURRENT - $LIBGPHOTO2_PORT_AGE`])
@@ -171,6 +171,26 @@ AC_CHECK_HEADER([dns_sd.h],[
AC_DEFINE(HAVE_MDNS_BONJOUR,1,[Define if you have Bonjour/mDNSResponder.])
])
])
+AC_SUBST(MDNS_LIBS)
+
+AC_MSG_CHECKING([for asm .symver support])
+AC_COMPILE_IFELSE([dnl
+ AC_LANG_PROGRAM([[]],[[
+ int f1() { }
+ int f2() { }
+ asm(".symver f1, f@VER1");
+ asm(".symver f2, f@@VER2");
+ int main(int argc, char **argv) { }
+ ]])dnl
+],[
+ AC_DEFINE([HAVE_ASM_SYMVERS],1,[Define if there is asm .symver support.])
+ VERSIONMAPLDFLAGS="-Wl,--version-script=\$(srcdir)/libgphoto2_port.ver"
+ AC_MSG_RESULT(yes)
+],[
+ VERSIONMAPLDFLAGS=""
+ AC_MSG_RESULT(no)
+])
+AC_SUBST(VERSIONMAPLDFLAGS)
dnl Check for mnt_mountp in struct mnttab
AC_MSG_CHECKING([for mnt_mountp in struct mnttab])
@@ -192,7 +212,6 @@ AC_MSG_RESULT(no)
])
-AC_SUBST(MDNS_LIBS)
dnl Checks for library functions.
AC_CHECK_FUNCS(strerror snprintf vsnprintf)