digiKam › digikam-devel

[Digikam-devel] extragear/libs

classic Classic list List threaded Threaded
♦
♦
 1 message Options
Gilles Caulier
Reply | Threaded
Open this post in threaded view
♦
♦
|

[Digikam-devel] extragear/libs

Gilles Caulier
SVN commit 585980 by cgilles:

kipi-plugins from trunk : removing libkexif depency ! We using Exiv2 instead everywhere.

Developpers, please take a look into the new Exiv2 interface kipi-plugins/common/exiv2iface.cpp to manage metadata into your kipi-plugins.
This class is a simplified version of the DMetadata class from digiKam core. Please contact digiKam team if you want to add/fix/improve new
methods. Thanks in advance.

CCMAIL: [hidden email], [hidden email]

 M  +2 -43     PACKAGING  
 M  +12 -15    kipi-plugins/README  
 M  +0 -18     kipi-plugins/configure.in.bot  
 M  +3 -49     kipi-plugins/configure.in.in  


--- trunk/extragear/libs/PACKAGING #585979:585980
@@ -1,8 +1,7 @@
 How to release kipi & co.
 ----------------------------------------
 1. Release libkipi
-2. Release libkexif
-3. Release kipi-plugins
+2. Release kipi-plugins
 
 
 1. Release libkipi
@@ -46,48 +45,8 @@
      [hidden email]/home/kde/trunk/www/areas/extragear/apps/kipi
      Send a mail to announce the official release.
 
-2. Release libkexif
+2. Release kipi-plugins
  a) Update release info
-    libkexif/libkexif.lsm
-    libkexif/libkexif.pc.in
-
-    To do that you can use the "prepare_libkexif.rb" script, change the
-    release version ("version" field) and run it.
-    Don't forget to commit your changes.
-
- b) Update Changelog
-    - to do that use the "release_kipi_changelog.sh" script
-      release_kipi_changelog.sh libkexif oldest-revision-or-date new-release-version
-    - edit Changelog and modify the wrong lines (if any)
-    - Commit your changes
-
- c) Build the source tarball
-    - use the "release_libkexif.rb"
-      edit the script and change the "version" field
-      if you're releasing an svn snapshot set "usesvnver" to "yes"
-      run it and get libkexifXXX.tar.bz2
-
- d) Uncompress and test the tarball
-    - check if all the files are right in
-    - check if the file RELEASE.rev is in and with the right revision number
-    - check if it builds correctly.
-
- e) Upload tarball for testing
-    Before an official release upload the tarball for testing used sites are
-    digikam3rdparty.free.fr or www.linux.it/~anaselli/kipi-plugins - depends
-    on who is releasing :)
-    Send a mail to [hidden email] and [hidden email] to have a
-    feedback from pakagers before posting an offical release annoucement.
-
-  f) Upload tarbal on SF and update kipi site
-     official site for uploading the release is http://sourceforge.net/projects/kipi
-     web page to be update is http://extragear.kde.org/apps/kipi/
-     to update this last you have to get, change and commit it from
-     [hidden email]/home/kde/trunk/www/areas/extragear/apps/kipi
-     Send a mail to announce the official release.
-
-3. Release kipi-plugins
- a) Update release info
     kipi-plugins/kipi-plugins.lsm
     kipi-plugins/common/include/pluginsversion.h
 
--- trunk/extragear/libs/kipi-plugins/README #585979:585980
@@ -91,17 +91,16 @@
 
 Dependencies :
 -----------------------------------------------------------------------
-AutoConf >= 2.5
-AutoMake >= 1.7.0
-KDE 3.x
-gphoto2 2.x
-imlib2 >= 1.1.0
-libexif >= 0.5.7
+AutoConf    >= 2.5
+AutoMake    >= 1.7.0
+KDE         >= 3.x
+gphoto2     >= 2.x
+imlib2      >= 1.1.0
 ImageMagick >= 5.5.4
-MJPEGTools >= 1.6.0
-dcRAW >= 8.02
-libtiff >= 3.5.x
-libexiv2 >= 0.10.0
+MJPEGTools  >= 1.6.0
+dcRAW       >= 8.02
+libtiff     >= 3.5.x
+libexiv2    >= 0.10.0
 
 Plugin Specific Dependencies (for compiling and for running) :
 -------------------------------------------------------------------------
@@ -109,16 +108,14 @@
 Requirements: kde >= 3.1.x, libkipi >= 0.1
 specific plugin specific requirements:
 
-jpeglossless       : libkexif >= 0.1, imagemagick (runtime dependency)
+jpeglossless       : libexiv2 >= 0.10, imagemagick (runtime dependency)
 slideshow          : libimlib2 >= 1.0.x, OpenGL support for libqt
 batchprocessimages : imagemagick (runtime dependency)
 cdarchiving        : k3b (runtime dependency)
 kameraklient       : libgphoto2 >= 2.x
 mpegenconder       : mjpegtools (runtime dependency)
 wallpaper          : kdebase >= 3.1.x (runtime dependency)
