commit libmediaart for openSUSE:Factory
Hello community, here is the log from the commit of package libmediaart for openSUSE:Factory checked in at 2014-02-11 10:32:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libmediaart (Old) and /work/SRC/openSUSE:Factory/.libmediaart.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libmediaart" Changes: -------- --- /work/SRC/openSUSE:Factory/libmediaart/libmediaart.changes 2013-12-31 10:05:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libmediaart.new/libmediaart.changes 2014-02-11 10:32:54.000000000 +0100 @@ -1,0 +2,19 @@ +Thu Feb 6 18:33:47 UTC 2014 - dimstar@opensuse.org + +- Update to version 0.2.0: + + build: Remove all 'tracker' uses in configure.ac. + + build: Fix selection between backends Qt and GdkPixbuf. + + build: Fix requirement on tracker-0.16 in pkgconfig file. + + build: Make sure pkgconfig file uses -1.0 to avoid minor ver + changes. + + extract: Port Qt backend to Qt5 and NEMO platform. + + extract: Fixed Qt(4) backend to compile and removed all Tracker + references. + + libmediaart: Fix include which incorrectly defined _INSIDE in + main header. + + docs: Remove reference to Tracker in reference overview. +- Rename subpackage, following upstreams name changes: + + libmediaart-0_2-0 to libmediaart-1_0-0. + + typelib-1-0-MediaArt-0_2 to typelib-1-0-MediaArt-1_0. + +------------------------------------------------------------------- Old: ---- libmediaart-0.1.0.tar.xz New: ---- libmediaart-0.2.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmediaart.spec ++++++ --- /var/tmp/diff_new_pack.cslGH1/_old 2014-02-11 10:32:54.000000000 +0100 +++ /var/tmp/diff_new_pack.cslGH1/_new 2014-02-11 10:32:54.000000000 +0100 @@ -16,14 +16,14 @@ # Name: libmediaart -Version: 0.1.0 +Version: 0.2.0 Release: 0 # License note: src.rpm contains GPL-2.0+ (tests) and LGPL-2.1+ code License: GPL-2.0+ and LGPL-2.1+ Summary: Media Art extraction library Url: https://download.gnome.org/sources/libmediaart Group: Productivity/Other -Source: http://download.gnome.org/sources/libmediaart/0.1/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/libmediaart/0.2/%{name}-%{version}.tar.xz BuildRequires: gcc-c++ BuildRequires: gobject-introspection-devel >= 1.30.0 BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.12.0 @@ -36,23 +36,23 @@ The libmediaart library is the foundation for media art caching, extraction and lookup for applications on the desktop. -%package -n libmediaart-0_2-0 +%package -n libmediaart-1_0-0 # License note: the library is pure LGPL-2.1+ License: LGPL-2.1+ Summary: Media Art extraction library Group: System/Libraries -%description -n libmediaart-0_2-0 +%description -n libmediaart-1_0-0 The libmediaart library is the foundation for media art caching, extraction and lookup for applications on the desktop. -%package -n typelib-1_0-MediaArt-0_2 +%package -n typelib-1_0-MediaArt-1_0 # License note: the library is pure LGPL-2.1+ License: LGPL-2.1+ Summary: Media Art extraction library -- Introspection bindings Group: System/Libraries -%description -n typelib-1_0-MediaArt-0_2 +%description -n typelib-1_0-MediaArt-1_0 The libmediaart library is the foundation for media art caching, extraction and lookup for applications on the desktop. @@ -61,8 +61,8 @@ License: LGPL-2.1+ Summary: Media Art extraction library Group: Development/Languages/C and C++ -Requires: libmediaart-0_2-0 = %{version} -Requires: typelib-1_0-MediaArt-0_2 = %{version} +Requires: libmediaart-1_0-0 = %{version} +Requires: typelib-1_0-MediaArt-1_0 = %{version} %description devel The libmediaart library is the foundation for media art caching, @@ -79,25 +79,25 @@ %make_install find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print -%post -n libmediaart-0_2-0 -p /sbin/ldconfig +%post -n libmediaart-1_0-0 -p /sbin/ldconfig -%postun -n libmediaart-0_2-0 -p /sbin/ldconfig +%postun -n libmediaart-1_0-0 -p /sbin/ldconfig -%files -n libmediaart-0_2-0 +%files -n libmediaart-1_0-0 %defattr(-,root,root) %doc COPYING.LESSER -%{_libdir}/libmediaart-0.2.so.* +%{_libdir}/libmediaart-1.0.so.* -%files -n typelib-1_0-MediaArt-0_2 +%files -n typelib-1_0-MediaArt-1_0 %defattr(-,root,root) -%{_libdir}/girepository-1.0/MediaArt-0.2.typelib +%{_libdir}/girepository-1.0/MediaArt-1.0.typelib %files devel %defattr(-,root,root) %doc %{_datadir}/gtk-doc/html/%{name}/ -%{_datadir}/gir-1.0/MediaArt-0.2.gir -%{_libdir}/libmediaart-0.2.so -%{_libdir}/pkgconfig/libmediaart-0.2.pc -%{_includedir}/libmediaart-0.2/ +%{_datadir}/gir-1.0/MediaArt-1.0.gir +%{_libdir}/libmediaart-1.0.so +%{_libdir}/pkgconfig/libmediaart-1.0.pc +%{_includedir}/libmediaart-1.0/ %changelog ++++++ libmediaart-0.1.0.tar.xz -> libmediaart-0.2.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmediaart-0.1.0/Makefile.in new/libmediaart-0.2.0/Makefile.in --- old/libmediaart-0.1.0/Makefile.in 2013-11-01 13:19:03.000000000 +0100 +++ new/libmediaart-0.2.0/Makefile.in 2014-02-06 18:51:59.000000000 +0100 @@ -337,8 +337,10 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -QT_CFLAGS = @QT_CFLAGS@ -QT_LIBS = @QT_LIBS@ +QT4_CFLAGS = @QT4_CFLAGS@ +QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmediaart-0.1.0/NEWS new/libmediaart-0.2.0/NEWS --- old/libmediaart-0.1.0/NEWS 2013-11-01 13:18:05.000000000 +0100 +++ new/libmediaart-0.2.0/NEWS 2014-02-06 18:49:27.000000000 +0100 @@ -1,3 +1,18 @@ +NEW in 0.2 - 2014-02-06 +======================= + +The main changes since 0.1.0 are: + + * build: Remove all 'tracker' uses in configure.ac. + * build: Fix selection between backends Qt and GdkPixbuf + * build: Fix requirement on tracker-0.16 in pkgconfig file + * build: Make sure pkgconfig file uses -1.0 to avoid minor ver changes + * extract: Port Qt backend to Qt5 and NEMO platform + * extract: Fixed Qt(4) backend to compile and removed all Tracker references + * libmediaart: Fix include which incorrectly defined _INSIDE in main header + * docs: Remove reference to Tracker in reference overview + + NEW in 0.1 - 2013-11-01 ======================= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmediaart-0.1.0/config.h.in new/libmediaart-0.2.0/config.h.in --- old/libmediaart-0.1.0/config.h.in 2013-11-01 13:19:02.000000000 +0100 +++ new/libmediaart-0.2.0/config.h.in 2014-02-06 18:51:58.000000000 +0100 @@ -12,9 +12,18 @@ /* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H +/* Define if we enable Nemo specific features */ +#undef HAVE_NEMO + /* Define if we have Qt */ #undef HAVE_QT +/* Define if we have Qt4 */ +#undef HAVE_QT4 + +/* Define if we have Qt5 */ +#undef HAVE_QT5 + /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmediaart-0.1.0/configure new/libmediaart-0.2.0/configure --- old/libmediaart-0.1.0/configure 2013-11-01 13:19:02.000000000 +0100 +++ new/libmediaart-0.2.0/configure 2014-02-06 18:51:58.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libmediaart 0.1.0. +# Generated by GNU Autoconf 2.69 for libmediaart 0.2.0. # # Report bugs to <http://bugzilla.gnome.org/>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='libmediaart' PACKAGE_TARNAME='libmediaart' -PACKAGE_VERSION='0.1.0' -PACKAGE_STRING='libmediaart 0.1.0' +PACKAGE_VERSION='0.2.0' +PACKAGE_STRING='libmediaart 0.2.0' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/' PACKAGE_URL='https://wiki.gnome.org/MediaArtStorageSpec' @@ -639,6 +639,8 @@ HAVE_UNIT_TESTS_FALSE HAVE_UNIT_TESTS_TRUE gtester +HAVE_NEMO_FALSE +HAVE_NEMO_TRUE LIBMEDIAART_BACKEND HAVE_GDKPIXBUF_FALSE HAVE_GDKPIXBUF_TRUE @@ -646,8 +648,14 @@ GDKPIXBUF_CFLAGS HAVE_QT_FALSE HAVE_QT_TRUE -QT_LIBS -QT_CFLAGS +HAVE_QT5_FALSE +HAVE_QT5_TRUE +HAVE_QT4_FALSE +HAVE_QT4_TRUE +QT4_LIBS +QT4_CFLAGS +QT5_LIBS +QT5_CFLAGS ENABLE_VAPIGEN_FALSE ENABLE_VAPIGEN_TRUE VAPIGEN_MAKEFILE @@ -843,6 +851,7 @@ enable_vala enable_gdkpixbuf enable_qt +enable_nemo enable_unit_tests ' ac_precious_vars='build_alias @@ -867,8 +876,10 @@ LIBMEDIAART_LIBS GTKDOC_DEPS_CFLAGS GTKDOC_DEPS_LIBS -QT_CFLAGS -QT_LIBS +QT5_CFLAGS +QT5_LIBS +QT4_CFLAGS +QT4_LIBS GDKPIXBUF_CFLAGS GDKPIXBUF_LIBS' @@ -1411,7 +1422,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libmediaart 0.1.0 to adapt to many kinds of systems. +\`configure' configures libmediaart 0.2.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1481,7 +1492,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libmediaart 0.1.0:";; + short | recursive ) echo "Configuration of libmediaart 0.2.0:";; esac cat <<\_ACEOF @@ -1510,6 +1521,7 @@ --enable-gdkpixbuf enable GdkPixbuf support, (MP3 album art) [[default=auto]] --enable-qt enable Qt support, (MP3 album art) [[default=auto]] + --enable-nemo enable nemo specific [[default=no]] --enable-unit-tests enable unit tests [[default=yes]] Optional Packages: @@ -1553,8 +1565,10 @@ C compiler flags for GTKDOC_DEPS, overriding pkg-config GTKDOC_DEPS_LIBS linker flags for GTKDOC_DEPS, overriding pkg-config - QT_CFLAGS C compiler flags for QT, overriding pkg-config - QT_LIBS linker flags for QT, overriding pkg-config + QT5_CFLAGS C compiler flags for QT5, overriding pkg-config + QT5_LIBS linker flags for QT5, overriding pkg-config + QT4_CFLAGS C compiler flags for QT4, overriding pkg-config + QT4_LIBS linker flags for QT4, overriding pkg-config GDKPIXBUF_CFLAGS C compiler flags for GDKPIXBUF, overriding pkg-config GDKPIXBUF_LIBS @@ -1627,7 +1641,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libmediaart configure 0.1.0 +libmediaart configure 0.2.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2171,7 +2185,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libmediaart $as_me 0.1.0, which was +It was created by libmediaart $as_me 0.2.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3040,7 +3054,7 @@ # Define the identity of the package. PACKAGE='libmediaart' - VERSION='0.1.0' + VERSION='0.2.0' # Some tools Automake needs. @@ -3240,13 +3254,13 @@ LIBMEDIAART_MAJOR_VERSION=0 -LIBMEDIAART_MINOR_VERSION=1 +LIBMEDIAART_MINOR_VERSION=2 LIBMEDIAART_MICRO_VERSION=0 LIBMEDIAART_INTERFACE_AGE=0 -LIBMEDIAART_BINARY_AGE=100 -LIBMEDIAART_VERSION=0.1.0 -LIBMEDIAART_API_VERSION=0.2 -LIBMEDIAART_BINARY_VERSION=0.2.0 +LIBMEDIAART_BINARY_AGE=200 +LIBMEDIAART_VERSION=0.2.0 +LIBMEDIAART_API_VERSION=1.0 +LIBMEDIAART_BINARY_VERSION=1.0.0 @@ -3263,7 +3277,7 @@ $as_echo "#define LIBMEDIAART_MAJOR_VERSION 0" >>confdefs.h -$as_echo "#define LIBMEDIAART_MINOR_VERSION 1" >>confdefs.h +$as_echo "#define LIBMEDIAART_MINOR_VERSION 2" >>confdefs.h $as_echo "#define LIBMEDIAART_MICRO_VERSION 0" >>confdefs.h @@ -3272,14 +3286,14 @@ $as_echo "#define LIBMEDIAART_INTERFACE_AGE 0" >>confdefs.h -$as_echo "#define LIBMEDIAART_BINARY_AGE 100" >>confdefs.h +$as_echo "#define LIBMEDIAART_BINARY_AGE 200" >>confdefs.h # libtool versioning -LT_RELEASE=0.1 -LT_CURRENT=100 +LT_RELEASE=0.2 +LT_CURRENT=200 LT_REVISION=0 -LT_AGE=100 +LT_AGE=200 LT_CURRENT_MINUS_AGE=0 @@ -17075,8 +17089,8 @@ # Library required versions GLIB_REQUIRED=2.35.1 GDKPIXBUF_REQUIRED=2.12.0 -QT_REQUIRED=4.7.1 -TRACKER_REQUIRED=0.16.0 +QT5_REQUIRED=5.0.0 +QT4_REQUIRED=4.7.1 # Check requirements for libmediaart LIBMEDIAART_REQUIRED="glib-2.0 >= $GLIB_REQUIRED @@ -17994,7 +18008,7 @@ ################################################################## -# Check for tracker-extract: GdkPixbuf for MP3 album art +# Check for GdkPixbuf for MP3 album art ################################################################## # Check whether --enable-gdkpixbuf was given. @@ -18020,25 +18034,100 @@ selected_for_media_art="no (disabled)" ################################################################## -# Check for tracker-extract: Choose between GdkPixbuf/Qt +# Choose between backends (GdkPixbuf/Qt/etc) ################################################################## +if test "x$enable_qt" == "xyes" && test "x$enable_gdkpixbuf" == "xyes"; then + as_fn_error $? "Can not enable both Qt and GdkPixbuf backends, please pick one" "$LINENO" 5 +fi + if test "x$enable_qt" != "xno" && test "x$enable_gdkpixbuf" != "xyes"; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for QT" >&5 -$as_echo_n "checking for QT... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for QT5" >&5 +$as_echo_n "checking for QT5... " >&6; } + +if test -n "$QT5_CFLAGS"; then + pkg_cv_QT5_CFLAGS="$QT5_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Gui >= \$QT5_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "Qt5Gui >= $QT5_REQUIRED") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_QT5_CFLAGS=`$PKG_CONFIG --cflags "Qt5Gui >= $QT5_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$QT5_LIBS"; then + pkg_cv_QT5_LIBS="$QT5_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Gui >= \$QT5_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "Qt5Gui >= $QT5_REQUIRED") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_QT5_LIBS=`$PKG_CONFIG --libs "Qt5Gui >= $QT5_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + QT5_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5Gui >= $QT5_REQUIRED" 2>&1` + else + QT5_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5Gui >= $QT5_REQUIRED" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$QT5_PKG_ERRORS" >&5 + + have_qt5=no +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + have_qt5=no +else + QT5_CFLAGS=$pkg_cv_QT5_CFLAGS + QT5_LIBS=$pkg_cv_QT5_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_qt5=yes +fi + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for QT4" >&5 +$as_echo_n "checking for QT4... " >&6; } -if test -n "$QT_CFLAGS"; then - pkg_cv_QT_CFLAGS="$QT_CFLAGS" +if test -n "$QT4_CFLAGS"; then + pkg_cv_QT4_CFLAGS="$QT4_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtGui >= \$QT_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "QtGui >= $QT_REQUIRED") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtGui >= \$QT4_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "QtGui >= $QT4_REQUIRED") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_QT_CFLAGS=`$PKG_CONFIG --cflags "QtGui >= $QT_REQUIRED" 2>/dev/null` + pkg_cv_QT4_CFLAGS=`$PKG_CONFIG --cflags "QtGui >= $QT4_REQUIRED" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -18046,16 +18135,16 @@ else pkg_failed=untried fi -if test -n "$QT_LIBS"; then - pkg_cv_QT_LIBS="$QT_LIBS" +if test -n "$QT4_LIBS"; then + pkg_cv_QT4_LIBS="$QT4_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtGui >= \$QT_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "QtGui >= $QT_REQUIRED") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtGui >= \$QT4_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "QtGui >= $QT4_REQUIRED") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_QT_LIBS=`$PKG_CONFIG --libs "QtGui >= $QT_REQUIRED" 2>/dev/null` + pkg_cv_QT4_LIBS=`$PKG_CONFIG --libs "QtGui >= $QT4_REQUIRED" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -18076,47 +18165,84 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - QT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "QtGui >= $QT_REQUIRED" 2>&1` + QT4_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "QtGui >= $QT4_REQUIRED" 2>&1` else - QT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "QtGui >= $QT_REQUIRED" 2>&1` + QT4_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "QtGui >= $QT4_REQUIRED" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$QT_PKG_ERRORS" >&5 + echo "$QT4_PKG_ERRORS" >&5 - have_qt=no + have_qt4=no elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - have_qt=no + have_qt4=no else - QT_CFLAGS=$pkg_cv_QT_CFLAGS - QT_LIBS=$pkg_cv_QT_LIBS + QT4_CFLAGS=$pkg_cv_QT4_CFLAGS + QT4_LIBS=$pkg_cv_QT4_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - have_qt=yes + have_qt4=yes fi - LIBMEDIAART_CFLAGS="$LIBMEDIAART_CFLAGS $QT_CFLAGS" - LIBMEDIAART_LIBS="$LIBMEDIAART_LIBS $QT_LIBS" + if test "x$have_qt5" = "xyes"; then + LIBMEDIAART_CFLAGS="$LIBMEDIAART_CFLAGS $QT5_CFLAGS -fPIC" + LIBMEDIAART_LIBS="$LIBMEDIAART_LIBS $QT5_LIBS" + + +$as_echo "#define HAVE_QT5 /**/" >>confdefs.h - if test "x$have_qt" = "xyes"; then $as_echo "#define HAVE_QT /**/" >>confdefs.h LIBMEDIAART_BACKEND=QtGui - selected_for_media_art="yes (qt)" + + selected_for_media_art="yes (qt5)" + else + if test "x$have_qt4" = "xyes"; then + LIBMEDIAART_CFLAGS="$LIBMEDIAART_CFLAGS $QT4_CFLAGS -fPIC" + LIBMEDIAART_LIBS="$LIBMEDIAART_LIBS $QT4_LIBS" + + +$as_echo "#define HAVE_QT4 /**/" >>confdefs.h + + +$as_echo "#define HAVE_QT /**/" >>confdefs.h + + + selected_for_media_art="yes (qt4)" + fi fi else - have_qt="no (disabled)" + have_qt4="no (disabled)" + have_qt5="no (disabled)" fi if test "x$enable_qt" = "xyes"; then - if test "x$have_qt" != "xyes"; then - as_fn_error $? "Couldn't find Qt >= $QT_REQUIRED." "$LINENO" 5 + if test "x$have_qt5" != "xyes"; then + if test "x$have_qt4" != "xyes"; then + as_fn_error $? "Couldn't find Qt4 >= $QT4_REQUIRED or Qt5 >= $QT5_REQUIRED." "$LINENO" 5 + fi fi fi - if test "x$have_qt" = "xyes"; then + if test "x$have_qt4" = "xyes"; then + HAVE_QT4_TRUE= + HAVE_QT4_FALSE='#' +else + HAVE_QT4_TRUE='#' + HAVE_QT4_FALSE= +fi + + if test "x$have_qt5" = "xyes"; then + HAVE_QT5_TRUE= + HAVE_QT5_FALSE='#' +else + HAVE_QT5_TRUE='#' + HAVE_QT5_FALSE= +fi + + if test "x$have_qt5" = "xyes" || test "x$have_qt4" = "xyes"; then HAVE_QT_TRUE= HAVE_QT_FALSE='#' else @@ -18125,7 +18251,7 @@ fi -if test "x$enable_gdkpixbuf" != "xno" && test "x$enable_quill" != "xyes"; then +if test "x$enable_gdkpixbuf" != "xno" && test "x$enable_qt" != "xyes"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GDKPIXBUF" >&5 @@ -18229,6 +18355,33 @@ +################################################################# +# Check if we should install nemo specific features +################################################################# + +# Check whether --enable-nemo was given. +if test "${enable_nemo+set}" = set; then : + enableval=$enable_nemo; enable_nemo="$enableval" +else + enable_nemo=no +fi + + + if test "x$enable_nemo" = "xyes"; then + HAVE_NEMO_TRUE= + HAVE_NEMO_FALSE='#' +else + HAVE_NEMO_TRUE='#' + HAVE_NEMO_FALSE= +fi + + +if test "x$enable_nemo" = "xyes" ; then + +$as_echo "#define HAVE_NEMO 1" >>confdefs.h + +fi + #################################################################### # Should we build GLib based unit tests #################################################################### @@ -18488,6 +18641,14 @@ as_fn_error $? "conditional \"ENABLE_VAPIGEN\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_QT4_TRUE}" && test -z "${HAVE_QT4_FALSE}"; then + as_fn_error $? "conditional \"HAVE_QT4\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAVE_QT5_TRUE}" && test -z "${HAVE_QT5_FALSE}"; then + as_fn_error $? "conditional \"HAVE_QT5\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${HAVE_QT_TRUE}" && test -z "${HAVE_QT_FALSE}"; then as_fn_error $? "conditional \"HAVE_QT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -18496,6 +18657,10 @@ as_fn_error $? "conditional \"HAVE_GDKPIXBUF\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_NEMO_TRUE}" && test -z "${HAVE_NEMO_FALSE}"; then + as_fn_error $? "conditional \"HAVE_NEMO\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${HAVE_UNIT_TESTS_TRUE}" && test -z "${HAVE_UNIT_TESTS_FALSE}"; then as_fn_error $? "conditional \"HAVE_UNIT_TESTS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -18897,7 +19062,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libmediaart $as_me 0.1.0, which was +This file was extended by libmediaart $as_me 0.2.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18964,7 +19129,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libmediaart config.status 0.1.0 +libmediaart config.status 0.2.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -21015,4 +21180,6 @@ Enable documentation: $enable_gtk_doc Support media art processing: $selected_for_media_art + + Support Nemo $enable_nemo " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmediaart-0.1.0/configure.ac new/libmediaart-0.2.0/configure.ac --- old/libmediaart-0.1.0/configure.ac 2013-11-01 13:16:45.000000000 +0100 +++ new/libmediaart-0.2.0/configure.ac 2014-02-06 18:50:22.000000000 +0100 @@ -12,7 +12,7 @@ # if backwards compatibility has been broken, # set LIBMEDIAART_BINARY_AGE and LIBMEDIAART_INTERFACE_AGE to 0. m4_define([libmediaart_major_version], [0]) -m4_define([libmediaart_minor_version], [1]) +m4_define([libmediaart_minor_version], [2]) m4_define([libmediaart_micro_version], [0]) m4_define([libmediaart_interface_age], [0]) m4_define([libmediaart_binary_age], @@ -20,7 +20,7 @@ m4_define([libmediaart_version], [libmediaart_major_version.libmediaart_minor_version.libmediaart_micro_version]) # This is the X.Y used in -lliblibmediaart-FOO-X.Y -m4_define([libmediaart_api_version], [0.2]) +m4_define([libmediaart_api_version], [1.0]) # libtool version related macros m4_define([libmediaart_lt_release], [libmediaart_major_version.libmediaart_minor_version]) @@ -38,7 +38,7 @@ # for Libmediaart. # # LIBMEDIAART_BINARY_VERSION=$LIBMEDIAART_MAJOR_VERSION.$LIBMEDIAART_MINOR_VERSION.$LT_CURRENT -m4_define([libmediaart_binary_version], [0.2.0]) +m4_define([libmediaart_binary_version], [1.0.0]) AC_INIT([libmediaart], [libmediaart_version], @@ -139,8 +139,8 @@ # Library required versions GLIB_REQUIRED=2.35.1 GDKPIXBUF_REQUIRED=2.12.0 -QT_REQUIRED=4.7.1 -TRACKER_REQUIRED=0.16.0 +QT5_REQUIRED=5.0.0 +QT4_REQUIRED=4.7.1 # Check requirements for libmediaart LIBMEDIAART_REQUIRED="glib-2.0 >= $GLIB_REQUIRED @@ -190,7 +190,7 @@ VAPIGEN_CHECK([0.16]) ################################################################## -# Check for tracker-extract: GdkPixbuf for MP3 album art +# Check for GdkPixbuf for MP3 album art ################################################################## AC_ARG_ENABLE(gdkpixbuf, @@ -210,36 +210,61 @@ selected_for_media_art="no (disabled)" ################################################################## -# Check for tracker-extract: Choose between GdkPixbuf/Qt +# Choose between backends (GdkPixbuf/Qt/etc) ################################################################## -if test "x$enable_qt" != "xno" && test "x$enable_gdkpixbuf" != "xyes"; then - PKG_CHECK_MODULES(QT, - [QtGui >= $QT_REQUIRED], - [have_qt=yes], - [have_qt=no]) +if test "x$enable_qt" == "xyes" && test "x$enable_gdkpixbuf" == "xyes"; then + AC_MSG_ERROR([Can not enable both Qt and GdkPixbuf backends, please pick one]) +fi - LIBMEDIAART_CFLAGS="$LIBMEDIAART_CFLAGS $QT_CFLAGS" - LIBMEDIAART_LIBS="$LIBMEDIAART_LIBS $QT_LIBS" +if test "x$enable_qt" != "xno" && test "x$enable_gdkpixbuf" != "xyes"; then + PKG_CHECK_MODULES(QT5, + [Qt5Gui >= $QT5_REQUIRED], + [have_qt5=yes], + [have_qt5=no]) + PKG_CHECK_MODULES(QT4, + [QtGui >= $QT4_REQUIRED], + [have_qt4=yes], + [have_qt4=no]) + + if test "x$have_qt5" = "xyes"; then + LIBMEDIAART_CFLAGS="$LIBMEDIAART_CFLAGS $QT5_CFLAGS -fPIC" + LIBMEDIAART_LIBS="$LIBMEDIAART_LIBS $QT5_LIBS" - if test "x$have_qt" = "xyes"; then + AC_DEFINE(HAVE_QT5, [], [Define if we have Qt5]) AC_DEFINE(HAVE_QT, [], [Define if we have Qt]) LIBMEDIAART_BACKEND=QtGui - selected_for_media_art="yes (qt)" + + selected_for_media_art="yes (qt5)" + else + if test "x$have_qt4" = "xyes"; then + LIBMEDIAART_CFLAGS="$LIBMEDIAART_CFLAGS $QT4_CFLAGS -fPIC" + LIBMEDIAART_LIBS="$LIBMEDIAART_LIBS $QT4_LIBS" + + AC_DEFINE(HAVE_QT4, [], [Define if we have Qt4]) + AC_DEFINE(HAVE_QT, [], [Define if we have Qt]) + + selected_for_media_art="yes (qt4)" + fi fi else - have_qt="no (disabled)" + have_qt4="no (disabled)" + have_qt5="no (disabled)" fi if test "x$enable_qt" = "xyes"; then - if test "x$have_qt" != "xyes"; then - AC_MSG_ERROR([Couldn't find Qt >= $QT_REQUIRED.]) + if test "x$have_qt5" != "xyes"; then + if test "x$have_qt4" != "xyes"; then + AC_MSG_ERROR([Couldn't find Qt4 >= $QT4_REQUIRED or Qt5 >= $QT5_REQUIRED.]) + fi fi fi -AM_CONDITIONAL(HAVE_QT, test "x$have_qt" = "xyes") +AM_CONDITIONAL(HAVE_QT4, test "x$have_qt4" = "xyes") +AM_CONDITIONAL(HAVE_QT5, test "x$have_qt5" = "xyes") +AM_CONDITIONAL(HAVE_QT, test "x$have_qt5" = "xyes" || test "x$have_qt4" = "xyes") -if test "x$enable_gdkpixbuf" != "xno" && test "x$enable_quill" != "xyes"; then +if test "x$enable_gdkpixbuf" != "xno" && test "x$enable_qt" != "xyes"; then PKG_CHECK_MODULES(GDKPIXBUF, [gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED], [have_gdkpixbuf=yes], @@ -267,6 +292,22 @@ AC_SUBST(LIBMEDIAART_BACKEND) +################################################################# +# Check if we should install nemo specific features +################################################################# + +AC_ARG_ENABLE(nemo, + AS_HELP_STRING([--enable-nemo], + [enable nemo specific [[default=no]]]), + [enable_nemo="$enableval"], + [enable_nemo=no]) + +AM_CONDITIONAL(HAVE_NEMO, test "x$enable_nemo" = "xyes") + +if test "x$enable_nemo" = "xyes" ; then + AC_DEFINE(HAVE_NEMO, 1, [Define if we enable Nemo specific features]) +fi + #################################################################### # Should we build GLib based unit tests #################################################################### @@ -320,4 +361,6 @@ Enable documentation: $enable_gtk_doc Support media art processing: $selected_for_media_art + + Support Nemo $enable_nemo " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmediaart-0.1.0/docs/Makefile.in new/libmediaart-0.2.0/docs/Makefile.in --- old/libmediaart-0.1.0/docs/Makefile.in 2013-11-01 13:19:03.000000000 +0100 +++ new/libmediaart-0.2.0/docs/Makefile.in 2014-02-06 18:51:59.000000000 +0100 @@ -282,8 +282,10 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -QT_CFLAGS = @QT_CFLAGS@ -QT_LIBS = @QT_LIBS@ +QT4_CFLAGS = @QT4_CFLAGS@ +QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmediaart-0.1.0/docs/reference/Makefile.in new/libmediaart-0.2.0/docs/reference/Makefile.in --- old/libmediaart-0.1.0/docs/reference/Makefile.in 2013-11-01 13:19:03.000000000 +0100 +++ new/libmediaart-0.2.0/docs/reference/Makefile.in 2014-02-06 18:51:59.000000000 +0100 @@ -282,8 +282,10 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -QT_CFLAGS = @QT_CFLAGS@ -QT_LIBS = @QT_LIBS@ +QT4_CFLAGS = @QT4_CFLAGS@ +QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmediaart-0.1.0/docs/reference/libmediaart/Makefile.in new/libmediaart-0.2.0/docs/reference/libmediaart/Makefile.in --- old/libmediaart-0.1.0/docs/reference/libmediaart/Makefile.in 2013-11-01 13:19:03.000000000 +0100 +++ new/libmediaart-0.2.0/docs/reference/libmediaart/Makefile.in 2014-02-06 18:51:59.000000000 +0100 @@ -229,8 +229,10 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -QT_CFLAGS = @QT_CFLAGS@ -QT_LIBS = @QT_LIBS@ +QT4_CFLAGS = @QT4_CFLAGS@ +QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -399,7 +401,7 @@ #### setup #### GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V)) GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY)) -GTK_DOC_V_SETUP_0 = @echo " DOC Preparing build"; +GTK_DOC_V_SETUP_0 = @echo " DOC Preparing build *** $(V) ***"; #### scan #### GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_$(V)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmediaart-0.1.0/docs/reference/libmediaart/html/index.html new/libmediaart-0.2.0/docs/reference/libmediaart/html/index.html --- old/libmediaart-0.1.0/docs/reference/libmediaart/html/index.html 2013-11-01 13:19:18.000000000 +0100 +++ new/libmediaart-0.2.0/docs/reference/libmediaart/html/index.html 2014-02-06 18:52:13.000000000 +0100 @@ -5,7 +5,7 @@ <title>libmediaart Library Reference Manual</title> <meta name="generator" content="DocBook XSL Stylesheets V1.78.1"> <link rel="home" href="index.html" title="libmediaart Library Reference Manual"> -<link rel="next" href="tracker-overview.html" title="Part I. Overview"> +<link rel="next" href="overview.html" title="Part I. Overview"> <meta name="generator" content="GTK-Doc V1.19 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> @@ -15,7 +15,7 @@ <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libmediaart Library Reference Manual</p></th></tr></table></div> <div><p class="releaseinfo"> - for libmediaart 0.1.0 + for libmediaart 0.2.0 . The latest version of this documentation can be found on-line at <a class="ulink" href="http://library.gnome.org/devel/libmediaart/unstable/" target="_top"> @@ -26,8 +26,8 @@ <hr> </div> <div class="toc"><dl class="toc"> -<dt><span class="part"><a href="tracker-overview.html">I. Overview</a></span></dt> -<dd><dl><dt><span class="chapter"><a href="tracker-overview-compiling.html">Compiling applications</a></span></dt></dl></dd> +<dt><span class="part"><a href="overview.html">I. Overview</a></span></dt> +<dd><dl><dt><span class="chapter"><a href="overview-compiling.html">Compiling applications</a></span></dt></dl></dd> <dt><span class="part"><a href="libmediaart-reference.html">II. Reference</a></span></dt> <dd><dl> <dt><span class="chapter"><a href="ch02.html">Reference</a></span></dt> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmediaart-0.1.0/docs/reference/libmediaart/html/libmediaart-reference.html new/libmediaart-0.2.0/docs/reference/libmediaart/html/libmediaart-reference.html --- old/libmediaart-0.1.0/docs/reference/libmediaart/html/libmediaart-reference.html 2013-11-01 13:19:18.000000000 +0100 +++ new/libmediaart-0.2.0/docs/reference/libmediaart/html/libmediaart-reference.html 2014-02-06 18:52:13.000000000 +0100 @@ -6,14 +6,14 @@ <meta name="generator" content="DocBook XSL Stylesheets V1.78.1"> <link rel="home" href="index.html" title="libmediaart Library Reference Manual"> <link rel="up" href="index.html" title="libmediaart Library Reference Manual"> -<link rel="prev" href="tracker-overview-compiling.html" title="Compiling applications"> +<link rel="prev" href="overview-compiling.html" title="Compiling applications"> <link rel="next" href="ch02.html" title="Reference"> <meta name="generator" content="GTK-Doc V1.19 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle"> -<td><a accesskey="p" href="tracker-overview-compiling.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td> +<td><a accesskey="p" href="overview-compiling.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td> <td> </td> <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td> <th width="100%" align="center">libmediaart Library Reference Manual</th> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmediaart-0.1.0/docs/reference/libmediaart/html/libmediaart.devhelp2 new/libmediaart-0.2.0/docs/reference/libmediaart/html/libmediaart.devhelp2 --- old/libmediaart-0.1.0/docs/reference/libmediaart/html/libmediaart.devhelp2 2013-11-01 13:19:18.000000000 +0100 +++ new/libmediaart-0.2.0/docs/reference/libmediaart/html/libmediaart.devhelp2 2014-02-06 18:52:13.000000000 +0100 @@ -2,8 +2,8 @@ <!DOCTYPE book PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" ""> <book xmlns="http://www.devhelp.net/book" title="libmediaart Library Reference Manual" link="index.html" author="" name="libmediaart" version="2" language="c"> <chapters> - <sub name="Overview" link="tracker-overview.html"> - <sub name="Compiling applications" link="tracker-overview-compiling.html"/> + <sub name="Overview" link="overview.html"> + <sub name="Compiling applications" link="overview-compiling.html"/> </sub> <sub name="Reference" link="libmediaart-reference.html"> <sub name="Reference" link="ch02.html"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmediaart-0.1.0/docs/reference/libmediaart/html/overview-compiling.html new/libmediaart-0.2.0/docs/reference/libmediaart/html/overview-compiling.html --- old/libmediaart-0.1.0/docs/reference/libmediaart/html/overview-compiling.html 1970-01-01 01:00:00.000000000 +0100 +++ new/libmediaart-0.2.0/docs/reference/libmediaart/html/overview-compiling.html 2014-02-06 18:52:13.000000000 +0100 @@ -0,0 +1,60 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<title>Compiling applications</title> +<meta name="generator" content="DocBook XSL Stylesheets V1.78.1"> +<link rel="home" href="index.html" title="libmediaart Library Reference Manual"> +<link rel="up" href="overview.html" title="Part I. Overview"> +<link rel="prev" href="overview.html" title="Part I. Overview"> +<link rel="next" href="libmediaart-reference.html" title="Part II. Reference"> +<meta name="generator" content="GTK-Doc V1.19 (XML mode)"> +<link rel="stylesheet" href="style.css" type="text/css"> +</head> +<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> +<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle"> +<td><a accesskey="p" href="overview.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td> +<td><a accesskey="u" href="overview.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td> +<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td> +<th width="100%" align="center">libmediaart Library Reference Manual</th> +<td><a accesskey="n" href="libmediaart-reference.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> +</tr></table> +<div class="chapter"> +<div class="titlepage"><div><div><h2 class="title"> +<a name="overview-compiling"></a>Compiling applications</h2></div></div></div> +<p> + To compile applications using libmediaart, you + need to tell the compiler where to find the proper header files + and libraries. This is done with the + <span class="application">pkg-config</span> utility. + </p> +<p> + The following interactive shell session demonstrates how + <span class="application">pkg-config</span> is used (the actual output on + your system may be different): +</p> +<pre class="programlisting"> +$ pkg-config --cflags libmediaart-0.2 + +$ pkg-config --libs libmediaart-0.2 + +</pre> +<p> + </p> +<p> + The simplest way to compile a program is to use the "backticks" + feature of the shell. If you enclose a command in backticks + (<span class="emphasis"><em>not single quotes</em></span>), then its output will be + substituted into the command line before execution: +</p> +<pre class="programlisting"> + $ cc `pkg-config --cflags --libs libmediaart-0.2` hello.c -o hello +</pre> +<p> + </p> +</div> +<div class="footer"> +<hr> + Generated by GTK-Doc V1.19</div> +</body> +</html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmediaart-0.1.0/docs/reference/libmediaart/html/overview.html new/libmediaart-0.2.0/docs/reference/libmediaart/html/overview.html --- old/libmediaart-0.1.0/docs/reference/libmediaart/html/overview.html 1970-01-01 01:00:00.000000000 +0100 +++ new/libmediaart-0.2.0/docs/reference/libmediaart/html/overview.html 2014-02-06 18:52:13.000000000 +0100 @@ -0,0 +1,41 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<title>Part I. Overview</title> +<meta name="generator" content="DocBook XSL Stylesheets V1.78.1"> +<link rel="home" href="index.html" title="libmediaart Library Reference Manual"> +<link rel="up" href="index.html" title="libmediaart Library Reference Manual"> +<link rel="prev" href="index.html" title="libmediaart Library Reference Manual"> +<link rel="next" href="overview-compiling.html" title="Compiling applications"> +<meta name="generator" content="GTK-Doc V1.19 (XML mode)"> +<link rel="stylesheet" href="style.css" type="text/css"> +</head> +<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> +<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle"> +<td><a accesskey="p" href="index.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td> +<td> </td> +<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td> +<th width="100%" align="center">libmediaart Library Reference Manual</th> +<td><a accesskey="n" href="overview-compiling.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> +</tr></table> +<div class="part"> +<div class="titlepage"><div><div><h1 class="title"> +<a name="overview"></a>Part I. Overview</h1></div></div></div> +<div class="partintro"> +<div></div> +<p> + The libmediaart library is the foundation for media art caching, + extraction and lookup for applications on the desktop. + </p> +<div class="toc"> +<p><b>Table of Contents</b></p> +<dl class="toc"><dt><span class="chapter"><a href="overview-compiling.html">Compiling applications</a></span></dt></dl> +</div> +</div> +</div> +<div class="footer"> +<hr> + Generated by GTK-Doc V1.19</div> +</body> +</html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmediaart-0.1.0/docs/reference/libmediaart/html/tracker-overview-compiling.html new/libmediaart-0.2.0/docs/reference/libmediaart/html/tracker-overview-compiling.html --- old/libmediaart-0.1.0/docs/reference/libmediaart/html/tracker-overview-compiling.html 2013-11-01 13:19:18.000000000 +0100 +++ new/libmediaart-0.2.0/docs/reference/libmediaart/html/tracker-overview-compiling.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,60 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> -<title>Compiling applications</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.78.1"> -<link rel="home" href="index.html" title="libmediaart Library Reference Manual"> -<link rel="up" href="tracker-overview.html" title="Part I. Overview"> -<link rel="prev" href="tracker-overview.html" title="Part I. Overview"> -<link rel="next" href="libmediaart-reference.html" title="Part II. Reference"> -<meta name="generator" content="GTK-Doc V1.19 (XML mode)"> -<link rel="stylesheet" href="style.css" type="text/css"> -</head> -<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> -<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle"> -<td><a accesskey="p" href="tracker-overview.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td> -<td><a accesskey="u" href="tracker-overview.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td> -<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td> -<th width="100%" align="center">libmediaart Library Reference Manual</th> -<td><a accesskey="n" href="libmediaart-reference.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> -</tr></table> -<div class="chapter"> -<div class="titlepage"><div><div><h2 class="title"> -<a name="tracker-overview-compiling"></a>Compiling applications</h2></div></div></div> -<p> - To compile applications using libtracker-miner, you - need to tell the compiler where to find the proper header files - and libraries. This is done with the - <span class="application">pkg-config</span> utility. - </p> -<p> - The following interactive shell session demonstrates how - <span class="application">pkg-config</span> is used (the actual output on - your system may be different): -</p> -<pre class="programlisting"> -$ pkg-config --cflags libmediaart-0.2 - -$ pkg-config --libs libmediaart-0.2 - -</pre> -<p> - </p> -<p> - The simplest way to compile a program is to use the "backticks" - feature of the shell. If you enclose a command in backticks - (<span class="emphasis"><em>not single quotes</em></span>), then its output will be - substituted into the command line before execution: -</p> -<pre class="programlisting"> - $ cc `pkg-config --cflags --libs libmediaart-0.2` hello.c -o hello -</pre> -<p> - </p> -</div> -<div class="footer"> -<hr> - Generated by GTK-Doc V1.19</div> -</body> -</html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmediaart-0.1.0/docs/reference/libmediaart/html/tracker-overview.html new/libmediaart-0.2.0/docs/reference/libmediaart/html/tracker-overview.html --- old/libmediaart-0.1.0/docs/reference/libmediaart/html/tracker-overview.html 2013-11-01 13:19:18.000000000 +0100 +++ new/libmediaart-0.2.0/docs/reference/libmediaart/html/tracker-overview.html 1970-01-01 01:00:00.000000000 +0100 @@ -1,41 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> -<title>Part I. Overview</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.78.1"> -<link rel="home" href="index.html" title="libmediaart Library Reference Manual"> -<link rel="up" href="index.html" title="libmediaart Library Reference Manual"> -<link rel="prev" href="index.html" title="libmediaart Library Reference Manual"> -<link rel="next" href="tracker-overview-compiling.html" title="Compiling applications"> -<meta name="generator" content="GTK-Doc V1.19 (XML mode)"> -<link rel="stylesheet" href="style.css" type="text/css"> -</head> -<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> -<table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle"> -<td><a accesskey="p" href="index.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td> -<td> </td> -<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td> -<th width="100%" align="center">libmediaart Library Reference Manual</th> -<td><a accesskey="n" href="tracker-overview-compiling.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> -</tr></table> -<div class="part"> -<div class="titlepage"><div><div><h1 class="title"> -<a name="tracker-overview"></a>Part I. Overview</h1></div></div></div> -<div class="partintro"> -<div></div> -<p> - The libmediaart library is the foundation for media art caching, - extraction and lookup for applications on the desktop. - </p> -<div class="toc"> -<p><b>Table of Contents</b></p> -<dl class="toc"><dt><span class="chapter"><a href="tracker-overview-compiling.html">Compiling applications</a></span></dt></dl> -</div> -</div> -</div> -<div class="footer"> -<hr> - Generated by GTK-Doc V1.19</div> -</body> -</html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmediaart-0.1.0/docs/reference/libmediaart/overview.sgml new/libmediaart-0.2.0/docs/reference/libmediaart/overview.sgml --- old/libmediaart-0.1.0/docs/reference/libmediaart/overview.sgml 2013-10-11 17:54:27.000000000 +0200 +++ new/libmediaart-0.2.0/docs/reference/libmediaart/overview.sgml 2014-02-06 18:44:38.000000000 +0100 @@ -1,6 +1,6 @@ <?xml version='1.0' encoding="ISO-8859-1"?> -<part id="tracker-overview"> +<part id="overview"> <title>Overview</title> <partintro> <para> @@ -9,11 +9,11 @@ </para> </partintro> - <chapter id="tracker-overview-compiling"> + <chapter id="overview-compiling"> <title>Compiling applications</title> <para> - To compile applications using libtracker-miner, you + To compile applications using libmediaart, you need to tell the compiler where to find the proper header files and libraries. This is done with the <application>pkg-config</application> utility. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmediaart-0.1.0/docs/reference/libmediaart/version.xml new/libmediaart-0.2.0/docs/reference/libmediaart/version.xml --- old/libmediaart-0.1.0/docs/reference/libmediaart/version.xml 2013-11-01 13:19:07.000000000 +0100 +++ new/libmediaart-0.2.0/docs/reference/libmediaart/version.xml 2014-02-06 18:52:03.000000000 +0100 @@ -1 +1 @@ -0.1.0 +0.2.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmediaart-0.1.0/gtk-doc.make new/libmediaart-0.2.0/gtk-doc.make --- old/libmediaart-0.1.0/gtk-doc.make 2013-07-31 13:51:48.000000000 +0200 +++ new/libmediaart-0.2.0/gtk-doc.make 2014-01-17 11:07:04.000000000 +0100 @@ -74,9 +74,10 @@ #### setup #### + GTK_DOC_V_SETUP=$(GTK_DOC_V_SETUP_$(V)) GTK_DOC_V_SETUP_=$(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY)) -GTK_DOC_V_SETUP_0=@echo " DOC Preparing build"; +GTK_DOC_V_SETUP_0=@echo " DOC Preparing build *** $(V) ***"; setup-build.stamp: -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmediaart-0.1.0/libmediaart/Makefile.in new/libmediaart-0.2.0/libmediaart/Makefile.in --- old/libmediaart-0.1.0/libmediaart/Makefile.in 2013-11-01 13:19:03.000000000 +0100 +++ new/libmediaart-0.2.0/libmediaart/Makefile.in 2014-02-06 18:51:59.000000000 +0100 @@ -349,8 +349,10 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -QT_CFLAGS = @QT_CFLAGS@ -QT_LIBS = @QT_LIBS@ +QT4_CFLAGS = @QT4_CFLAGS@ +QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmediaart-0.1.0/libmediaart/extractqt.cpp new/libmediaart-0.2.0/libmediaart/extractqt.cpp --- old/libmediaart-0.1.0/libmediaart/extractqt.cpp 2013-10-11 17:54:27.000000000 +0200 +++ new/libmediaart-0.2.0/libmediaart/extractqt.cpp 2014-02-06 18:43:55.000000000 +0100 @@ -20,31 +20,56 @@ * Philip Van Hoof <philip@codeminded.be> */ -#include "tracker-main.h" +#include "config.h" #include <QFile> #include <QBuffer> #include <QImageReader> #include <QImageWriter> +#ifdef HAVE_QT5 +#include <QCoreApplication> +#else #include <QApplication> +#endif #include <QColor> #include <QPainter> #include <glib.h> -#include "tracker-media-art-generic.h" +#ifdef HAVE_NEMO +#include <stdlib.h> +#endif G_BEGIN_DECLS +#ifdef HAVE_QT5 +static QGuiApplication *app = NULL; +#else /* HAVE_QT4 (we fallback to Qt4) */ static QApplication *app = NULL; +#endif /* HAVE_QT5 */ + +static gint max_width_in_bytes = 0; void -media_art_plugin_init (void) +media_art_plugin_init (gint max_width) { - int argc = 0; - char *argv[2] = { NULL, NULL }; + int argc = 1; + char *argv[2] = { (char*) "libmediaart", NULL }; + + g_return_if_fail (max_width >= 0); + + max_width_in_bytes = max_width; + +#ifdef HAVE_QT5 - app = new QApplication (argc, argv, QApplication::Tty); +#ifdef HAVE_NEMO + setenv("QT_QPA_PLATFORM", "minimal", 1); +#endif /* HAVE_NEMO */ + + app = new QGuiApplication (argc, argv); +#else /* HAVE_QT4 (we fallback to Qt4) */ + app = new QApplication (argc, argv, QApplication::Tty); +#endif /* HAVE_QT5 */ } void @@ -60,10 +85,7 @@ media_art_file_to_jpeg (const gchar *filename, const gchar *target) { - TrackerConfig *config = tracker_main_get_config (); - gint max_media_art_width = tracker_config_get_max_media_art_width (config); - - if (max_media_art_width < 0) { + if (max_width_in_bytes < 0) { g_debug ("Not saving album art from file, disabled in config"); return TRUE; } @@ -107,21 +129,18 @@ } gboolean -tracker_media_art_buffer_to_jpeg (const unsigned char *buffer, - size_t len, - const gchar *buffer_mime, - const gchar *target) +media_art_buffer_to_jpeg (const unsigned char *buffer, + size_t len, + const gchar *buffer_mime, + const gchar *target) { - TrackerConfig *config = tracker_main_get_config (); - gint max_media_art_width = tracker_config_get_max_media_art_width (config); - - if (max_media_art_width < 0) { + if (max_width_in_bytes < 0) { g_debug ("Not saving album art from buffer, disabled in config"); return TRUE; } /* FF D8 FF are the three first bytes of JPeg images */ - if (max_media_art_width == 0 && + if (max_width_in_bytes == 0 && (g_strcmp0 (buffer_mime, "image/jpeg") == 0 || g_strcmp0 (buffer_mime, "JPG") == 0) && (buffer && len > 2 && buffer[0] == 0xff && buffer[1] == 0xd8 && buffer[2] == 0xff)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmediaart-0.1.0/libmediaart/mediaart.h new/libmediaart-0.2.0/libmediaart/mediaart.h --- old/libmediaart-0.1.0/libmediaart/mediaart.h 2013-10-11 17:54:27.000000000 +0200 +++ new/libmediaart-0.2.0/libmediaart/mediaart.h 2014-02-06 17:31:03.000000000 +0100 @@ -20,12 +20,12 @@ #ifndef __LIBMEDIAART_H__ #define __LIBMEDIAART_H__ -#define __LIBMEDIAART_H_INSIDE__ +#define __LIBMEDIAART_INSIDE__ #include <libmediaart/extract.h> #include <libmediaart/extractgeneric.h> #include <libmediaart/cache.h> -#undef __LIBMEDIAART_H_INSIDE__ +#undef __LIBMEDIAART_INSIDE__ #endif /* __LIBMEDIAART_H__ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmediaart-0.1.0/libmediaart.pc.in new/libmediaart-0.2.0/libmediaart.pc.in --- old/libmediaart-0.1.0/libmediaart.pc.in 2013-10-11 17:54:27.000000000 +0200 +++ new/libmediaart-0.2.0/libmediaart.pc.in 2014-02-06 17:31:03.000000000 +0100 @@ -9,5 +9,5 @@ Libs: -L${libdir} -lmediaart-@LIBMEDIAART_API_VERSION@ Libs.Private: -lz -lm Cflags: -I${includedir}/libmediaart-@LIBMEDIAART_API_VERSION@ -Requires: glib-2.0 tracker-sparql-0.16 +Requires: glib-2.0 Requires.Private: @LIBMEDIAART_BACKEND@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libmediaart-0.1.0/tests/Makefile.in new/libmediaart-0.2.0/tests/Makefile.in --- old/libmediaart-0.1.0/tests/Makefile.in 2013-11-01 13:19:03.000000000 +0100 +++ new/libmediaart-0.2.0/tests/Makefile.in 2014-02-06 18:51:59.000000000 +0100 @@ -276,8 +276,10 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -QT_CFLAGS = @QT_CFLAGS@ -QT_LIBS = @QT_LIBS@ +QT4_CFLAGS = @QT4_CFLAGS@ +QT4_LIBS = @QT4_LIBS@ +QT5_CFLAGS = @QT5_CFLAGS@ +QT5_LIBS = @QT5_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de