Hello community, here is the log from the commit of package enblend-enfuse for openSUSE:Factory checked in at 2013-01-31 16:26:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/enblend-enfuse (Old) and /work/SRC/openSUSE:Factory/.enblend-enfuse.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "enblend-enfuse", Maintainer is "sbra...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/enblend-enfuse/enblend-enfuse.changes 2012-10-26 17:00:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.enblend-enfuse.new/enblend-enfuse.changes 2013-01-31 16:26:18.000000000 +0100 @@ -1,0 +2,29 @@ +Thu Jan 17 19:18:27 CET 2013 - sbra...@suse.cz + +- Update to version 4.1 (bnc#800803): + * All deprecated options since version 4.0 have been removed. + * New primary seam-line generator. + * Default to perceptual model of the difference image. + * Parallelize CIECAM02 color conversion. + * Enblend and Enfuse integrate seamlessly in color-managed + workflow. + * Require LittleCMS Version 2.x Unbounded CMM feature. + * Option to assign different profiles to profile-free input images. + * New gray-scale projector called "anti-value". + * Enblend and Enfuse stop after saving all generated masks to + files, if option "--save-masks" is given, but option "--output" + is not. + * Enblend and Enfuse can write output JPEG files with arithmetic + JPEG compression and TIFF files with JPEG compression. + * Enblend and Enfuse warn on images that alternate between with + color profile and without. + * Several new Commandline options: "--primary-seam-generator", + "--image-difference", "--ciecam" (for -c) and --no-ciecam", + "--fallback-profile=PROFILE", "--exposure-cutoff", + "--load-masks", "--layer-selector", "--levels=auto". + * Deprecated: "--smooth-difference", user-(re)sizable image-cache. + * External Vigra version 1.8 or later is required. + * Enblend no longer relies on libXMI. +- Verify GPG signature. + +------------------------------------------------------------------- Old: ---- enblend-enfuse-4.0.tar.gz enblend-enfuse-libpng14.patch enblend-enfuse-libpng15.patch New: ---- enblend-enfuse-4.1.tar.gz enblend-enfuse-4.1.tar.gz.asc enblend-enfuse-html2xhtml enblend-enfuse.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ enblend-enfuse.spec ++++++ --- /var/tmp/diff_new_pack.aEHN5P/_old 2013-01-31 16:26:20.000000000 +0100 +++ /var/tmp/diff_new_pack.aEHN5P/_new 2013-01-31 16:26:20.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package enblend-enfuse # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,17 +21,15 @@ Summary: Tool for Composing Images License: GPL-2.0+ Group: Productivity/Graphics/Other -Version: 4.0 +Version: 4.1 Release: 0 Source: http://sourceforge.net/projects/enblend/files/%{name}/%{name}-%{version}/%{name}-%{version}.tar.gz -Patch0: enblend-enfuse-libpng14.patch +Source1: http://sourceforge.net/projects/enblend/files/%{name}/%{name}-%{version}/%{name}-%{version}.tar.gz.asc +Source2: %{name}.keyring +# This file is missing in the tarball. Downloaded from hg: https://sourceforge.net/p/enblend/code/ci/8d53b58392888c74ee96f59ca4b005915ccfa6d6/tree/doc/html2xhtml +Source3: enblend-enfuse-html2xhtml Patch1: use-default-gcc-inlining.diff -# libpng15.patch sent to dang...@users.sourceforge.net, acmi...@users.sourceforge.net, csp...@users.sourceforge.net, btownsh...@users.sourceforge.net -# reply from Chris (cspiel): -# Vigra is not part of the Enblend/Enfuse -# package anymore. Thus the patch is outdated wrt -# current tip. -Patch2: enblend-enfuse-libpng15.patch +BuildRequires: ImageMagick BuildRequires: OpenEXR-devel BuildRequires: automake BuildRequires: boost-devel @@ -39,18 +37,26 @@ BuildRequires: gcc-c++ BuildRequires: glew-devel BuildRequires: gnuplot +BuildRequires: gsl-devel BuildRequires: libjpeg-devel -BuildRequires: liblcms-devel +BuildRequires: liblcms2-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel +BuildRequires: libxml2-tools +#BuildRequires: mathml-dtd +BuildRequires: perl-TimeDate BuildRequires: plotutils-devel BuildRequires: sed +BuildRequires: texinfo BuildRequires: tidy BuildRequires: transfig +BuildRequires: vigra-devel +#BuildRequires: xhtml-dtd +%if 0%{?suse_version} > 1220 +BuildRequires: gpg-offline +%endif Provides: enblend = %{version} Provides: enfuse = %{version} -# package name for < openSUSE 11.1: -Obsoletes: enblend < 3.2 BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %install_info_prereq @@ -68,27 +74,32 @@ %prep -%setup -q -n enblend-enfuse-4.0-753b534c819d -%patch0 -p1 +%if 0%{?gpg_verify:1} +%gpg_verify %{S:1} +%endif +%setup -q +cp -a %{S:3} doc/html2xhtml ; chmod +x doc/html2xhtml %patch1 -%patch2 -#workaround vigra bug where arithmetic coded JPEG is always created with libjpeg-turbo #bnc786566 - gan...@opensuse.org -#Perhaps it should be removed when 4.2 release -sed -i 's/info.arith_code = TRUE/info.arith_code = FALSE/' src/vigra_impex/jpeg.cxx %build ACLOCAL="aclocal -I m4" autoreconf -f -i - # The gcc 4.5 performs too poor compiling this package with -O2, can take days. +# gcc-4.7 still needs too much resources to build on x86_64 with -O2 and OBS virtual engine crashes after a hour. export CFLAGS="$RPM_OPT_FLAGS -Os" export CXXFLAGS="$RPM_OPT_FLAGS -Os" %configure # NO, do not use this here, it breaks the build due to lack of resources #make %{?_smp_mflags} make +# FIXME: We need xhtml-math-svg.dtd https://bugzilla.novell.com/show_bug.cgi?id=799075 +#make %{?_smp_mflags} xhtml %install %makeinstall +#make install-xhtml DESTDIR=%{buildroot} + +%clean +rm -rf %{buildroot} %post %install_info --info-dir=%{_infodir} %{_infodir}/enblend.info.gz @@ -102,7 +113,8 @@ %files %defattr(-,root,root) -%doc AUTHORS ChangeLog COPYING NEWS README VIGRA_LICENSE +# ChangeLog does not contain anything useful +%doc AUTHORS COPYING NEWS README doc/*.pdf %{_bindir}/* %doc %{_infodir}/*.* %doc %{_mandir}/*/*.* ++++++ enblend-enfuse-4.0.tar.gz -> enblend-enfuse-4.1.tar.gz ++++++ ++++ 162760 lines of diff (skipped) ++++++ enblend-enfuse-html2xhtml ++++++ #! /bin/sh #! /bin/dash -x # This file is part of Enblend. # Licence details can be found in the file COPYING. # name: html2xhtml # synopsis: Convert the HTML output of makeinfo(1) to valid XHTML # author: Dr. Christoph L. Spiel # shell version: bash-3.2.39, dash-0.5.4 readonly global__command=`basename $0` global__meta_key_val= readonly global__sed=${SED:-sed} readonly global__tidy=${TIDY:-tidy} global__tidy_flags="" readonly global__xmllint=${XMLLINT:-xmllint} global__xmllint_flags="--valid --noblanks --noent -nonet --nsclean --format --encode iso-8859-1" failwith_error () { echo "$global__command: $@" 1>&2 exit 1 } convert_with_tidy () { # We add the system identifier with sed(1) after tidy(1). See # function postprocess_tidy_output. Also see # http://www.w3.org/QA/2002/04/valid-dtd-list.html # for a list of recommended doctype declarations. $global__tidy \ --add-xml-decl yes \ --doctype '"-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN"' \ --file /dev/null \ --new-blocklevel-tags "math, mfenced, mfrac, mover, mrow, msqrt, msub, msup, mtable, mtd, mtr, munder, munderover" \ --new-empty-tags mspace \ --new-inline-tags "mathinline, mfencedinline, mi, mn, mo, mrowinline, msqrtinline, msubinline, msupinline, mtext" \ --sort-attributes alpha \ --output-encoding latin1 \ --output-xhtml yes \ --preserve-entities yes \ --quiet yes \ --wrap 0 \ $global__tidy_flags \ "$@" } # We must postprocess tidy(1)'s output, because 1/ it still contains # elements that make an XML parser puke and 2/ we have intentionally # introduced pseudo MathML tags to coerce tidy(1) into formatting them # inline; these tags must be reverted. postprocess_tidy_output () { if test -z "$lazy__meta_tag" && test -n "$global__meta_key_val"; then lazy__meta_tag=`echo $global__meta_key_val | \ $global__sed -e 's#;#\n#g' | \ $global__sed -e 's#\([^,]*\),\(.*\)#<meta name="\1" content="\2" />#'` fi $global__sed \ -e '1,9s#""#"http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd"#' \ \ -e "s#^<head>#<head>\n$lazy__meta_tag#" \ \ -e 's#<html\([^>]*\) lang="[^"]*"\([^>]*\)#<html\1\2#' \ -e 's#<ol[^>]*>#<ol>#' \ -e 's#<t\([dh]\)\([^>]*\)width="[^"]*"\([^>]*\)#<t\1\2\3#' \ -e 's#<ul\([^>]*\)compact="[^"]*"\([^>]*\)#<ul\1\2#' \ \ -e 's#<\(/*\)\(math\|mfenced\|mrow\|msqrt\|msub\|msup\)inline#<\1\2#g' } # Makeinfo(1) generates indirect-reference files for each float. # Their filenames start with "Table_" or "Figure_*", which is how we # distinguish them from the html files making up the body. is_indirect_reference_file () { local filename=$1 test -z "${filename%Table_*}" || test -z "${filename%Figure_*}" } # Convert all html files iside the given directory. convert_directory () { local html_directory=$1 local xhtml_directory=`basename $html_directory .html`.xhtml mkdir -p $xhtml_directory ( cd $html_directory || failwith_error "cannot cd to \"$html_directory\"" ls -1 *.html | \ $global__sed -ne 's#\(.*\)\.html#s|\1\\.html|\1.xhtml|g#p' > ,fix-file-refs.sed ) printf '' > $html_directory/,fix-indir.sed for html_file in $html_directory/*.html; do local html_base=`basename $html_file` if is_indirect_reference_file $html_base; then url=`$global__sed -ne 's#^.*url=\([^"]*\)".*$#\1#p' < $html_file` target_file=`echo $url | $global__sed -e 's/#.*$//'` echo "s|$html_base|$target_file|" >> $html_directory/,fix-indir.sed fi done for html_file in $html_directory/*.html; do local html_base=`basename $html_file` if ! is_indirect_reference_file $html_base; then local xhtml_file=$xhtml_directory/`basename $html_base .html`.xhtml convert_with_tidy $html_file | \ postprocess_tidy_output | \ $global__sed \ -f $html_directory/,fix-indir.sed \ -f $html_directory/,fix-file-refs.sed \ -e 's|<a\([^>]*\)name="[^"]*"\([^>]*\)|<a\1\2|g' \ -e 's|\("[^/"]*\)\.html\([#"]\)|\1.xhtml\2|' | \ $global__xmllint $global__xmllint_flags --output $xhtml_file - test $? -eq 0 || { rm -f $xhtml_file; exit 1; } fi done } # Convert a single standalone html file. convert_file () { local html_file=$1 local xhtml_file=`basename $html_file .html`.xhtml convert_with_tidy $html_file | \ postprocess_tidy_output | \ $global__sed -e 's|<a\([^>]*\)name=\([^>]*\)|<a\1id=\2|g' | \ $global__xmllint $global__xmllint_flags --output $xhtml_file - test $? -eq 0 || { rm -f $xhtml_file; exit 1; } } convert_html_to_xhtml () { local html=$1 if test -d "$html"; then convert_directory $html else convert_file $html fi } # We prefer to check for all binaries before we get an unpleasant # surprise in one of the pipes. check_binaries () { for v in global__sed global__tidy global__xmllint; do eval x=\$$v test -z "$x" && failwith_error "variable \"${v#global__}\" is not defined" $x --version > /dev/null 2>&1 || \ failwith_error "cannot execute \"$x\" for \"${v#global__}\"" done } parse_options () { : $((n=0)) while test -n "$1"; do case "$1" in --meta=*) if test -z "$global__meta_key_val"; then global__meta_key_val="${1#--meta=}" else global__meta_key_val="$global__meta_key_val;${1#--meta=}" fi ;; -h | --help) show_help exit 0 ;; --tidy-flags=*) global__tidy_flags="$global__tidy_flags ${1#--tidy-flags=}" ;; --xmllint-flags=*) global__xmllint_flags="$global__xmllint_flags ${1#--xmllint-flags=}" ;; --) shift : $((n=n+1)) break 2 ;; --*) failwith_error "unknown long option \"$1\"" ;; -*) failwith_error "unknown short option \"$1\"" ;; *) break 2 esac shift : $((n=n+1)) done return $n } show_help () { printf %s "\ Usage: $global__command_name [OPTIONS] [HTML...] Convert HTML files or directories to XHTML. Options: --meta=NAME,CONTENT add meta tags with NAME and CONTENT --tidy-flags=FLAGS set flags for tidy(1) --xmllint-flags=FLAGS set flags for xmllint(1) -h, --help show this help screen Influential environment variables: SED name of sed binary [default: \"$global__sed\"] TIDY name of tidy binary [default: \"$global__tidy\"] XMLLINT name of xmllint binary [default: \"$global__xmllint\"] " } main () { parse_options "$@" shift $? # shift away all options check_binaries for x in "$@"; do convert_html_to_xhtml "$x" done } main "$@" exit 0 ++++++ enblend-enfuse.keyring ++++++ pub 1024D/928C0606 2009-03-13 uid Dr. Christoph L. Spiel <csp...@freenet.de> sub 2048g/2FF89038 2009-03-13 -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v2.0.19 (GNU/Linux) mQGiBEm6R0oRBADbc9sTCaJfYVPfgOJlV9R/ptlpVyxh0Y68pd3tKaJ3SbKvbnCr sw4R5QL6n6NDZJeCxkBGkKfEs49RBtQ0REz+oY1aAEOOsBAhzK+jLSK6ZK8ZcCbp GJRDcHdSLIWxEryiVhkBWsoCXm9s3x/P8lQ+P2adsvQoMioaxkkaTmrjowCgo3/h X0MF4mJPFVp2FdvgrdCs9csD/2AoEAA4TGgc0RvbFPesv0XBOWmZLmY7AGBroBvm k1GBqCPcWtGd8HalX7tRBTzEUpzXoAUxQoQyyaYqIKJRHvhCVGR+ZECTYjsXnr4w tS8tZy4fZrzwOyyJYE6D3+K/JlbIKnuADluAVpbUzjQ4BpOLege6L+urpmMiDOjH 2BSwBACQ86p4jLOWyzrVZbTPkoWmnIiSCSdgUPyns5lx4GMv9FY37JNQPOdMawiy EIWtULMu1TUOPALFsuKJ5uS/skWPF9vNXl7gzlXcwEMTmfVZm4g4swTUFMmn3jlg t/kiTEhREB2KtVxUZyNXEfJhnKz2dNQ9xERgPpKT7bKqMHF+Z7QqRHIuIENocmlz dG9waCBMLiBTcGllbCA8Y3NwaWVsQGZyZWVuZXQuZGU+iGAEExECACAFAkm6R0oC GwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRDVfLhQkowGBsn5AJwIEQ1sOSkH kRndw4s079xgofjeggCfYCnLOzUDX0UjZpQMSQSYNxlCz4G5Ag0ESbpHShAIAIy4 Qkpv0skX4Z1bGH2gmshG9IPSf3eEdS8XdYmqlNULW4sJM/ZiinL/w5D7UsjHe1we ZtIr1QObWuZLP4eKlo9qN+SpXMbYsbkubttMNyP6DeAkjPAls+O3HRZpZlBSdc3Y VhhFNhI/tYaidwla7GVVMqeChnDZgP0u2465r3AgxoSjR8kVPONUj2Xl/UMeHeFP z6EvqZ0aNdUbF91fxCG2EnyBFM7wF6Rapi5e8RHr4zlD8Ln183TvNTfT5ImLxLCC +W4tuXVZzcX+7Utjp2BkgZesVU1pVsh9nz4TygP9WB7d+dmJTbtwntAoRRx1D28Q KVT7/Cm92ADi0FEfiT8AAwUH/iqBs22F9ZvyxSvE8iY3FSjJRbGSpQ9+VYyRDbYh o1lKcyJ+npxFpQuyj6gvJjpLiI3CCFfBYqNbuU1OSy0PfcODqSaR4T32PkCy2lDR rEdkPxP6/+pFgMvdDI/pkfWHw6m38+1HmiYnvKdnWEsmezW2E02NlZE8qe8YAPA8 XDvHL7RzPUcBb68Lllh0cRCWsVTla/AIE6W1SfPygFevTxfgtP2bvYKuWX/hOkd6 J4DQiIIYyuEnRotLdAm3noBu4DWgUJNa+RSokig9hwahl7hS+nM/bi3nDda9jYjM CRjEBa9H6uB8r1KLz6VQdHqIoriz5YtU9tu78/wFJk3R8daISQQYEQIACQUCSbpH SgIbDAAKCRDVfLhQkowGBlMoAJ4pW6YdXcmReWEJLgz9oYel7/0aXACgkYndLaV9 S3lIKb7nZVJiboYBG8w= =2cZL -----END PGP PUBLIC KEY BLOCK----- ++++++ use-default-gcc-inlining.diff ++++++ --- /var/tmp/diff_new_pack.aEHN5P/_old 2013-01-31 16:26:20.000000000 +0100 +++ /var/tmp/diff_new_pack.aEHN5P/_new 2013-01-31 16:26:20.000000000 +0100 @@ -1,10 +1,10 @@ --- configure.in +++ configure.in -@@ -70,11 +70,6 @@ +@@ -77,11 +77,6 @@ have_exr=no fi]) --if test "x$GXX" = xyes; then +-if test "$GXX" = yes; then - # Fixes SourceForge bug id 2121647 on some systems with newer GCCs. - CXXFLAGS="$CXXFLAGS --param inline-unit-growth=60" -fi @@ -12,9 +12,7 @@ AC_ARG_VAR(OPENGL_CFLAGS, [C compiler flags for OpenGL]) AC_ARG_VAR(OPENGL_LIBS, [Linker flags and libraries for OpenGL]) gpu_support_default="yes" ---- configure.in.orig 2010-05-19 11:58:50.769138030 +0200 -+++ configure.in 2010-05-19 11:59:50.022170547 +0200 -@@ -455,7 +455,7 @@ +@@ -496,7 +491,7 @@ AC_MSG_RESULT(yes) enable_debug=yes else -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
