Hello community,
here is the log from the commit of package evas-generic-loaders for
openSUSE:Factory checked in at 2014-02-15 08:03:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/evas-generic-loaders (Old)
and /work/SRC/openSUSE:Factory/.evas-generic-loaders.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "evas-generic-loaders"
Changes:
--------
---
/work/SRC/openSUSE:Factory/evas-generic-loaders/evas-generic-loaders.changes
2013-11-10 14:57:00.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.evas-generic-loaders.new/evas-generic-loaders.changes
2014-02-15 08:03:38.000000000 +0100
@@ -1,0 +2,20 @@
+Mon Dec 9 10:33:36 UTC 2013 - [email protected]
+
+- bump to 1.8.1 - bugfixes, no change logs
+
+-------------------------------------------------------------------
+Mon Dec 2 09:45:46 UTC 2013 - [email protected]
+
+- bump to 1.8.0 release
+ Changes since Evas Generic Loaders 1.7.0:
+ Improvements:
+ * All generic loader binaries have built-in timeouts in case they
+ get stuck.
+ * Libreoffice support for thumbnailing office documents
+
+-------------------------------------------------------------------
+Sat Nov 30 23:32:15 UTC 2013 - [email protected]
+
+- bump to 1.8.0-beta2
+
+-------------------------------------------------------------------
Old:
----
evas_generic_loaders-1.7.9.tar.bz2
New:
----
evas_generic_loaders-1.8.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ evas-generic-loaders.spec ++++++
--- /var/tmp/diff_new_pack.akHm2P/_old 2014-02-15 08:03:39.000000000 +0100
+++ /var/tmp/diff_new_pack.akHm2P/_new 2014-02-15 08:03:39.000000000 +0100
@@ -17,14 +17,14 @@
Name: evas-generic-loaders
-Version: 1.7.9
+Version: 1.8.1
Release: 0
Summary: Set of generic loaders for Evas
License: GPL-2.0+
Group: Development/Libraries/C and C++
Url: http://enlightenment.org/
Source: evas_generic_loaders-%{version}.tar.bz2
-BuildRequires: eina-devel >= %version
+BuildRequires: efl-devel >= %version
BuildRequires: gcc-c++
BuildRequires: gstreamer-0_10-plugins-base-devel
BuildRequires: gstreamer-devel
++++++ evas_generic_loaders-1.7.9.tar.bz2 -> evas_generic_loaders-1.8.1.tar.bz2
++++++
++++ 6299 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/evas_generic_loaders-1.7.9/COPYING new/evas_generic_loaders-1.8.1/COPYING
--- old/evas_generic_loaders-1.7.9/COPYING 2013-07-29 16:48:13.000000000
+0200
+++ new/evas_generic_loaders-1.8.1/COPYING 2013-06-22 06:37:33.000000000
+0200
@@ -8,8 +8,7 @@
This library is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
-details.
+FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
Below is a copy of the GNU General Public License that is distributed
along with this library. If you do not have a copy below, write to the Free
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/evas_generic_loaders-1.7.9/ChangeLog
new/evas_generic_loaders-1.8.1/ChangeLog
--- old/evas_generic_loaders-1.7.9/ChangeLog 2013-09-10 19:19:49.000000000
+0200
+++ new/evas_generic_loaders-1.8.1/ChangeLog 2013-03-04 19:32:36.000000000
+0100
@@ -32,38 +32,7 @@
1.7.0 release
-2012-10-20 Cedric Bail
+2012-09-26 Carsten Haitzler (The Rasterman)
- 1.7.1 release
-
-2012-11-23 Luis Felipe Strano Moraes
-
- 1.7.2 release
-
-2012-12-07 Luis Felipe Strano Moraes
-
- * 1.7.3 release
-
-2012-12-21 Luis Felipe Strano Moraes
-
- * 1.7.4 release
-
-2013-01-04 Luis Felipe Strano Moraes
-
- * 1.7.5 release
-
-2013-04-04 Rafael Antognolli
-
- * 1.7.6 release
-
-2013-05-11 Rafael Antognolli
-
- * 1.7.7 release
-
-2013-08-02 Eduardo Lima (Etrunko)
-
- * 1.7.8 release
-
-2013-09-10 Eduardo Lima (Etrunko)
-
- * 1.7.9 release
+ * Add various alarm/signal based timeouts for all generic
+ loaders in case they get stuck
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/evas_generic_loaders-1.7.9/INSTALL new/evas_generic_loaders-1.8.1/INSTALL
--- old/evas_generic_loaders-1.7.9/INSTALL 2013-07-29 16:38:05.000000000
+0200
+++ new/evas_generic_loaders-1.8.1/INSTALL 2013-03-04 20:01:09.000000000
+0100
@@ -1,7 +1,7 @@
Installation Instructions
*************************
-Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
Inc.
Copying and distribution of this file, with or without modification,
@@ -309,10 +309,9 @@
overridden in the site shell script).
Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf limitation. Until the limitation is lifted, you can use
-this workaround:
+an Autoconf bug. Until the bug is fixed you can use this workaround:
- CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
`configure' Invocation
======================
@@ -368,3 +367,4 @@
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.
+
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/evas_generic_loaders-1.7.9/NEWS new/evas_generic_loaders-1.8.1/NEWS
--- old/evas_generic_loaders-1.7.9/NEWS 2013-09-10 20:27:33.000000000 +0200
+++ new/evas_generic_loaders-1.8.1/NEWS 2013-12-08 20:46:48.000000000 +0100
@@ -1,68 +1,20 @@
-Evas Generic Loaders 1.7.9
+Evas Generic Loaders 1.8.1
-Changes since Evas Generic Loaders 1.7.8:
----------------------------
-
-No changes, just updating to keep in sync with lastest release.
-
-
-Evas Generic Loaders 1.7.8
-
-Changes since Evas Generic Loaders 1.7.7:
----------------------------
-
-No changes, just updating to keep in sync with lastest release.
-
-
-Evas Generic Loaders 1.7.7
-
-Changes since Evas Generic Loaders 1.7.6:
------------------------------------------
-
-No changes, just updating to keep in sync with last release.
-
-
-Evas Generic Loaders 1.7.6
-
-Changes since Evas Generic Loaders 1.7.5:
------------------------------------------
-
-No changes, just updating to keep in sync with last release.
-
-
-Evas Generic Loaders 1.7.5
-
-Changes since Evas Generic Loaders 1.7.4:
+Changes since Evas Generic Loaders 1.8.0:
-----------------------------------------
-No changes, just updating to keep in sync with last release.
-
-
-Evas Generic Loaders 1.7.4
+Fixes:
+ * Bugfix: add a typefind to gstreamer plugin pipeline
+ * Bugfix: unbreak gstreamer plugin
-Changes since Evas Generic Loaders 1.7.3:
+Changes since Evas Generic Loaders 1.7.0:
-----------------------------------------
-No changes, just updating to keep in sync with last release.
-
-
-Evas Generic Loaders 1.7.3
-
-Changes since Evas Generic Loaders 1.7.2:
------------------------------------------
-
-No changes, just updating to keep in sync with last release.
-
-
-Evas Generic Loaders 1.7.2
-
-Changes since Evas Generic Loaders 1.7.1:
------------------------------------------
-
-No changes, just updating to keep in sync with last release.
-
+Improvements:
-Evas Generic Loaders 1.7.1
+ * All generic loader binaries have built-in timeouts in case they
+ get stuck.
+ * Libreoffice support for thumbnailing office documents
Changes since Evas Generic Loaders 1.2.0:
-----------------------------------------
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/evas_generic_loaders-1.7.9/README new/evas_generic_loaders-1.8.1/README
--- old/evas_generic_loaders-1.7.9/README 2013-10-31 23:52:47.000000000
+0100
+++ new/evas_generic_loaders-1.8.1/README 2013-12-08 20:47:43.000000000
+0100
@@ -1,27 +1,10 @@
-Evas generic loaders 1.7.4
+Evas generic loaders 1.8.0
+==========================
******************************************************************************
-
FOR ANY ISSUES PLEASE EMAIL:
[email protected]
-
******************************************************************************
-
-Requirements:
--------------
-
-Must:
- libc
- libm
- zlib
-
-Recommended:
- gstreamer
- poppler
- libraw
- libspectre
- librsvg
-
These are additional "generic" loaders for Evas that are stand-alone
executables that evas may run from its generic loader module. This
@@ -31,44 +14,72 @@
completely generic execution system that allows anything to be plugged
in as a loader.
+
+REQUIREMENTS
+------------
+
+Required by default:
+
+ * libc
+ * libm
+ * zlib
+
+Highly recommended:
+
+ * gstreamer (0.10) (ensure you have all the gstreamer codecs you need/want)
+ * poppler
+ * libraw
+ * libspectre
+ * librsvg
+
+Sugested:
+
+ * libreoffice
+
+
+COMPONENTS
+----------
+
Generic loaders currently provided:
- XCF (.xcf .xcf.gz)
+ * **XCF** (.xcf .xcf.gz)
+
+ * **PDF** (using poppler)
+ * use -key option to specific what page to get and load options for size
+ Should we add mupdf ?
- PDF (using poppler)
- use -key option to specific what page to get and load options for size
- Should we add mupdf ?
+ * **PS** (using libspectre)
+ * use -key option to specific what page to get and load options for size
+ Should we use directly libgs ?
- PS (using libspectre)
- use -key option to specific what page to get and load options for size
- Should we use directly libgs ?
+ * **RAW** (using libraw)
+
+ * **SVG** (using librsvg)
- RAW (using libraw)
+ * **MPG/AVI/OGV/MOV/MKV/WMV** etc. (using gstreamer)
+ * Should we add libxine and vlc ?
- SVG (using librsvg)
+ * **PPT/PPTX/DOC/DOCX/XLS** etc.
+ * Required PDF loader, and uses libreoffice binaries as slaves to
+ export PDFs to load
+
- MPG/AVI/OGV/MOV/MKV/WMV etc. (using Gstreamer)
- Should we add libxine and vlc ?
+COMPILING AND INSTALLING
+------------------------
-Possible fun ones in future:
+ ./configure
+ make
+ sudo make install
- DVI (using DVIlib, see edvi)
- DJVU (using libdjvu)
+COMPILER FLAGS
+--------------
- PPT/PPTX/DOC/DOCX/XLS...
- (beats me how u can render a page from these without a whole
- office impl - but worth a try? libopenoffice/libllibreoffice if
- it ever happens?)
+You may want to change the install prefix for EFL with:
-------------------------------------------------------------------------------
-COMPILING AND INSTALLING:
+ --prefix=/path/to/prefix
- ./configure
- make
-(as root unless you are installing in your users directories):
- make install
+**NOTE:**
-NOTE:
- you should put generic loaders in the same prefix as Evas or they
-will not be found.
+You should put generic loaders in the same prefix as EFL or they will
+not be found by EFL at runtime.
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/evas_generic_loaders-1.7.9/compile new/evas_generic_loaders-1.8.1/compile
--- old/evas_generic_loaders-1.7.9/compile 2013-07-29 16:38:05.000000000
+0200
+++ new/evas_generic_loaders-1.8.1/compile 2013-03-04 20:01:09.000000000
+0100
@@ -1,9 +1,10 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2012-03-05.13; # UTC
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
+# Software Foundation, Inc.
# Written by Tom Tromey <[email protected]>.
#
# This program is free software; you can redistribute it and/or modify
@@ -112,11 +113,6 @@
lib=$dir/$lib.lib
break
fi
- if test -f "$dir/lib$lib.a"; then
- found=yes
- lib=$dir/lib$lib.a
- break
- fi
done
IFS=$save_IFS
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/evas_generic_loaders-1.7.9/config.h.in
new/evas_generic_loaders-1.8.1/config.h.in
--- old/evas_generic_loaders-1.7.9/config.h.in 2013-10-31 23:52:52.000000000
+0100
+++ new/evas_generic_loaders-1.8.1/config.h.in 2013-12-08 20:47:46.000000000
+0100
@@ -3,6 +3,9 @@
/* Define if building universal (internal helper macro) */
#undef AC_APPLE_UNIVERSAL_BUILD
+/* Define to 1 if you have the <GlobalParams.h> header file. */
+#undef HAVE_GLOBALPARAMS_H
+
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
@@ -30,6 +33,9 @@
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
+/* Have librsvg >= 2.36 */
+#undef HAVE_SVG_2_36
+
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
@@ -42,9 +48,6 @@
/* Define to 1 if your compiler has __attribute__ */
#undef HAVE___ATTRIBUTE__
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
/* Name of package */
#undef PACKAGE
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/evas_generic_loaders-1.7.9/configure.ac
new/evas_generic_loaders-1.8.1/configure.ac
--- old/evas_generic_loaders-1.7.9/configure.ac 2013-09-10 19:09:48.000000000
+0200
+++ new/evas_generic_loaders-1.8.1/configure.ac 2013-12-08 20:37:35.000000000
+0100
@@ -1,14 +1,13 @@
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
m4_define([v_maj], [1])
-m4_define([v_min], [7])
-m4_define([v_mic], [9])
-m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v
export || 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_min], [8])
+m4_define([v_mic], [1])
+dnl m4_define([v_rev], m4_esyscmd([(git rev-list --count HEAD 2>/dev/null ||
echo 0) | tr -d '\n']))
##-- When released, remove the dnl on the below line
-m4_undefine([v_rev])
+dnl m4_undefine([v_rev])
##-- When doing snapshots - change soname. remove dnl on below line
-dnl m4_define([relname], [ver-pre-svn-05])
+m4_define([relname], [dev])
dnl m4_define([v_rel], [-release relname])
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
m4_ifdef([v_rev], [m4_define([v_ver], [v_maj.v_min.v_mic.v_rev])],
[m4_define([v_ver], [v_maj.v_min.v_mic])])
@@ -58,7 +57,7 @@
### Checks for libraries
# Eina library
-PKG_CHECK_MODULES(EINA, [eina >= 1.7.9])
+PKG_CHECK_MODULES(EINA, [eina >= 1.6.99])
AC_ARG_ENABLE([poppler],
[AC_HELP_STRING([--disable-poppler], [disable poppler support
@<:@default==enabled@:>@])],
@@ -88,6 +87,20 @@
[have_poppler="yes"],
[have_poppler="no"])
fi
+
+ if test "x${have_poppler}" = "xyes" ; then
+ AC_LANG(C++)
+ save_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="${CPPFLAGS} ${POPPLER_CFLAGS}"
+ save_CXXFLAGS=$CXXFLAGS
+ CXXFLAGS="${CXXFLAGS} ${POPPLER_CFLAGS}"
+ AC_CHECK_HEADERS([GlobalParams.h],
+ [have_poppler="yes"],
+ [have_poppler="no"])
+ CXXFLAGS=$save_CXXFLAGS
+ CPPFLAGS=$save_CPPFLAGS
+ AC_LANG(C)
+ fi
else
have_poppler="no"
fi
@@ -121,8 +134,16 @@
[want_svg="yes"]
)
+have_svg_2_36="no"
if test "x$want_svg" = "xyes" ; then
PKG_CHECK_MODULES([SVG], [librsvg-2.0 >= 2.14.0 cairo >= 1.0.0],
[have_svg="yes"], [have_svg="no"])
+ PKG_CHECK_MODULES(
+ [SVG_2_36], [librsvg-2.0 >= 2.36.0 cairo >= 1.0.0],
+ [
+ have_svg_2_36="yes"
+ AC_DEFINE(HAVE_SVG_2_36, 1, [Have librsvg >= 2.36])
+ ],
+ [have_svg_2_36="no"])
else
have_svg=no
fi
@@ -204,6 +225,7 @@
src/bin/raw/Makefile
src/bin/xcf/Makefile
src/bin/svg/Makefile
+pkgbuild/PKGBUILD
])
AC_OUTPUT
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/evas_generic_loaders-1.7.9/missing new/evas_generic_loaders-1.8.1/missing
--- old/evas_generic_loaders-1.7.9/missing 2013-07-29 16:38:05.000000000
+0200
+++ new/evas_generic_loaders-1.8.1/missing 2013-03-04 20:01:09.000000000
+0100
@@ -1,10 +1,11 @@
#! /bin/sh
-# Common wrapper for a few potentially missing GNU programs.
+# Common stub for a few missing GNU programs while installing.
-scriptversion=2012-06-26.16; # UTC
+scriptversion=2012-01-06.13; # UTC
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
-# Originally written by Fran,cois Pinard <[email protected]>, 1996.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+# Originally by Fran,cois Pinard <[email protected]>, 1996.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -25,40 +26,68 @@
# the same distribution terms that you use for the rest of that program.
if test $# -eq 0; then
- echo 1>&2 "Try '$0 --help' for more information"
+ echo 1>&2 "Try \`$0 --help' for more information"
exit 1
fi
-case $1 in
+run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
+
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+ configure_ac=configure.ac
+else
+ configure_ac=configure.in
+fi
- --is-lightweight)
- # Used by our autoconf macros to check whether the available missing
- # script is modern enough.
- exit 0
- ;;
+msg="missing on your system"
- --run)
- # Back-compat with the calling convention used by older automake.
- shift
- ;;
+case $1 in
+--run)
+ # Try to run requested program, and just exit if it succeeds.
+ run=
+ shift
+ "$@" && exit 0
+ # Exit code 63 means version mismatch. This often happens
+ # when the user try to use an ancient version of a tool on
+ # a file that requires a minimum version. In this case we
+ # we should proceed has if the program had been absent, or
+ # if --run hadn't been passed.
+ if test $? = 63; then
+ run=:
+ msg="probably too old"
+ fi
+ ;;
-h|--h|--he|--hel|--help)
echo "\
$0 [OPTION]... PROGRAM [ARGUMENT]...
-Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
-to PROGRAM being missing or too old.
+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+error status if there is no known handling for PROGRAM.
Options:
-h, --help display this help and exit
-v, --version output version information and exit
+ --run try to run the given command, and emulate it if it fails
Supported PROGRAM values:
- aclocal autoconf autoheader autom4te automake makeinfo
- bison yacc flex lex help2man
+ aclocal touch file \`aclocal.m4'
+ autoconf touch file \`configure'
+ autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
+ automake touch all \`Makefile.in' files
+ bison create \`y.tab.[ch]', if possible, from existing .[ch]
+ flex create \`lex.yy.c', if possible, from existing .c
+ help2man touch the output file
+ lex create \`lex.yy.c', if possible, from existing .c
+ makeinfo touch the output file
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
-Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
-'g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
Send bug reports to <[email protected]>."
exit $?
@@ -70,141 +99,228 @@
;;
-*)
- echo 1>&2 "$0: unknown '$1' option"
- echo 1>&2 "Try '$0 --help' for more information"
+ echo 1>&2 "$0: Unknown \`$1' option"
+ echo 1>&2 "Try \`$0 --help' for more information"
exit 1
;;
esac
-# Run the given program, remember its exit status.
-"$@"; st=$?
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
+# Now exit if we have it, but it failed. Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
+case $1 in
+ lex*|yacc*)
+ # Not GNU programs, they don't have --version.
+ ;;
-# If it succeeded, we are done.
-test $st -eq 0 && exit 0
+ *)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ # Could not run --version or --help. This is probably someone
+ # running `$TOOL --version' or `$TOOL --help' to check whether
+ # $TOOL exists and not knowing $TOOL uses missing.
+ exit 1
+ fi
+ ;;
+esac
-# Also exit now if we it failed (or wasn't found), and '--version' was
-# passed; such an option is passed most likely to detect whether the
-# program is present and works.
-case $2 in --version|--help) exit $st;; esac
-
-# Exit code 63 means version mismatch. This often happens when the user
-# tries to use an ancient version of a tool on a file that requires a
-# minimum version.
-if test $st -eq 63; then
- msg="probably too old"
-elif test $st -eq 127; then
- # Program was missing.
- msg="missing on your system"
-else
- # Program was found and executed, but failed. Give up.
- exit $st
-fi
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case $program in
+ aclocal*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`acinclude.m4' or \`${configure_ac}'. You might want
+ to install the \`Automake' and \`Perl' packages. Grab them from
+ any GNU archive site."
+ touch aclocal.m4
+ ;;
+
+ autoconf*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`${configure_ac}'. You might want to install the
+ \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
+ archive site."
+ touch configure
+ ;;
+
+ autoheader*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`acconfig.h' or \`${configure_ac}'. You might want
+ to install the \`Autoconf' and \`GNU m4' packages. Grab them
+ from any GNU archive site."
+ files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p'
${configure_ac}`
+ test -z "$files" && files="config.h"
+ touch_files=
+ for f in $files; do
+ case $f in
+ *:*) touch_files="$touch_files "`echo "$f" |
+ sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+ *) touch_files="$touch_files $f.in";;
+ esac
+ done
+ touch $touch_files
+ ;;
+
+ automake*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
+ You might want to install the \`Automake' and \`Perl' packages.
+ Grab them from any GNU archive site."
+ find . -type f -name Makefile.am -print |
+ sed 's/\.am$/.in/' |
+ while read f; do touch "$f"; done
+ ;;
+
+ autom4te*)
+ echo 1>&2 "\
+WARNING: \`$1' is needed, but is $msg.
+ You might have modified some files without having the
+ proper tools for further handling them.
+ You can get \`$1' as part of \`Autoconf' from any GNU
+ archive site."
+
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+ echo "#! /bin/sh"
+ echo "# Created by GNU Automake missing as a replacement of"
+ echo "# $ $@"
+ echo "exit 0"
+ chmod +x $file
+ exit 1
+ fi
+ ;;
+
+ bison*|yacc*)
+ echo 1>&2 "\
+WARNING: \`$1' $msg. You should only need it if
+ you modified a \`.y' file. You may need the \`Bison' package
+ in order for those modifications to take effect. You can get
+ \`Bison' from any GNU archive site."
+ rm -f y.tab.c y.tab.h
+ if test $# -ne 1; then
+ eval LASTARG=\${$#}
+ case $LASTARG in
+ *.y)
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" y.tab.c
+ fi
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" y.tab.h
+ fi
+ ;;
+ esac
+ fi
+ if test ! -f y.tab.h; then
+ echo >y.tab.h
+ fi
+ if test ! -f y.tab.c; then
+ echo 'main() { return 0; }' >y.tab.c
+ fi
+ ;;
+
+ lex*|flex*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified a \`.l' file. You may need the \`Flex' package
+ in order for those modifications to take effect. You can get
+ \`Flex' from any GNU archive site."
+ rm -f lex.yy.c
+ if test $# -ne 1; then
+ eval LASTARG=\${$#}
+ case $LASTARG in
+ *.l)
+ SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" lex.yy.c
+ fi
+ ;;
+ esac
+ fi
+ if test ! -f lex.yy.c; then
+ echo 'main() { return 0; }' >lex.yy.c
+ fi
+ ;;
+
+ help2man*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified a dependency of a manual page. You may need the
+ \`Help2man' package in order for those modifications to take
+ effect. You can get \`Help2man' from any GNU archive site."
+
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+ echo ".ab help2man is required to generate this page"
+ exit $?
+ fi
+ ;;
+
+ makeinfo*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified a \`.texi' or \`.texinfo' file, or any other file
+ indirectly affecting the aspect of the manual. The spurious
+ call might also be the consequence of using a buggy \`make' (AIX,
+ DU, IRIX). You might want to install the \`Texinfo' package or
+ the \`GNU make' package. Grab either from any GNU archive site."
+ # The file to touch is that specified with -o ...
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -z "$file"; then
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+ fi
+ # If the file does not exist, the user really needs makeinfo;
+ # let's fail without touching anything.
+ test -f $file || exit 1
+ touch $file
+ ;;
+
+ *)
+ echo 1>&2 "\
+WARNING: \`$1' is needed, and is $msg.
+ You might have modified some files without having the
+ proper tools for further handling them. Check the \`README' file,
+ it often tells you about the needed prerequisites for installing
+ this package. You may also peek at any GNU archive site, in case
+ some other package would contain this missing \`$1' program."
+ exit 1
+ ;;
+esac
-perl_URL=http://www.perl.org/
-flex_URL=http://flex.sourceforge.net/
-gnu_software_URL=http://www.gnu.org/software
-
-program_details ()
-{
- case $1 in
- aclocal|automake)
- echo "The '$1' program is part of the GNU Automake package:"
- echo "<$gnu_software_URL/automake>"
- echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
- echo "<$gnu_software_URL/autoconf>"
- echo "<$gnu_software_URL/m4/>"
- echo "<$perl_URL>"
- ;;
- autoconf|autom4te|autoheader)
- echo "The '$1' program is part of the GNU Autoconf package:"
- echo "<$gnu_software_URL/autoconf/>"
- echo "It also requires GNU m4 and Perl in order to run:"
- echo "<$gnu_software_URL/m4/>"
- echo "<$perl_URL>"
- ;;
- esac
-}
-
-give_advice ()
-{
- # Normalize program name to check for.
- normalized_program=`echo "$1" | sed '
- s/^gnu-//; t
- s/^gnu//; t
- s/^g//; t'`
-
- printf '%s\n' "'$1' is $msg."
-
- configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
- case $normalized_program in
- autoconf*)
- echo "You should only need it if you modified 'configure.ac',"
- echo "or m4 files included by it."
- program_details 'autoconf'
- ;;
- autoheader*)
- echo "You should only need it if you modified 'acconfig.h' or"
- echo "$configure_deps."
- program_details 'autoheader'
- ;;
- automake*)
- echo "You should only need it if you modified 'Makefile.am' or"
- echo "$configure_deps."
- program_details 'automake'
- ;;
- aclocal*)
- echo "You should only need it if you modified 'acinclude.m4' or"
- echo "$configure_deps."
- program_details 'aclocal'
- ;;
- autom4te*)
- echo "You might have modified some maintainer files that require"
- echo "the 'automa4te' program to be rebuilt."
- program_details 'autom4te'
- ;;
- bison*|yacc*)
- echo "You should only need it if you modified a '.y' file."
- echo "You may want to install the GNU Bison package:"
- echo "<$gnu_software_URL/bison/>"
- ;;
- lex*|flex*)
- echo "You should only need it if you modified a '.l' file."
- echo "You may want to install the Fast Lexical Analyzer package:"
- echo "<$flex_URL>"
- ;;
- help2man*)
- echo "You should only need it if you modified a dependency" \
- "of a man page."
- echo "You may want to install the GNU Help2man package:"
- echo "<$gnu_software_URL/help2man/>"
- ;;
- makeinfo*)
- echo "You should only need it if you modified a '.texi' file, or"
- echo "any other file indirectly affecting the aspect of the manual."
- echo "You might want to install the Texinfo package:"
- echo "<$gnu_software_URL/texinfo/>"
- echo "The spurious makeinfo call might also be the consequence of"
- echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
- echo "want to install GNU make:"
- echo "<$gnu_software_URL/make/>"
- ;;
- *)
- echo "You might have modified some files without having the proper"
- echo "tools for further handling them. Check the 'README' file, it"
- echo "often tells you about the needed prerequisites for installing"
- echo "this package. You may also peek at any GNU archive site, in"
- echo "case some other package contains this missing '$1' program."
- ;;
- esac
-}
-
-give_advice "$1" | sed -e '1s/^/WARNING: /' \
- -e '2,$s/^/ /' >&2
-
-# Propagate the correct exit status (expected to be 127 for a program
-# not found, 63 for a program that failed due to version mismatch).
-exit $st
+exit 0
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
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/evas_generic_loaders-1.7.9/pkgbuild/PKGBUILD.in
new/evas_generic_loaders-1.8.1/pkgbuild/PKGBUILD.in
--- old/evas_generic_loaders-1.7.9/pkgbuild/PKGBUILD.in 1970-01-01
01:00:00.000000000 +0100
+++ new/evas_generic_loaders-1.8.1/pkgbuild/PKGBUILD.in 2013-06-22
06:37:33.000000000 +0200
@@ -0,0 +1,36 @@
+# Maintainer: Enlightenment Developers <[email protected]>
+pkgname=evas_generic_loaders
+pkgver=@VERSION@
+pkgrel=1
+pkgdesc="Evas external binary executable loaders - GIT development snapshot"
+arch=('i686' 'x86_64' 'arm')
+url="http://www.enlightenment.org";
+license=('GPL2')
+depends=('efl' 'poppler' 'libraw' 'libspectre' 'librsvg'
'gstreamer0.10-base-plugins'
+ 'gstreamer0.10-good-plugins' 'gstreamer0.10-bad-plugins'
+ 'gstreamer0.10-ugly-plugins' 'gstreamer0.10-ffmpeg')
+options=('!libtool' 'debug')
+build() {
+ cd "../.."
+ export CFLAGS="$CFLAGS -fvisibility=hidden -fomit-frame-pointer"
+ make clean distclean
+ ./configure --prefix=/usr
+ make
+}
+
+#check() {
+# cd "../.."
+# make -k check
+#}
+
+package() {
+ cd "../.."
+ make -j1 DESTDIR="$pkgdir/" install
+ install -Dm644 README "$pkgdir/usr/share/$pkgname/README"
+ install -Dm644 NEWS "$pkgdir/usr/share/$pkgname/NEWS"
+ install -Dm644 ChangeLog "$pkgdir/usr/share/$pkgname/ChangeLog"
+ install -Dm644 AUTHORS "$pkgdir/usr/share/$pkgname/AUTHORS"
+ install -d "$pkgdir/usr/share/licenses/$pkgname"
+ sed -n '1,/PARTICULAR PURPOSE/p' COPYING >
"$pkgdir/usr/share/licenses/$pkgname/COPYING"
+ ln -s "../licenses/$pkgname/COPYING" "$pkgdir/usr/share/$pkgname/COPYING"
+}
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/evas_generic_loaders-1.7.9/src/bin/common/Makefile.am
new/evas_generic_loaders-1.8.1/src/bin/common/Makefile.am
--- old/evas_generic_loaders-1.7.9/src/bin/common/Makefile.am 2013-07-29
16:48:13.000000000 +0200
+++ new/evas_generic_loaders-1.8.1/src/bin/common/Makefile.am 2013-03-04
19:32:36.000000000 +0100
@@ -1,3 +1,3 @@
MAINTAINERCLEANFILES = Makefile.in
-EXTRA_DIST = shmfile.c shmfile.h
+EXTRA_DIST = shmfile.c shmfile.h timeout.c timeout.h
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/evas_generic_loaders-1.7.9/src/bin/common/timeout.c
new/evas_generic_loaders-1.8.1/src/bin/common/timeout.c
--- old/evas_generic_loaders-1.7.9/src/bin/common/timeout.c 1970-01-01
01:00:00.000000000 +0100
+++ new/evas_generic_loaders-1.8.1/src/bin/common/timeout.c 2013-03-04
19:32:36.000000000 +0100
@@ -0,0 +1,16 @@
+#include <unistd.h>
+#include <signal.h>
+
+static void
+_timeout(int val)
+{
+ _exit(-1);
+ if (val) return;
+}
+
+void
+timeout_init(int seconds)
+{
+ signal(SIGALRM, _timeout);
+ alarm(seconds);
+}
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/evas_generic_loaders-1.7.9/src/bin/common/timeout.h
new/evas_generic_loaders-1.8.1/src/bin/common/timeout.h
--- old/evas_generic_loaders-1.7.9/src/bin/common/timeout.h 1970-01-01
01:00:00.000000000 +0100
+++ new/evas_generic_loaders-1.8.1/src/bin/common/timeout.h 2013-03-04
19:32:36.000000000 +0100
@@ -0,0 +1,14 @@
+#ifndef TIMEOUT_H
+#define TIMEOUT_H 1
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void timeout_init(int seconds);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
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/evas_generic_loaders-1.7.9/src/bin/gst/Makefile.am
new/evas_generic_loaders-1.8.1/src/bin/gst/Makefile.am
--- old/evas_generic_loaders-1.7.9/src/bin/gst/Makefile.am 2013-07-29
16:48:13.000000000 +0200
+++ new/evas_generic_loaders-1.8.1/src/bin/gst/Makefile.am 2013-03-04
19:32:36.000000000 +0100
@@ -17,7 +17,8 @@
evas_image_loader_gst_SOURCES = \
main.c \
-$(top_srcdir)/src/bin/common/shmfile.c
+$(top_srcdir)/src/bin/common/shmfile.c \
+$(top_srcdir)/src/bin/common/timeout.c
evas_image_loader_gst_CFLAGS =
evas_image_loader_gst_LDADD = @GSTREAMER_LIBS@ @EINA_LIBS@ @SHM_OPEN_LIBS@
evas_image_loader_gst_LDFLAGS =
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/evas_generic_loaders-1.7.9/src/bin/gst/main.c
new/evas_generic_loaders-1.8.1/src/bin/gst/main.c
--- old/evas_generic_loaders-1.7.9/src/bin/gst/main.c 2013-07-29
16:48:13.000000000 +0200
+++ new/evas_generic_loaders-1.8.1/src/bin/gst/main.c 2013-12-08
20:46:40.000000000 +0100
@@ -5,17 +5,17 @@
#include <sys/mman.h>
#include <fcntl.h>
#include <unistd.h>
-#include <signal.h>
#include <gst/gst.h>
#include <Eina.h>
#include "shmfile.h"
+#include "timeout.h"
#define DATA32 unsigned int
-#define GST_DBG
+//#define GST_DBG
#ifdef GST_DBG
#define D(fmt, args...) fprintf(stderr, fmt, ## args)
@@ -23,8 +23,6 @@
#define D(fmt, args...)
#endif
-#define TIMEOUT 5
-
#define CAPS
"video/x-raw-rgb,bpp=(int)32,depth=(int)32,endianness=(int)4321,red_mask=(int)0x0000ff00,
green_mask=(int)0x00ff0000, blue_mask=(int)0xff000000"
static GstElement *pipeline = NULL;
@@ -47,6 +45,7 @@
GError *error = NULL;
GstFormat format;
GstStateChangeReturn ret;
+ int vidstr = 0;
if (!filename || !*filename)
return EINA_FALSE;
@@ -68,7 +67,7 @@
D("Setting file %s\n", uri);
- descr = g_strdup_printf("uridecodebin uri=%s ! ffmpegcolorspace ! "
+ descr = g_strdup_printf("uridecodebin uri=%s ! typefind ! ffmpegcolorspace
! "
" appsink name=sink caps=\"" CAPS "\"", uri);
pipeline = gst_parse_launch(descr, &error);
free(uri);
@@ -79,7 +78,16 @@
g_error_free (error);
goto gst_shutdown;
}
-
+/* needs gst 1.0+
+ g_object_get(G_OBJECT(pipeline),
+ "n-video", &vidstr,
+ NULL);
+ if (vidstr <= 0)
+ {
+ D("no video stream\n");
+ goto gst_shutdown;
+ }
+*/
sink = gst_bin_get_by_name (GST_BIN (pipeline), "sink");
ret = gst_element_set_state (pipeline, GST_STATE_PAUSED);
@@ -155,7 +163,7 @@
}
static void
-_gst_load_image(int size_w, int size_h)
+_gst_load_image(int size_w EINA_UNUSED, int size_h EINA_UNUSED)
{
GstBuffer *buffer;
@@ -172,13 +180,6 @@
memcpy(data, GST_BUFFER_DATA(buffer), GST_BUFFER_SIZE(buffer));
}
-static void
-timeout(int val)
-{
- // error - timeout :(
- exit(-7);
-}
-
int
main(int argc, char **argv)
{
@@ -220,9 +221,7 @@
}
}
- // timeout: if we can't manage to get this done in TIMEOUT seconds, give up.
- signal(SIGALRM, timeout);
- alarm(TIMEOUT);
+ timeout_init(10);
D("_gst_init_file\n");
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/evas_generic_loaders-1.7.9/src/bin/pdf/Makefile.am
new/evas_generic_loaders-1.8.1/src/bin/pdf/Makefile.am
--- old/evas_generic_loaders-1.7.9/src/bin/pdf/Makefile.am 2013-07-29
16:48:13.000000000 +0200
+++ new/evas_generic_loaders-1.8.1/src/bin/pdf/Makefile.am 2013-12-06
12:27:03.000000000 +0100
@@ -12,12 +12,38 @@
@EINA_CFLAGS@ \
@POPPLER_CFLAGS@
+EXTRA_DIST = evas_generic_pdf_loader.libreoffice
+
+bin_SCRIPTS = evas_generic_pdf_loader.libreoffice
bin_PROGRAMS = evas_image_loader.pdf
bindir = $(libdir)/evas/utils
evas_image_loader_pdf_SOURCES = \
main.cpp \
-$(top_srcdir)/src/bin/common/shmfile.c
+$(top_srcdir)/src/bin/common/shmfile.c \
+$(top_srcdir)/src/bin/common/timeout.c
evas_image_loader_pdf_CFLAGS =
evas_image_loader_pdf_LDADD = @POPPLER_LIBS@ @EINA_LIBS@ @SHM_OPEN_LIBS@
evas_image_loader_pdf_LDFLAGS =
+
+install-exec-hook:
+ ln -sf evas_image_loader.pdf
$(DESTDIR)$(libdir)/evas/utils/evas_image_loader.ppt
+ ln -sf evas_image_loader.pdf
$(DESTDIR)$(libdir)/evas/utils/evas_image_loader.pptx
+ ln -sf evas_image_loader.pdf
$(DESTDIR)$(libdir)/evas/utils/evas_image_loader.odp
+ ln -sf evas_image_loader.pdf
$(DESTDIR)$(libdir)/evas/utils/evas_image_loader.xls
+ ln -sf evas_image_loader.pdf
$(DESTDIR)$(libdir)/evas/utils/evas_image_loader.xlsx
+ ln -sf evas_image_loader.pdf
$(DESTDIR)$(libdir)/evas/utils/evas_image_loader.ods
+ ln -sf evas_image_loader.pdf
$(DESTDIR)$(libdir)/evas/utils/evas_image_loader.doc
+ ln -sf evas_image_loader.pdf
$(DESTDIR)$(libdir)/evas/utils/evas_image_loader.docx
+ ln -sf evas_image_loader.pdf
$(DESTDIR)$(libdir)/evas/utils/evas_image_loader.odt
+ ln -sf evas_image_loader.pdf
$(DESTDIR)$(libdir)/evas/utils/evas_image_loader.rtf
+ ln -sf evas_generic_pdf_loader.libreoffice
$(DESTDIR)$(libdir)/evas/utils/evas_generic_pdf_loader.ppt
+ ln -sf evas_generic_pdf_loader.libreoffice
$(DESTDIR)$(libdir)/evas/utils/evas_generic_pdf_loader.pptx
+ ln -sf evas_generic_pdf_loader.libreoffice
$(DESTDIR)$(libdir)/evas/utils/evas_generic_pdf_loader.odp
+ ln -sf evas_generic_pdf_loader.libreoffice
$(DESTDIR)$(libdir)/evas/utils/evas_generic_pdf_loader.xls
+ ln -sf evas_generic_pdf_loader.libreoffice
$(DESTDIR)$(libdir)/evas/utils/evas_generic_pdf_loader.xlsx
+ ln -sf evas_generic_pdf_loader.libreoffice
$(DESTDIR)$(libdir)/evas/utils/evas_generic_pdf_loader.ods
+ ln -sf evas_generic_pdf_loader.libreoffice
$(DESTDIR)$(libdir)/evas/utils/evas_generic_pdf_loader.doc
+ ln -sf evas_generic_pdf_loader.libreoffice
$(DESTDIR)$(libdir)/evas/utils/evas_generic_pdf_loader.docx
+ ln -sf evas_generic_pdf_loader.libreoffice
$(DESTDIR)$(libdir)/evas/utils/evas_generic_pdf_loader.odt
+ ln -sf evas_generic_pdf_loader.libreoffice
$(DESTDIR)$(libdir)/evas/utils/evas_generic_pdf_loader.rtf
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/evas_generic_loaders-1.7.9/src/bin/pdf/evas_generic_pdf_loader.libreoffice
new/evas_generic_loaders-1.8.1/src/bin/pdf/evas_generic_pdf_loader.libreoffice
---
old/evas_generic_loaders-1.7.9/src/bin/pdf/evas_generic_pdf_loader.libreoffice
1970-01-01 01:00:00.000000000 +0100
+++
new/evas_generic_loaders-1.8.1/src/bin/pdf/evas_generic_pdf_loader.libreoffice
2013-12-06 12:27:03.000000000 +0100
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/lib/libreoffice/program/soffice.bin --headless --convert-to pdf --outdir
"$2" "$1"
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/evas_generic_loaders-1.7.9/src/bin/pdf/main.cpp
new/evas_generic_loaders-1.8.1/src/bin/pdf/main.cpp
--- old/evas_generic_loaders-1.7.9/src/bin/pdf/main.cpp 2013-07-29
16:48:13.000000000 +0200
+++ new/evas_generic_loaders-1.8.1/src/bin/pdf/main.cpp 2013-12-06
12:27:03.000000000 +0100
@@ -4,6 +4,9 @@
#include <sys/mman.h>
#include <fcntl.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <libgen.h>
#include <GlobalParams.h>
#include <PDFDoc.h>
@@ -15,6 +18,7 @@
#include <Eina.h>
#include "shmfile.h"
+#include "timeout.h"
#define DATA32 unsigned int
@@ -198,6 +202,10 @@
int
main(int argc, char **argv)
{
+ Eina_Tmpstr *tmpdir = NULL;
+ Eina_Tmpstr *generated = NULL;
+ char *extension;
+ char *dir;
char *file;
int i;
int size_w = 0, size_h = 0;
@@ -238,10 +246,62 @@
}
}
- D("poppler_file_init\n");
D("dpi....: %f\n", dpi);
D("page...: %d\n", page);
+ // This is a funny hack to call an external tool to generate a pdf that
will then be processed by poppler
+ extension = strrchr(file, '.');
+ dir = dirname(argv[0]);
+ if (extension && dir && strcmp(extension, ".pdf"))
+ {
+ if (eina_file_mkdtemp("evas_generic_pdf_loaderXXXXXX", &tmpdir))
+ {
+ Eina_Strbuf *tmp;
+ FILE *cmd;
+
+ tmp = eina_strbuf_new();
+ eina_strbuf_append_printf(tmp, "%s/evas_generic_pdf_loader.%s
'%s' %s", dir, extension + 1, file, tmpdir);
+
+ cmd = popen(eina_strbuf_string_get(tmp), "r");
+ D("running preprocessing process '%s'...\n",
eina_strbuf_string_get(tmp));
+ eina_strbuf_reset(tmp);
+
+ if (cmd)
+ {
+ struct stat st;
+ const char *filename;
+ char buf[1024];
+
+ while (fgets(buf, sizeof (buf), cmd))
+ ;
+ pclose(cmd);
+
+ filename = basename(file);
+ generated = eina_tmpstr_add_length(filename,
strlen(filename) - strlen(extension));
+
+ eina_strbuf_append_printf(tmp, "%s/%s.pdf", tmpdir,
generated);
+
+ eina_tmpstr_del(generated);
+ generated = NULL;
+
+ if (stat(eina_strbuf_string_get(tmp), &st) == 0)
+ {
+ generated =
eina_tmpstr_add_length(eina_strbuf_string_get(tmp),
+
eina_strbuf_length_get(tmp));
+ file = (char*) generated;
+ }
+ }
+
+ D("generated file: '%s'\n", generated);
+ eina_strbuf_free(tmp);
+ }
+ }
+
+ // Let's force a timeout if things go wrong
+ timeout_init(10);
+
+ // Now process the pdf (or the generated pdf)
+ D("poppler_file_init\n");
if (!poppler_init(file, page, size_w, size_h))
return -1;
D("poppler_file_init done\n");
@@ -276,5 +336,14 @@
poppler_shutdown();
+ if (tmpdir)
+ {
+ if (generated) unlink(generated);
+ rmdir(tmpdir);
+
+ eina_tmpstr_del(tmpdir);
+ eina_tmpstr_del(generated);
+ }
+
return 0;
}
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/evas_generic_loaders-1.7.9/src/bin/ps/Makefile.am
new/evas_generic_loaders-1.8.1/src/bin/ps/Makefile.am
--- old/evas_generic_loaders-1.7.9/src/bin/ps/Makefile.am 2013-07-29
16:48:13.000000000 +0200
+++ new/evas_generic_loaders-1.8.1/src/bin/ps/Makefile.am 2013-03-04
19:32:36.000000000 +0100
@@ -17,7 +17,8 @@
evas_image_loader_ps_SOURCES = \
main.c \
-$(top_srcdir)/src/bin/common/shmfile.c
+$(top_srcdir)/src/bin/common/shmfile.c \
+$(top_srcdir)/src/bin/common/timeout.c
evas_image_loader_ps_CFLAGS =
evas_image_loader_ps_LDADD = @SPECTRE_LIBS@ @EINA_LIBS@ @SHM_OPEN_LIBS@
evas_image_loader_ps_LDFLAGS =
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/evas_generic_loaders-1.7.9/src/bin/ps/main.c
new/evas_generic_loaders-1.8.1/src/bin/ps/main.c
--- old/evas_generic_loaders-1.7.9/src/bin/ps/main.c 2013-07-29
16:48:13.000000000 +0200
+++ new/evas_generic_loaders-1.8.1/src/bin/ps/main.c 2013-05-26
00:05:41.000000000 +0200
@@ -10,6 +10,7 @@
#include <Eina.h>
#include "shmfile.h"
+#include "timeout.h"
#define DATA32 unsigned int
@@ -23,7 +24,7 @@
SpectreDocument *psdoc;
-unsigned int page_count;
+int page_count;
SpectrePage *page;
@@ -81,7 +82,7 @@
if (status != SPECTRE_STATUS_SUCCESS)
{
D("[eps] %s\n", spectre_status_to_string (status));
- goto free_psdoc;
+ goto free_page;
}
spectre_page_get_size(page, &ww, &hh);
@@ -162,7 +163,7 @@
}
static void
-_spectre_load_image(int size_w, int size_h)
+_spectre_load_image(int size_w EINA_UNUSED, int size_h EINA_UNUSED)
{
SpectreRenderContext *rc;
unsigned char *psdata;
@@ -249,6 +250,8 @@
D("dpi....: %f\n", dpi);
D("page...: %d\n", page);
+ timeout_init(10);
+
if (!_spectre_init(file, page, size_w, size_h))
return -1;
D("_spectre_init done\n");
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/evas_generic_loaders-1.7.9/src/bin/raw/Makefile.am
new/evas_generic_loaders-1.8.1/src/bin/raw/Makefile.am
--- old/evas_generic_loaders-1.7.9/src/bin/raw/Makefile.am 2013-07-29
16:48:13.000000000 +0200
+++ new/evas_generic_loaders-1.8.1/src/bin/raw/Makefile.am 2013-03-04
19:32:36.000000000 +0100
@@ -14,7 +14,10 @@
bin_PROGRAMS = evas_image_loader.raw
bindir = $(libdir)/evas/utils
-evas_image_loader_raw_SOURCES = main.c $(top_srcdir)/src/bin/common/shmfile.c
+evas_image_loader_raw_SOURCES = \
+main.c \
+$(top_srcdir)/src/bin/common/shmfile.c \
+$(top_srcdir)/src/bin/common/timeout.c
evas_image_loader_raw_CFLAGS = @LIBRAW_CFLAGS@
evas_image_loader_raw_LDADD = @SHM_OPEN_LIBS@ @LIBRAW_LIBS@ -lm
evas_image_loader_raw_LDFLAGS =
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/evas_generic_loaders-1.7.9/src/bin/raw/main.c
new/evas_generic_loaders-1.8.1/src/bin/raw/main.c
--- old/evas_generic_loaders-1.7.9/src/bin/raw/main.c 2013-07-29
16:48:13.000000000 +0200
+++ new/evas_generic_loaders-1.8.1/src/bin/raw/main.c 2013-03-04
19:32:36.000000000 +0100
@@ -9,6 +9,7 @@
#include <unistd.h>
#include <libraw.h>
#include "shmfile.h"
+#include "timeout.h"
#ifdef HAVE_NETINET_IN_H
# include <netinet/in.h>
@@ -205,6 +206,8 @@
}
}
+ timeout_init(4);
+
if (!_raw_init(file)) return -1;
if (head_only != 0)
{
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/evas_generic_loaders-1.7.9/src/bin/svg/Makefile.am
new/evas_generic_loaders-1.8.1/src/bin/svg/Makefile.am
--- old/evas_generic_loaders-1.7.9/src/bin/svg/Makefile.am 2013-07-29
16:48:13.000000000 +0200
+++ new/evas_generic_loaders-1.8.1/src/bin/svg/Makefile.am 2013-03-20
19:18:39.000000000 +0100
@@ -14,8 +14,15 @@
bin_PROGRAMS = evas_image_loader.svg
bindir = $(libdir)/evas/utils
-evas_image_loader_svg_SOURCES = main.c $(top_srcdir)/src/bin/common/shmfile.c
+evas_image_loader_svg_SOURCES = \
+main.c \
+$(top_srcdir)/src/bin/common/shmfile.c \
+$(top_srcdir)/src/bin/common/timeout.c
evas_image_loader_svg_CFLAGS = @SVG_CFLAGS@
evas_image_loader_svg_LDADD = @SVG_LIBS@ @SHM_OPEN_LIBS@ -lm
evas_image_loader_svg_LDFLAGS =
+
+install-exec-hook:
+ ln -sf evas_image_loader.svg
$(DESTDIR)$(libdir)/evas/utils/evas_image_loader.svgz
+ ln -sf evas_image_loader.svg
$(DESTDIR)$(libdir)/evas/utils/evas_image_loader.svg.gz
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/evas_generic_loaders-1.7.9/src/bin/svg/main.c
new/evas_generic_loaders-1.8.1/src/bin/svg/main.c
--- old/evas_generic_loaders-1.7.9/src/bin/svg/main.c 2013-07-29
16:48:13.000000000 +0200
+++ new/evas_generic_loaders-1.8.1/src/bin/svg/main.c 2013-05-26
00:05:41.000000000 +0200
@@ -3,11 +3,18 @@
#endif
#include <stdio.h>
#include "shmfile.h"
+#include "timeout.h"
#include <Eina.h>
#include <librsvg/rsvg.h>
-#include <librsvg/rsvg-cairo.h>
+#ifndef LIBRSVG_CHECK_VERSION
+# include <librsvg/librsvg-features.h>
+#endif
+#if LIBRSVG_CHECK_VERSION(2,36,2)
+#else
+# include <librsvg/rsvg-cairo.h>
+#endif
#define DATA32 unsigned int
@@ -55,7 +62,13 @@
static int
_svg_init(const char *file)
{
+#ifdef HAVE_SVG_2_36
+# if !defined(GLIB_VERSION_2_36)
+ g_type_init();
+# endif
+#else
rsvg_init();
+#endif
if (!evas_image_load_file_is_svg(file)) return 0;
@@ -73,7 +86,9 @@
g_object_unref(rsvg);
}
// Maybe it's not crashing anymore, let's try it.
+#ifndef HAVE_SVG_2_36
rsvg_term();
+#endif
}
static int
@@ -181,6 +196,8 @@
}
}
+ timeout_init(5);
+
if (!_svg_init(file)) return -1;
if (!read_svg_header(scale_down, dpi, size_w, size_h)) return -1;
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/evas_generic_loaders-1.7.9/src/bin/xcf/Makefile.am
new/evas_generic_loaders-1.8.1/src/bin/xcf/Makefile.am
--- old/evas_generic_loaders-1.7.9/src/bin/xcf/Makefile.am 2013-07-29
16:48:13.000000000 +0200
+++ new/evas_generic_loaders-1.8.1/src/bin/xcf/Makefile.am 2013-03-04
19:32:36.000000000 +0100
@@ -16,7 +16,8 @@
evas_image_loader_xcf_SOURCES = \
main.c pixelfuncs.c common.h \
-$(top_srcdir)/src/bin/common/shmfile.c
+$(top_srcdir)/src/bin/common/shmfile.c \
+$(top_srcdir)/src/bin/common/timeout.c
evas_image_loader_xcf_CFLAGS = @EINA_CFLAGS@
evas_image_loader_xcf_LDADD = @EINA_LIBS@ -lz -lm @SHM_OPEN_LIBS@
evas_image_loader_xcf_LDFLAGS =
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/evas_generic_loaders-1.7.9/src/bin/xcf/main.c
new/evas_generic_loaders-1.8.1/src/bin/xcf/main.c
--- old/evas_generic_loaders-1.7.9/src/bin/xcf/main.c 2013-07-29
16:48:13.000000000 +0200
+++ new/evas_generic_loaders-1.8.1/src/bin/xcf/main.c 2013-05-26
00:05:41.000000000 +0200
@@ -47,6 +47,7 @@
*/
#include "common.h"
#include "shmfile.h"
+#include "timeout.h"
#define FREE(X) { free(X); X = NULL; }
@@ -941,7 +942,7 @@
FREE(name);
/* create a new channel */
- layer = new_layer(width, height, GRAY, 255, NORMAL_MODE);
+ layer = new_layer(width, height, GRAY_GIMAGE, 255, NORMAL_MODE);
if (!layer) return NULL;
/* read in the channel properties */
if (!xcf_load_channel_props(layer)) goto error;
@@ -1693,8 +1694,12 @@
// int size_h = atoi(argv[i]);
}
}
+
+ timeout_init(8);
+
D("xcf_file_init\n");
if (!xcf_file_init(file)) return -1;
+
D("size %i %i\n", image->width, image->height);
if (!head_only)
{
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