-rawconverter       : libtiff >= 3.0, libexiv2 >= 0.10.0
+rawconverter       : libtiff >= 3.0, libexiv2 >= 0.10
 acquireimages      : libtiff >= 3.0
-timeadjust         : libkexif >= 0.1
+timeadjust         : libexiv2 >= 0.11
 htmlexport         : libxslt >= 1.1
-
-
--- trunk/extragear/libs/kipi-plugins/configure.in.bot #585979:585980
@@ -1,14 +1,3 @@
-##for i in x $DO_NOT_COMPILE ; do
-##  if test "x$i" = "xlibkexif" ; then
-##    echo ""
-##    echo "libkexif is available, but won't be compiled. The jpeglossless and timeadjust plugins will not be compiled."
-##    echo ""
-##    have_libkexif=no
-##  fi
-##done
-##
-##AM_CONDITIONAL(compile_TIMEADJUST,   [test x$have_libkexif = xyes])
-##AM_CONDITIONAL(compile_JPEGLOSSLESS,  [test x$have_libkexif = xyes -a x$have_tiff = xyes])
 
 if test "x$have_libkipi" != "xyes"; then
   echo ""
@@ -45,13 +34,6 @@
   all_tests=bad
 fi
 
-if test "x$have_libkexif" != "xyes"; then
-  echo ""
-  echo "You're missing libkexif. The jpeglossless plugin will not be compiled."
-  echo ""
-  all_tests=bad
-fi
-
 if test "x$have_xslt" != "xyes"; then
   echo ""
   echo "You're missing libxslt. The htmlexport plugin will not be compiled."
--- trunk/extragear/libs/kipi-plugins/configure.in.in #585979:585980
@@ -52,54 +52,6 @@
      DO_NOT_COMPILE="$DO_NOT_COMPILE kipi-plugins"
 fi
 
-# --------------------------------------------------------------------
-# Check for libkexif
-# --------------------------------------------------------------------
-
-AC_MSG_CHECKING([for libkexif in our sources])
-if test -d $srcdir/libkexif; then
-    have_libkexif=yes
-    LIBKEXIF_CFLAGS='-I$(top_srcdir)'
-    LIBKEXIF_LIBS='$(top_builddir)/libkexif/libkexif.la'
-    LIBKEXIF_LIBS_DEP='$(LIBKEXIF_LIBS)'
-    AC_MSG_RESULT([found])
-    AC_SUBST(LIBKEXIF_CFLAGS)
-    AC_SUBST(LIBKEXIF_LIBS)
-    AC_SUBST(LIBKEXIF_LIBS_DEP)
-else
-
-    if test "$PKGCONFIGFOUND" = "yes" ; then
-        # check for libkexif
-        have_libkexif=no
-
- KDE_PKG_CHECK_MODULES(LIBKEXIF, libkexif >= 0.1,
- have_libkexif=yes, have_libkexif=no)
-
- if test "x$have_libkexif" = "xno"; then
-   LIBKEXIF_CFLAGS=""
-   LIBKEXIF_LIBS=""
-           AC_MSG_RESULT([not found])
- else
-   AC_MSG_RESULT([found])
- fi
-     else
-        LIBKEXIF_CFLAGS=""
- LIBKEXIF_LIBS=""
-        AC_MSG_RESULT([not found])
-     fi
-     AC_SUBST(LIBKEXIF_CFLAGS)
-     AC_SUBST(LIBKEXIF_LIBS)
-     AM_CONDITIONAL(compile_LIBKEXIF, true)
-fi
-
-if test x$have_libkexif != xyes; then
-   AC_MSG_RESULT(
- [libkexif not installed. disabling jpeglossless plugin])
-fi
-
-AM_CONDITIONAL(compile_TIMEADJUST,    [test x$have_libkexif = xyes])
-AM_CONDITIONAL(compile_JPEGLOSSLESS,  [test x$have_libkexif = xyes])
-
 #------------------------------------------------------------------
 # Check for libtiff
 #------------------------------------------------------------------
@@ -183,7 +135,9 @@
   AC_SUBST(LIB_EXIV2)
 fi
 
-AM_CONDITIONAL(compile_RAWCONVERTER, test -n "${EXIV2_CONFIG}")
+AM_CONDITIONAL(compile_RAWCONVERTER, [test x$have_exiv2 = xyes])
+AM_CONDITIONAL(compile_TIMEADJUST,   [test x$have_exiv2 = xyes])
+AM_CONDITIONAL(compile_JPEGLOSSLESS, [test x$have_exiv2 = xyes])
 
 # ----------------------------------------------------------
 #
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel
Free forum by Nabble Edit this page