Hello community, here is the log from the commit of package eet for openSUSE:Factory checked in at 2013-04-17 23:03:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/eet (Old) and /work/SRC/openSUSE:Factory/.eet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "eet", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/eet/eet.changes 2013-01-10 10:49:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.eet.new/eet.changes 2013-04-17 23:03:22.000000000 +0200 @@ -1,0 +2,22 @@ +Fri Apr 5 22:56:35 UTC 2013 - si...@simotek.net + +- update to 1.7.6 + changelog: +Aharon Hillel (1): + eet: Backport 83010 + +Carsten Haitzler (1): + gnutls cflags fix (just to be nice the dirfd macro fixed too - but it + +Cedric BAIL (1): + eet: backport r82743. + +Rafael Antognolli (3): + Fix ChangeLog for 1.7.6 release. + Bump stable efl to 1.7.6. + Update changelog for 1.7.6 release. + +Tom Hacohen (1): + Fix revision fetching when not using git. + +------------------------------------------------------------------- Old: ---- eet-1.7.5.tar.bz2 New: ---- eet-1.7.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eet.spec ++++++ --- /var/tmp/diff_new_pack.IVgYgb/_old 2013-04-17 23:03:23.000000000 +0200 +++ /var/tmp/diff_new_pack.IVgYgb/_new 2013-04-17 23:03:23.000000000 +0200 @@ -17,7 +17,7 @@ Name: eet -Version: 1.7.5 +Version: 1.7.6 Release: 0 Summary: Data encode/decode and storage library License: BSD-2-Clause ++++++ eet-1.7.5.tar.bz2 -> eet-1.7.6.tar.bz2 ++++++ ++++ 1633 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/eet-1.7.5/ChangeLog new/eet-1.7.6/ChangeLog --- old/eet-1.7.5/ChangeLog 2013-01-04 13:15:17.000000000 +0100 +++ new/eet-1.7.6/ChangeLog 2013-04-04 22:49:46.000000000 +0200 @@ -669,3 +669,19 @@ * 1.7.5 release +2013-01-05 Joel Klinghed + + * eet gcrypt cflags build fix. + +2013-01-14 Albin Tonnerre + + * Fix endianness issue in Eet_Image. + +2013-01-20 Aharon Hillel + + * eet_connection.c Change alloca() to malloc() to support + big-mem-alloc. + +2013-04-04 Rafael Antognolli + + * 1.7.6 release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/eet-1.7.5/NEWS new/eet-1.7.6/NEWS --- old/eet-1.7.5/NEWS 2013-01-04 13:14:35.000000000 +0100 +++ new/eet-1.7.6/NEWS 2013-01-14 19:04:51.000000000 +0100 @@ -1,3 +1,10 @@ +Eet 1.7.6 + +Changes since Eet 1.7.5: +-------------------------- + + * Fix endianess issue in Eet_Image. + Eet 1.7.5 Changes since Eet 1.7.4: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/eet-1.7.5/compile new/eet-1.7.6/compile --- old/eet-1.7.5/compile 2012-12-19 15:48:04.000000000 +0100 +++ new/eet-1.7.6/compile 2013-04-04 22:06:47.000000000 +0200 @@ -1,7 +1,7 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-01-04.17; # UTC +scriptversion=2012-03-05.13; # UTC # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free # Software Foundation, Inc. @@ -79,6 +79,48 @@ esac } +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + # func_cl_wrapper cl arg... # Adjust compile command to suit cl func_cl_wrapper () @@ -109,43 +151,34 @@ ;; esac ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; -I*) func_file_conv "${1#-I}" mingw set x "$@" -I"$file" shift ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; -l*) - lib=${1#-l} - found=no - save_IFS=$IFS - IFS=';' - for dir in $lib_path $LIB - do - IFS=$save_IFS - if $shared && test -f "$dir/$lib.dll.lib"; then - found=yes - set x "$@" "$dir/$lib.dll.lib" - break - fi - if test -f "$dir/$lib.lib"; then - found=yes - set x "$@" "$dir/$lib.lib" - break - fi - done - IFS=$save_IFS - - test "$found" != yes && set x "$@" "$lib.lib" + func_cl_dashl "${1#-l}" + set x "$@" "$lib" shift ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; -L*) - func_file_conv "${1#-L}" - if test -z "$lib_path"; then - lib_path=$file - else - lib_path="$lib_path;$file" - fi - linker_opts="$linker_opts -LIBPATH:$file" + func_cl_dashL "${1#-L}" ;; -static) shared=false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/eet-1.7.5/configure.ac new/eet-1.7.6/configure.ac --- old/eet-1.7.5/configure.ac 2013-01-04 15:05:48.000000000 +0100 +++ new/eet-1.7.6/configure.ac 2013-04-04 21:59:40.000000000 +0200 @@ -2,9 +2,8 @@ ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## m4_define([v_maj], [1]) m4_define([v_min], [7]) -m4_define([v_mic], [5]) -m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n'])) -m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))]) +m4_define([v_mic], [6]) +m4_define([v_rev], m4_esyscmd([(git rev-list --count HEAD 2>/dev/null || echo 0) | tr -d '\n']))dnl ##-- When released, remove the dnl on the below line m4_undefine([v_rev]) ##-- When doing snapshots - change soname. remove dnl on below line @@ -68,6 +67,7 @@ ### Default options with respect to host requirements_pc_eet="" +requirements_cflags_eet="" requirements_libs_eet="" ### Additional options to configure @@ -269,6 +269,7 @@ if test "x${have_gnutls}" = "xyes" ; then AC_PATH_GENERIC([libgcrypt], [], [have_gnutls="yes"], [have_gnutls="no"]) if test "x${have_gnutls}" = "xyes" ; then + requirements_cflags_eet="${LIBGCRYPT_CFLAGS} ${requirements_cflags_eet}" requirements_libs_eet="${LIBGCRYPT_LIBS} ${requirements_libs_eet}" fi fi @@ -405,6 +406,7 @@ ;; esac +EET_CFLAGS="${EET_CFLAGS} ${requirements_cflags_eet}" EET_LIBS="${EET_LIBS} ${requirements_libs_eet}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/eet-1.7.5/doc/Doxyfile new/eet-1.7.6/doc/Doxyfile --- old/eet-1.7.5/doc/Doxyfile 2013-01-04 15:13:21.000000000 +0100 +++ new/eet-1.7.6/doc/Doxyfile 2013-04-05 00:15:38.000000000 +0200 @@ -31,7 +31,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 1.7.5 +PROJECT_NUMBER = 1.7.6 # Using the PROJECT_BRIEF tag one can provide an optional one line description for a project that appears at the top of each page and should give viewer a quick idea about the purpose of the project. Keep the description short. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/eet-1.7.5/eet.spec new/eet-1.7.6/eet.spec --- old/eet-1.7.5/eet.spec 2013-01-04 15:13:21.000000000 +0100 +++ new/eet-1.7.6/eet.spec 2013-04-05 00:15:38.000000000 +0200 @@ -3,7 +3,7 @@ Summary: Library for speedy data storage, retrieval, and compression. Name: eet -Version: 1.7.5 +Version: 1.7.6 Release: %{_rel} License: BSD Group: System Environment/Libraries diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/eet-1.7.5/m4/efl_check_funcs.m4 new/eet-1.7.6/m4/efl_check_funcs.m4 --- old/eet-1.7.5/m4/efl_check_funcs.m4 2012-12-19 15:36:46.000000000 +0100 +++ new/eet-1.7.6/m4/efl_check_funcs.m4 2013-01-09 14:45:44.000000000 +0100 @@ -26,11 +26,8 @@ #endif ]], [[ -int main(void) -{ DIR *dirp; return dirfd(dirp); -} ]]) ], [_efl_have_fct="yes"], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/eet-1.7.5/m4/libtool.m4 new/eet-1.7.6/m4/libtool.m4 --- old/eet-1.7.5/m4/libtool.m4 2012-12-19 15:48:04.000000000 +0100 +++ new/eet-1.7.6/m4/libtool.m4 2013-04-04 22:06:45.000000000 +0200 @@ -2669,10 +2669,14 @@ # before this can be enabled. hardcode_into_libs=yes + # Add ABI-specific directories to the system library path. + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" + # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -2684,18 +2688,6 @@ dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -3301,7 +3293,7 @@ lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -4113,7 +4105,7 @@ ;; esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4590,9 +4582,6 @@ ;; esac ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -4655,9 +4644,6 @@ openbsd*) with_gnu_ld=no ;; - linux* | k*bsd*-gnu | gnu*) - _LT_TAGVAR(link_all_deplibs, $1)=no - ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -4879,7 +4865,7 @@ fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -5056,7 +5042,6 @@ if test "$aix_use_runtimelinking" = yes; then shared_flag="$shared_flag "'${wl}-G' fi - _LT_TAGVAR(link_all_deplibs, $1)=no else # not using gcc if test "$host_cpu" = ia64; then @@ -5361,7 +5346,7 @@ _LT_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/eet-1.7.5/src/lib/eet_cipher.c new/eet-1.7.6/src/lib/eet_cipher.c --- old/eet-1.7.5/src/lib/eet_cipher.c 2012-12-19 15:36:50.000000000 +0100 +++ new/eet-1.7.6/src/lib/eet_cipher.c 2013-01-14 19:04:51.000000000 +0100 @@ -706,9 +706,13 @@ return NULL; /* Get the header */ - magic = ntohl(header[0]); - sign_len = ntohl(header[1]); - cert_len = ntohl(header[2]); + memcpy(&magic, header, sizeof(int)); + memcpy(&sign_len, header+1, sizeof(int)); + memcpy(&cert_len, header+2, sizeof(int)); + + magic = ntohl(magic); + sign_len = ntohl(sign_len); + cert_len = ntohl(cert_len); /* Verify the header */ if (magic != EET_MAGIC_SIGN) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/eet-1.7.5/src/lib/eet_connection.c new/eet-1.7.6/src/lib/eet_connection.c --- old/eet-1.7.5/src/lib/eet_connection.c 2012-12-19 15:36:50.000000000 +0100 +++ new/eet-1.7.6/src/lib/eet_connection.c 2013-02-06 14:26:43.000000000 +0100 @@ -159,13 +159,15 @@ /* Message should always be under MAX_MSG_SIZE */ if (data_size > MAX_MSG_SIZE) return EINA_FALSE; - message = alloca(data_size + (sizeof(int) * 2)); + message = malloc(data_size + (sizeof(int) * 2)); message[0] = htonl(MAGIC_EET_DATA_PACKET); message[1] = htonl(data_size); memcpy(message + 2, data, data_size); conn->eet_write_cb(message, data_size + (sizeof(int) * 2), conn->user_data); + + free(message); return EINA_TRUE; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/eet-1.7.5/src/lib/eet_image.c new/eet-1.7.6/src/lib/eet_image.c --- old/eet-1.7.5/src/lib/eet_image.c 2012-12-19 15:36:50.000000000 +0100 +++ new/eet-1.7.6/src/lib/eet_image.c 2013-01-14 19:04:51.000000000 +0100 @@ -746,13 +746,26 @@ { unsigned char *d, *comp; - int *header, ret, ok = 1; + int *header, *bigend_data, ret, ok = 1; uLongf buflen = 0; buflen = (((w * h * 101) / 100) + 3) * 4; ret = LZ4_compressBound((w * h * 4)); if ((ret > 0) && ((uLongf)ret > buflen)) buflen = ret; - + + if (_eet_image_words_bigendian) + { + int i; + + bigend_data = (int *) malloc(w * h * 4); + if (!bigend_data) return NULL; + + memcpy(bigend_data, data, w * h * 4); + for (i = 0; i < w * h; i++) SWAP32(bigend_data[i]); + + data = (const char *) bigend_data; + } + comp = malloc(buflen); if (!comp) return NULL; @@ -803,6 +816,7 @@ unsigned int i; for (i = 0; i < 8; i++) SWAP32(header[i]); + free(bigend_data); } memcpy(d + (8 * sizeof(int)), comp, buflen); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org