December 2012 - openSUSE Commits - openSUSE Mailing Lists

commit zlib for openSUSE:Factory
by root＠hilbert.suse.de 28 Dec '12

28 Dec '12

Hello community, here is the log from the commit of package zlib for openSUSE:Factory checked in at 2012-12-28 22:52:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zlib (Old) and /work/SRC/openSUSE:Factory/.zlib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "zlib", Maintainer is "MVyskocil(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/zlib/zlib.changes 2012-11-29 09:34:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.zlib.new/zlib.changes 2012-12-28 22:52:29.000000000 +0100 @@ -1,0 +2,6 @@ +Sat Dec 15 18:56:05 UTC 2012 - schwab(a)linux-m68k.org + +- Add zlib-devel-static to baselibs.conf, needed for binutils testsuite +- Migrate zlib-<targettype> to libz1-<targettype> + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.q1gXZ9/_old 2012-12-28 22:52:30.000000000 +0100 +++ /var/tmp/diff_new_pack.q1gXZ9/_new 2012-12-28 22:52:30.000000000 +0100 @@ -1,3 +1,6 @@ libz1 targettype x86 provides "baselibs-x86:<prefix>/lib/libz.so.1" + provides "zlib-<targettype> = <version>" + obsoletes "zlib-<targettype> < <version>" zlib-devel +zlib-devel-static -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit zhu3d for openSUSE:Factory
by root＠hilbert.suse.de 28 Dec '12

28 Dec '12

Hello community, here is the log from the commit of package zhu3d for openSUSE:Factory checked in at 2012-12-28 22:52:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zhu3d (Old) and /work/SRC/openSUSE:Factory/.zhu3d.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "zhu3d", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-12-21 01:49:00.356010756 +0100 +++ /work/SRC/openSUSE:Factory/.zhu3d.new/zhu3d.changes 2012-12-28 22:52:12.000000000 +0100 @@ -0,0 +1,176 @@ +------------------------------------------------------------------- +Thu Dec 27 08:15:38 UTC 2012 - cfarrell(a)suse.com + +- license update: GPL-3.0 + license.gpl and the vast majority of source code files in the package + indicate that this package is GPL-3.0, not GPL-2.0 + +------------------------------------------------------------------- +Mon Dec 10 09:58:20 UTC 2012 - dmitry_r(a)opensuse.org + +- Delete KDE3 dependence + +------------------------------------------------------------------- +Wed Sep 12 17:10:15 UTC 2012 - dmitry_r(a)opensuse.org + +- Fix RPMLINT warning "file-contains-current-date" + * zhu3d-no-compilation-date.patch + +------------------------------------------------------------------- +Wed Aug 29 17:04:17 UTC 2012 - scorot(a)free.fr + +- version 4.2.4 + - Fixed a very unlikely but possible memory-bug in the XML-file + saving/loading-part + - Fixed a very unlikely but possible memory-leak in speedit.cpp + - Fixes for the timestamp-counter on newer platforms + - Slightly optimized some default window positions after the 1.st + start ever + - Made settings-stuff more elegant throughout the code what + shrinks the executable size too + - Switched icons to more modern KDE4-style where this seems + optically feasible and consistent + - Cosmetic improvements/updates or typo-fixes elsewhere +- fix build on recent product with patch1 +- spec file reformating + +------------------------------------------------------------------- +Thu Apr 30 19:12:21 CEST 2009 - tthidney(a)seznam.cz +- update to 4.2 + - brushed code + - enabled more aggressive compiler-optimisations as default + - fixed some typos and bugs +- remove zhu3d-4.1.2_LC_NUMERIC.patch + +------------------------------------------------------------------- +Wed Nov 19 15:01:53 CET 2008 - pnemec(a)suse.cz +- updated to 4.1.4 + +------------------------------------------------------------------- +Tue Jul 29 11:13:53 CEST 2008 - pnemec(a)suse.cz +- updated to 4.1.0 + +------------------------------------------------------------------- +Tue Mar 11 09:54:08 CET 2008 - pnemec(a)suse.cz +- updated to 4.0.0 +- The legends-editor is fully featured now. You can add up to nine labels. Each of them can be positioned, coloured, enabled or resized individually +- Raised the maximum number of user-defined functions to 64 +- Switched zhu-file format to XML. The new format is not backward compatible, but you still can read old formats down to version 2.8.0 from November 2006 +- Added more specific error messages for file loading +- Moved debugging switch to zhu3d.pro and excluded error class from compilation when turned off. This results in faster compile time and a smaller executable +- Changed all examples to the new 4.0.0 format +- Added legend examples +- Slight code optimisations in regards to zhu-conventions +- Note that all labels are scaleable nearly as precise as a PDF whether it is done in pure OpenGL with a bit Qt4. No complicated subclassing, no funky texture tricks, no extra libs. Developers may take a look at the source and wonder how easy it can be +- Fixed a major bug which was introduced in 3.4.8, where you could not reload files after saving +- Versions >=3.4.6 lost the ability to render textures into pictures and to printer. Fixed +- Updated English and German help-files + +------------------------------------------------------------------- +Fri Mar 7 10:23:19 CET 2008 - pnemec(a)suse.cz +- updated to 3.4.4 + +------------------------------------------------------------------- +Fri Dec 14 14:31:37 CET 2007 - pnemec(a)suse.cz +- update to 3.3.4 + +------------------------------------------------------------------- +Wed Feb 21 09:16:31 CET 2007 - pnemec(a)suse.cz +# spec file for package zhu3d (Version 2.9.6) +--- +> # spec file for package zhu3d (Version 2.7.2) +100,104d99 +- updated to 2.9.6 + - A comment with # can appear anywhere in a function input now instead of just at the beginning + - Added missing hyperbolic area functions (asinh, acosh, ...) to the parsers. The hyperbolic example works now as expected + - The solver showed a wait cursor, when it was not successfull. Corrected + +------------------------------------------------------------------- +Tue Jan 2 11:13:01 CET 2007 - pnemec(a)suse.cz + +- updated to 2.9.2 + - Added a spreadsheet for user defined items. So you can freely define your own constants and functions as you need it. E.g you can formulate Einsteins law as the function energy(mass)=mass*c^2 now. User defined functions can have an arbitrary amount of parameters and can be nested with other functions or constants. As things can get quite complex now, it is highly recommended to look at the new examples + - Enabled if-conditions, boolean expressions and recursions for the OpenGL parsers and user defined items + - Added examples for simple and complex user defined items + - Added examples for if-conditions and boolean operators + - Added examples for recursions + - Added menu "File/New" for a comfortable default starting point + - Small changes in menu entries/GUI to reflect real meanings better + - Added/updated Chinese and French html-helpfiles. Special thanks again to Yanqing and Henri Girard for maintaining these translations + - Updated Spanish GUI/html. Special thanks again to Victor Fernandez for maintaining this translation + - Some code clean-ups/restructuring/size reduction + - Adaptions in the Warp-parser for enhanced "Zhu3D-compatibility" + - Replaced the "Open" icon for a consistent KDE-like look and feel + - The French html was ugly when shown with internal browser. Fixed + - Some polishing/corrections in the docs and the examples +- fixed path problem in spec file, created zhu3d.pri patch to fix path + +------------------------------------------------------------------- +Fri Dec 8 10:52:12 CET 2006 - pnemec(a)suse.cz + +- updated to 2.9.0 + - Replaced recursive OpenGL-parser with the bytecode-version from Warp. With some additional tuning the average speed gain is between 300%-500%. Especially important for costly isosurfaces on slower machines + - Raised upper limit for isosurface grid + - The parser syntax changed slightly. E.g: 2X*SIN(XY) must be written as 2*x*sin(x*y) now + - To stay compatible added all missing functions to the Warp-parser and introduced the $ sign for constants there + - New parser functions are: floor(), ceil(), cot(), csc(), sec() + - Added new functions to recursive parser, which is still in use for solving due to it's precision + - In parameter mode the Z-grid buttons consequently are disabled now + - Some code shrink measurements + - Completely reworked examples for new syntax + - Loading a zhu-file always starts with a blank viewer window now. This avoids worrying intermixing of old/new views during build up + - Small changes in menu entries/GUI to reflect real meanings better + - Improvements/updates for Chinese and French GUI-translation. Special thanks again to Yanqing and Henri Girard for maintaining this translations + - Enabled the nicer Zhu3D-logo in GUI/menu entries too now + - The combobox under "Settings/General/Language" did not retranslate it's own language entries immediately. Fixed + - Clean ups in ./src for readability and unifications + +------------------------------------------------------------------- +Thu Nov 23 00:00:00 CET 2006 Pavel Nemec <pnemec(a)suse.cz> + +- updated to 2.7.4 +- Some tuning for OpenGL list handling. Especially complexer Zhu3D files may be shown a lot faster after loading now +- Added function log2() to the parsers +- Some clean ups in translation files and error messages + +------------------------------------------------------------------- +Tue Nov 21 00:00:00 CET 2006 Pavel Nemec <pnemec(a)suse.cz> + +- updated to 2.7.2 +- move package into science project in build.opensuse.org + +------------------------------------------------------------------- +Wed Nov 15 00:00:00 CET 2006 Pavel Nemec <pnemec(a)suse.cz> + +- update to version 2.6.7 +- minor changes in specfile + icon is now installed into /usr/share/pixmaps also + +------------------------------------------------------------------- +Mon Oct 16 00:00:00 CET 2006 - vfernandez(a)polinux.upv.es + +- update to version 2.4 +- changed the patch to fix the paths + +------------------------------------------------------------------- +Sat Sep 30 00:00:00 CET 2006 - vfernandez(a)polinux.upv.es + +- update to version 2.3 + +------------------------------------------------------------------- +Mon Sep 18 00:00:00 CET 2006 - vfernandez(a)polinux.upv.es + +- update to version 2.2 +- removed the patch for the spanish translation, since Zhu3D already has it + +------------------------------------------------------------------- +Thu Aug 24 00:00:00 CET 2006 - vfernandez(a)polinux.upv.es + +- update to version 2.1 +- added spanish translation + +------------------------------------------------------------------- +Thu Aug 17 00:00:00 CET 2006 - vfernandez(a)polinux.upv.es + +- first build +------------------------------------------------------------------- New: ---- zhu3d-4.2.4-glu-link.patch zhu3d-4.2.4.tar.gz zhu3d-no-compilation-date.patch zhu3d-pri.patch zhu3d.changes zhu3d.desktop zhu3d.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zhu3d.spec ++++++ # # spec file for package zhu3d # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2006 Víctor Fernández Martínez. Valencia, Spain. # openSuse (c) 2006 pnemec(a)novell.com # Copyright (c) 2006 Pavel Nemec pnemec(a)suse.cz # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: zhu3d Summary: OpenGL-based equation viewer and solver License: GPL-3.0 Group: Productivity/Scientific/Math Version: 4.2.4 Release: 0 Url: http://sourceforge.net/projects/zhu3d/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.desktop Patch0: %{name}-pri.patch Patch1: %{name}-4.2.4-glu-link.patch # PATCH-FIX-OPENSUSE zhu3d-no-compilation-date.patch - fix "W: file-contains-current-date" Patch2: %{name}-no-compilation-date.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes BuildRequires: Mesa-devel %if 0%{?suse_version} >= 1220 BuildRequires: Mesa-libGLU-devel %endif BuildRequires: libqt4-devel > 4.3 BuildRequires: libqt4-sql BuildRequires: libqt4-x11 BuildRequires: update-desktop-files %description With Zhu3D you can view, animate and solve up to three functions in 3D-space in a interactive manner. In addition, you further can observe an independent parametric system. The OpenGL-viewer supports zooming, scaling, rotating, translating as well as filed lightning, transparency or surface-properties. You have up to 8 independent lights or spotlights, background settings, miscellaneous wire-modes or global illumination models. Pictures are rendered as png or jpg and can have an arbitrary size. Numerical solutions of an equation-system are found with a quite fast and reliable adaptive random search. %prep %setup -q %patch0 %patch1 %patch2 -p1 find . -type f -print0|xargs -0 chmod -x sed -i 's/\r//' readme.txt license.gpl %build qmake SYSDIR=%{_datadir} QMAKE_CFLAGS_RELEASE="%{optflags}" QMAKE_CXXFLAGS_RELEASE="%{optflags}" make %install # Program binary mkdir -p %{buildroot}%{_bindir} cp -f %{name} %{buildroot}%{_bindir} # Other program files mkdir -p %{buildroot}%{_datadir}/%{name} cp -a -f work system %{buildroot}%{_datadir}/%{name} # Desktop entry mkdir -p %{buildroot}%{_datadir}/applications cp -f %SOURCE1 %{buildroot}%{_datadir}/applications # Desktop icon install -m 0755 -d %{buildroot}%{_datadir}/icons/hicolor/64x64/apps install -m 0755 -d %{buildroot}%{_datadir}/pixmaps install -m 0644 system/icons/%{name}.png %{buildroot}%{_datadir}/icons/hicolor/64x64/apps install -m 0644 system/icons/%{name}.png %{buildroot}%{_datadir}/pixmaps/%{name}.png %fdupes -s %{buildroot}%{_datadir} %files %defattr(-,root,root) %{_bindir}/%{name} %{_datadir}/%{name}/* %{_datadir}/applications/* # %{_datadir}/icons/hicolor/64x64/apps/* %{_datadir}/icons/hicolor/ %{_datadir}/pixmaps/zhu3d.png %dir %{_datadir}/%{name} %doc license.gpl readme.txt %changelog ++++++ zhu3d-4.2.4-glu-link.patch ++++++ --- zhu3d.pro +++ zhu3d.pro @@ -48,7 +48,7 @@ CONFIG += release TARGET = zhu3d QT += opengl - +LIBS += -lGLU # ============================================================================ # Optimisation switches. For both GCC/ICC compilers -O3 is default. ++++++ zhu3d-no-compilation-date.patch ++++++ --- zhu3d-4.2.4.orig/src/mainwindow.cpp 2012-01-10 20:23:23.000000000 +0400 +++ zhu3d-4.2.4/src/mainwindow.cpp 2012-09-12 20:31:22.697126326 +0400 @@ -418,7 +418,6 @@ void MaiWindow::aboutSlot() { /** Get compilation date */ - const QString tmp = (QString)(__DATE__); QMessageBox::about( this, @@ -427,7 +426,7 @@ /** This is never translated */ QString("") + NAME + QString(" ") + QString("is an OpenGL-based function-viewer and solver.") + - QString("Version ")+VERS+QString(" compiled ")+tmp+QString("") + + QString("Version ")+VERS+QString("") + QString("Check updates on: " "<a href=\"http://www.kde-apps.org/content/show.php?content=43071/\"" ">www.kde-apps.org</a> " ++++++ zhu3d-pri.patch ++++++ Index: zhu3d.pri =================================================================== --- zhu3d.pri.orig +++ zhu3d.pri @@ -23,11 +23,10 @@ # application path. As default the texture-directory resides under the work- # directory. -SYSDIR= -DOCDIR= -WORKDIR= -TEXDIR= - +SYSDIR=/usr/share/zhu3d/system +DOCDIR=/usr/share/doc/packages/zhu3d +WORKDIR=/usr/share/zhu3d/work +TEXDIR=/usr/share/zhu3d/work/textures # DETERMINING A DEFAULT GUI-STYLE # ++++++ zhu3d.desktop ++++++ [Desktop Entry] Encoding=UTF-8 Name=Zhu3D Comment=OpenGL-based equation viewer and solver Exec=zhu3d Icon=zhu3d Type=Application Terminal=false X-KDE-StartupNotify=true Categories=Qt;Education;Math; GenericName=Function viewer and solver GenericName[cs]=Program pro zobrazování a řešení funkcí X-SuSE-translate=true -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xtables-addons for openSUSE:Factory
by root＠hilbert.suse.de 28 Dec '12

28 Dec '12

Hello community, here is the log from the commit of package xtables-addons for openSUSE:Factory checked in at 2012-12-28 22:51:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xtables-addons (Old) and /work/SRC/openSUSE:Factory/.xtables-addons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xtables-addons", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/xtables-addons/xtables-addons.changes 2012-10-31 07:04:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xtables-addons.new/xtables-addons.changes 2012-12-28 22:52:01.000000000 +0100 @@ -1,0 +2,19 @@ +Fri Dec 21 02:08:44 UTC 2012 - jengelh(a)inai.de + +- Always ship all source tarballs to make osc validator happy +- Enable version 2.0 for openSUSE:Factory which now has kernel 3.7 +- Add 0001-xt_DNETMAP-fix-compile-error-with-Linux-3.7.patch + +------------------------------------------------------------------- +Mon Dec 3 15:17:18 CET 2012 - sbrabec(a)suse.cz + +- Verify GPG signature. + +------------------------------------------------------------------- +Mon Nov 12 21:01:14 UTC 2012 - jengelh(a)inai.de + +- Update to new upstream release 2.0 + (enabled for Kernel:HEAD only at this time) +* Support for Linux 3.7 + +------------------------------------------------------------------- New: ---- 0001-xt_DNETMAP-fix-compile-error-with-Linux-3.7.patch xtables-addons-2.0.tar.xz xtables-addons-2.0.tar.xz.asc xtables-addons.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xtables-addons.spec ++++++ --- /var/tmp/diff_new_pack.5F9Y1o/_old 2012-12-28 22:52:02.000000000 +0100 +++ /var/tmp/diff_new_pack.5F9Y1o/_new 2012-12-28 22:52:02.000000000 +0100 @@ -17,21 +17,40 @@ Name: xtables-addons +%if 0%{?suse_version} >= 1230 || "%_repository" == "Kernel_HEAD" +%define kernel37 1 +%endif +%if 0%{?kernel37} +Version: 2.0 +Release: 0 +%else Version: 1.47.1 Release: 0 +%endif Summary: IP Packet Filter Administration Extensions License: GPL-2.0 ; GPL-2.0+ Group: Productivity/Networking/Security Url: http://xtables-addons.sf.net/ +#Freecode-URL: http://freecode.com/projects/xtables-addons/ #Git-Clone: git://xtables-addons.git.sf.net/gitroot/xtables-addons/xtables-addons #Git-Web: http://xtables-addons.git.sf.net/ %define git_snapshot 0 -Source: %name-%version.tar.xz -Source2: %name-%version.tar.xz.asc Source3: %name-preamble +Source4: %name.keyring +Source5: %name-1.47.1.tar.xz +Source6: %name-1.47.1.tar.xz.asc +Source7: %name-2.0.tar.xz +Source8: %name-2.0.tar.xz.asc +Patch1: 0001-xt_DNETMAP-fix-compile-error-with-Linux-3.7.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} >= 1230 +BuildRequires: gpg-offline +%endif +%if 0%{?kernel37} +BuildRequires: linux-glibc-devel >= 3.7 +%endif %if %git_snapshot BuildRequires: autoconf BuildRequires: automake >= 1.10b @@ -81,7 +100,14 @@ main kernel/iptables packages. %prep -%setup -q +%{?gpg_verify: %gpg_verify %_sourcedir/%name-%version.tar.xz.asc} +echo "Version: %version. Repository: %_repository. SUSE_v: %{?suse_version}" +%if 0%{?kernel37} +%setup -Tqb7 +%patch -P 1 -p1 +%else +%setup -Tqb5 +%endif %build if [ ! -e configure ]; then ++++++ 0001-xt_DNETMAP-fix-compile-error-with-Linux-3.7.patch ++++++ >From 29141b6e954a027954dcad82d175cff9d743c4df Mon Sep 17 00:00:00 2001 From: Jan Engelhardt <jengelh(a)inai.de> Date: Fri, 21 Dec 2012 05:45:15 +0100 Subject: [PATCH] xt_DNETMAP: fix compile error with Linux 3.7 --- doc/changelog.txt | 2 ++ extensions/xt_DNETMAP.c | 3 +-- mconfig | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/changelog.txt b/doc/changelog.txt index 1f525c1..7f652d9 100644 --- a/doc/changelog.txt +++ b/doc/changelog.txt @@ -1,6 +1,8 @@ HEAD ==== +Fixes: +- DNETMAP: fix compile error with Linux 3.7 v2.0 (2012-11-12) diff --git a/extensions/xt_DNETMAP.c b/extensions/xt_DNETMAP.c index 62ad9cd..18d48de 100644 --- a/extensions/xt_DNETMAP.c +++ b/extensions/xt_DNETMAP.c @@ -27,10 +27,9 @@ #include <linux/netfilter_ipv4.h> #include <linux/netfilter/x_tables.h> #include <linux/version.h> -#include <net/netfilter/nf_nat_rule.h> #include <net/net_namespace.h> #include <net/netns/generic.h> -#include <linux/netfilter/nf_nat.h> +#include <net/netfilter/nf_nat.h> #include "compat_xtables.h" #include "xt_DNETMAP.h" diff --git a/mconfig b/mconfig index 6386498..6418bb4 100644 --- a/mconfig +++ b/mconfig @@ -4,7 +4,7 @@ build_ACCOUNT=m build_CHAOS=m build_DELUDE=m build_DHCPMAC=m -build_DNETMAP= +build_DNETMAP=m build_ECHO=m build_IPMARK=m build_LOGMARK=m -- 1.7.10.4 ++++++ xtables-addons.keyring ++++++ pub 4096R/19FC338D 2011-05-09 [expires: 2016-05-07] uid Jan Engelhardt <jengelh(a)gmx.de> sub 4096R/C66DD881 2011-05-09 [expires: 2016-05-07] sub 4096g/34C483D3 2011-05-09 [expires: 2016-05-07] sub 3072D/68A20E45 2011-05-09 [expires: 2016-05-07] -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v2.0.19 (GNU/Linux) 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 =ZosZ -----END PGP PUBLIC KEY BLOCK----- -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11 for openSUSE:Factory
by root＠hilbert.suse.de 28 Dec '12

28 Dec '12

Hello community, here is the log from the commit of package xorg-x11 for openSUSE:Factory checked in at 2012-12-28 22:51:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xorg-x11 (Old) and /work/SRC/openSUSE:Factory/.xorg-x11.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xorg-x11", Maintainer is "sndirsch(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/xorg-x11/xorg-x11.changes 2012-06-28 17:22:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xorg-x11.new/xorg-x11.changes 2012-12-28 22:51:44.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Dec 26 23:28:44 UTC 2012 - mike.catanzaro(a)gmail.com + +- Don't require twm; it is still recommended. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.gIGomw/_old 2012-12-28 22:51:44.000000000 +0100 +++ /var/tmp/diff_new_pack.gIGomw/_new 2012-12-28 22:51:44.000000000 +0100 @@ -46,7 +46,7 @@ Requires: setxkbmap Recommends: showfont Recommends: smproxy -Requires: twm +Recommends: twm Recommends: viewres Recommends: x11perf Requires: xauth ++++++ README.meta ++++++ --- /var/tmp/diff_new_pack.gIGomw/_old 2012-12-28 22:51:44.000000000 +0100 +++ /var/tmp/diff_new_pack.gIGomw/_new 2012-12-28 22:51:44.000000000 +0100 @@ -4,7 +4,7 @@ appres bdftopcf beforelight bitmap editres fonttosfnt fslsfonts fstobdf iceauth ico lbxproxy listres luit mkcomposecache mkfontdir mkfontscale oclock - proxymngr rendercheck rgb rstart sessreg setxkbmap showfont smproxy twm + proxymngr rendercheck rgb rstart sessreg setxkbmap showfont smproxy viewres x11perf xauth xbacklight xbiff xcalc xclipboard xclock xcmsdb xcompmgr xconsole xcursor-themes xcursorgen xdbedizzy xditview xdm xdpyinfo xedit xev xeyes xf86dga xfd xfindproxy xfontsel xfs xfsinfo xfwp xgamma xgc -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xmlstarlet for openSUSE:Factory
by root＠hilbert.suse.de 28 Dec '12

28 Dec '12

Hello community, here is the log from the commit of package xmlstarlet for openSUSE:Factory checked in at 2012-12-28 22:51:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xmlstarlet (Old) and /work/SRC/openSUSE:Factory/.xmlstarlet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xmlstarlet", Maintainer is "Thomas.Schraitle(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/xmlstarlet/xmlstarlet.changes 2012-10-26 17:37:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xmlstarlet.new/xmlstarlet.changes 2012-12-28 22:51:29.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Dec 16 02:32:36 UTC 2012 - pascal.bleser(a)opensuse.org + +- update to 1.4.1: + * avoid segfault when attempting to edit the document node + +------------------------------------------------------------------- Old: ---- xmlstarlet-1.4.0.tar.gz New: ---- xmlstarlet-1.4.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmlstarlet.spec ++++++ --- /var/tmp/diff_new_pack.c4vHkY/_old 2012-12-28 22:51:30.000000000 +0100 +++ /var/tmp/diff_new_pack.c4vHkY/_new 2012-12-28 22:51:30.000000000 +0100 @@ -29,7 +29,7 @@ Summary: Command Line Tool to Process XML Documents License: MIT Group: Productivity/Publishing/XML -Version: 1.4.0 +Version: 1.4.1 Release: 0 Source: http://prdownloads.sourceforge.net/xmlstar/xmlstarlet-%{version}.tar.gz Source1: %{name}-rpmlintrc ++++++ xmlstarlet-1.4.0.tar.gz -> xmlstarlet-1.4.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/Makefile.am new/xmlstarlet-1.4.1/Makefile.am --- old/xmlstarlet-1.4.0/Makefile.am 2012-08-26 16:31:10.000000000 +0200 +++ new/xmlstarlet-1.4.1/Makefile.am 2012-12-08 21:50:46.000000000 +0100 @@ -9,7 +9,11 @@ GIT_DESCRIBE = git describe --tags --dirty +# TODO: figure out why log removal is needed and/or make it completely automatic dist-hook: + @for log in $(srcdir)/examples/*.log ; do if [ -f "$$log" ] ; then \ + rm $(srcdir)/examples/*.log ; \ + echo 'ERROR: log files need to cleaned BEFORE making tarball, try again'; exit 1 ; fi ; done @ if [ -d .git ] ; then \ if [ $(VERSION) != `$(GIT_DESCRIBE)` ] ; then \ echo 'ERROR: version mismatch, rerun autoconf -f' ; exit 1 ; fi ; \ @@ -74,7 +78,7 @@ man_MANS = $(manpage) dist_doc_DATA = $(userguide_gen) doc/html.css $(txtguide) EXTRA_DIST += $(manpage_src) $(userguide_src) $(txtguide_src) -EXTRA_DIST += doc/replace-PROG-VERSION.xsl $(manpage) +EXTRA_DIST += $(buildfiles_docs) $(manpage) CLEANFILES = version.h $(generated_usage_sources) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/Makefile.in new/xmlstarlet-1.4.1/Makefile.in --- old/xmlstarlet-1.4.0/Makefile.in 2012-08-26 16:32:03.000000000 +0200 +++ new/xmlstarlet-1.4.1/Makefile.in 2012-12-08 21:51:07.000000000 +0100 @@ -175,6 +175,91 @@ blu='[1;34m'; \ std='[m'; \ } +# Restructured Text title and section. +am__rst_title = sed 's/.*/ & /;h;s/./=/g;p;x;p;g;p;s/.*//' +am__rst_section = sed 'p;s/./=/g;p;g' +# Put stdin (possibly several lines separated by ". ") in a box. +# Prefix each line by 'col' and terminate each with 'std', for coloring. +# Multi line coloring is problematic with "less -R", so we really need +# to color each line individually. +am__text_box = $(AWK) '{ \ + n = split($$0, lines, "\\. "); max = 0; \ + for (i = 1; i <= n; ++i) \ + if (max < length(lines[i])) \ + max = length(lines[i]); \ + for (i = 0; i < max; ++i) \ + line = line "="; \ + print col line std; \ + for (i = 1; i <= n; ++i) \ + if (lines[i]) \ + print col lines[i] std; \ + print col line std; \ +}' +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log, and passes +# TESTS_ENVIRONMENT. Save and restore TERM around use of +# TESTS_ENVIRONMENT, in case that unsets it. +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +srcdir=$(srcdir); export srcdir; \ +rm -f $@-t; \ +am__trap='rm -f '\''$(abs_builddir)/$@-t'\''; (exit $$st); exit $$st'; \ +trap "st=129; $$am__trap" 1; trap "st=130; $$am__trap" 2; \ +trap "st=141; $$am__trap" 13; trap "st=143; $$am__trap" 15; \ +am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`; \ +test "x$$am__odir" = x. || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; __SAVED_TERM=$$TERM; \ +$(TESTS_ENVIRONMENT) +# To be appended to the command running the test. Handle the stdout +# and stderr redirection, and catch the exit status. +am__check_post = \ +>$@-t 2>&1; \ +estatus=$$?; \ +if test -n '$(DISABLE_HARD_ERRORS)' \ + && test $$estatus -eq 99; then \ + estatus=1; \ +fi; \ +TERM=$$__SAVED_TERM; export TERM; \ +$(am__tty_colors); \ +xfailed=PASS; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + xfailed=XFAIL;; \ +esac; \ +case $$estatus.$$xfailed in \ + 0.XFAIL) col=$$red; res=XPASS;; \ + 0.*) col=$$grn; res=PASS ;; \ + 77.*) col=$$blu; res=SKIP ;; \ + 99.*) col=$$red; res=FAIL ;; \ + *.XFAIL) col=$$lgn; res=XFAIL;; \ + *.*) col=$$red; res=FAIL ;; \ +esac; \ +echo "$${col}$$res$${std}: $$f"; \ +echo "$$res: $$f (exit: $$estatus)" | \ + $(am__rst_section) >$@; \ +cat $@-t >>$@; \ +rm -f $@-t +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck check-html recheck-html +TEST_SUITE_HTML = $(TEST_SUITE_LOG:.log=.html) +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +TEST_LOGS_TMP = $(TEST_LOGS:.log=.log-t) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -234,8 +319,11 @@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PDF2PS = @PDF2PS@ SED = @SED@ @@ -302,14 +390,15 @@ top_srcdir = @top_srcdir@ EXTRA_DIST = Copyright examples solaris tests $(usage_texts) \ usage2c.awk $(manpage_src) $(userguide_src) $(txtguide_src) \ - doc/replace-PROG-VERSION.xsl $(manpage) + $(buildfiles_docs) $(manpage) WIN32_DIST = README TODO Copyright COPYING AUTHORS ChangeLog INSTALL NEWS xml.exe WIN32_doc_DIST = $(generated_docs) doc/html.css ACLOCAL_AMFLAGS = -I m4 @GCC_TRUE@AM_CFLAGS = -Wall -pedantic GIT_DESCRIBE = git describe --tags --dirty -TESTS_ENVIRONMENT = abs_builddir=$(abs_builddir) EXEEXT=$(EXEEXT) SED=$(SED) \ - $(srcdir)/tests/runTest.sh +LOG_COMPILER = abs_builddir=$(abs_builddir) \ +EXEEXT=$(EXEEXT) SED=$(SED) AWK=$(AWK) SHELL=$(SHELL) \ + $(SHELL) $(srcdir)/tests/runTest.sh # split tests into fast and slow, so we can run just the fast ones @@ -445,6 +534,7 @@ manpage = doc/xmlstarlet.1 manpage_src = doc/xmlstarlet-man.xml generated_docs = $(userguide_gen) $(txtguide) $(manpage) +buildfiles_docs = doc/replace-PROG-VERSION.xsl doc/xmlstar-fodoc-style.xsl DOCBOOK_PARAMS = \ --param section.autolabel 1 \ --stringparam generate.toc 'book toc,title' @@ -464,7 +554,7 @@ $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: -.SUFFIXES: .c .fo .html .o .obj .pdf .ps .txt .xml +.SUFFIXES: .c .fo .html .log .o .obj .pdf .ps .test .test$(EXEEXT) .txt .xml am--refresh: Makefile @: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/examples/tests.mk $(srcdir)/src/sources.mk $(srcdir)/doc/doc.mk $(am__configure_deps) @@ -827,98 +917,294 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ - fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ - else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ - fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ - else \ - skipped="($$skip tests were not run)"; \ +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__sh_e_setup); \ + list='$(TEST_LOGS)'; \ + results=`for f in $$list; do \ + test -r $$f && read line < $$f && echo "$$line" \ + || echo FAIL; \ + done`; \ + all=`echo "$$results" | sed '/^$$/d' | wc -l | sed -e 's/^[ ]*//'`; \ + fail=`echo "$$results" | grep -c '^FAIL'`; \ + pass=`echo "$$results" | grep -c '^PASS'`; \ + skip=`echo "$$results" | grep -c '^SKIP'`; \ + xfail=`echo "$$results" | grep -c '^XFAIL'`; \ + xpass=`echo "$$results" | grep -c '^XPASS'`; \ + failures=`expr $$fail + $$xpass`; \ + all=`expr $$all - $$skip`; \ + if test "$$all" -eq 1; then tests=test; All=; \ + else tests=tests; All="All "; fi; \ + case fail=$$fail:xpass=$$xpass:xfail=$$xfail in \ + fail=0:xpass=0:xfail=0) \ + msg="$$All$$all $$tests passed. "; \ + exit=true;; \ + fail=0:xpass=0:xfail=*) \ + msg="$$All$$all $$tests behaved as expected"; \ + if test "$$xfail" -eq 1; then xfailures=failure; \ + else xfailures=failures; fi; \ + msg="$$msg ($$xfail expected $$xfailures). "; \ + exit=true;; \ + fail=*:xpass=0:xfail=*) \ + msg="$$fail of $$all $$tests failed. "; \ + exit=false;; \ + fail=*:xpass=*:xfail=*) \ + msg="$$failures of $$all $$tests did not behave as expected"; \ + if test "$$xpass" -eq 1; then xpasses=pass; \ + else xpasses=passes; fi; \ + msg="$$msg ($$xpass unexpected $$xpasses). "; \ + exit=false;; \ + *) \ + echo >&2 "incorrect case"; exit 4;; \ + esac; \ + if test "$$skip" -ne 0; then \ + if test "$$skip" -eq 1; then \ + msg="$$msg($$skip test was not run). "; \ + else \ + msg="$$msg($$skip tests were not run). "; \ + fi; \ + fi; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + echo "$$msg"; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for f in $$list; do \ + test -r $$f && read line < $$f || line=; \ + case $$line in \ + PASS:*|XFAIL:*);; \ + *) echo; cat $$f;; \ + esac; \ + done; \ + } >$(TEST_SUITE_LOG).tmp; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if test "$$failures" -ne 0; then \ + msg="$${msg}See $(subdir)/$(TEST_SUITE_LOG). "; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + msg="$${msg}Please report to $(PACKAGE_BUGREPORT). "; \ + fi; \ + fi; \ + test x"$$VERBOSE" = x || $$exit || cat $(TEST_SUITE_LOG); \ + $(am__tty_colors); \ + if $$exit; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + fi; \ + echo "$$msg" | $(am__text_box) "col=$$col" "std=$$std"; \ + $$exit || exit 1 + +check-TESTS recheck: + @if test $@ != recheck; then \ + list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list; \ + fi + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @list='' list2='$(TEST_LOGS)'; for f in $$list2; do \ + test .log = $$f && continue; \ + if test $@ = recheck; then \ + test -f $$f || continue; \ + if test -r $$f && read line < $$f; then \ + case $$line in FAIL*|XPASS*) : ;; *) continue;; esac; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi + if test -z "$$list"; then list=$$f; else list="$$list $$f"; fi; \ + done; \ + if test $@ = recheck && test -n "$$list"; then \ + $(am__make_dryrun) || rm -f $$list || exit 1; \ + fi; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$list" +recheck: + +am--mostlyclean-test-html: + list='$(TEST_LOGS:.log=.html)'; test -z "$$list" || rm -f $$list + rm -f $(TEST_SUITE_HTML) + +.log.html: + @list='$(RST2HTML) $$RST2HTML rst2html rst2html.py'; \ + for r2h in $$list; do \ + if ($$r2h --version) >/dev/null 2>&1; then \ + R2H=$$r2h; \ + fi; \ + done; \ + if test -z "$$R2H"; then \ + echo >&2 "cannot find rst2html, cannot create $@"; \ + exit 2; \ + fi; \ + $$R2H $< >$@.tmp + @mv $@.tmp $@ + +# Be sure to run check first, and then to convert the result. +# Beware of concurrent executions. Run "check" not "check-TESTS", as +# check-SCRIPTS and other dependencies are rebuilt by the former only. +# And expect check to fail. +check-html recheck-html: + @target=`echo $@ | sed 's/-html$$//'`; \ + rv=0; $(MAKE) $(AM_MAKEFLAGS) $$target || rv=$$?; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_HTML) TEST_LOGS= || exit 4; \ + exit $$rv +examples/bigxml-dtd.log: examples/bigxml-dtd + @p='examples/bigxml-dtd'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/bigxml-embed-ref.log: examples/bigxml-embed-ref + @p='examples/bigxml-embed-ref'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/bigxml-embed.log: examples/bigxml-embed + @p='examples/bigxml-embed'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/bigxml-relaxng.log: examples/bigxml-relaxng + @p='examples/bigxml-relaxng'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/bigxml-well-formed.log: examples/bigxml-well-formed + @p='examples/bigxml-well-formed'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/bigxml-xsd.log: examples/bigxml-xsd + @p='examples/bigxml-xsd'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/c14n-default-attr.log: examples/c14n-default-attr + @p='examples/c14n-default-attr'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/c14n-newlines.log: examples/c14n-newlines + @p='examples/c14n-newlines'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/c14n1.log: examples/c14n1 + @p='examples/c14n1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/c14n2.log: examples/c14n2 + @p='examples/c14n2'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/command-help.log: examples/command-help + @p='examples/command-help'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/count1.log: examples/count1 + @p='examples/count1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/countnode1.log: examples/countnode1 + @p='examples/countnode1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/delete1.log: examples/delete1 + @p='examples/delete1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/dtd1.log: examples/dtd1 + @p='examples/dtd1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/dtd2.log: examples/dtd2 + @p='examples/dtd2'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/dtd3.log: examples/dtd3 + @p='examples/dtd3'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/dtd4.log: examples/dtd4 + @p='examples/dtd4'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/ed-2op.log: examples/ed-2op + @p='examples/ed-2op'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/ed-append.log: examples/ed-append + @p='examples/ed-append'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/ed-backref-delete.log: examples/ed-backref-delete + @p='examples/ed-backref-delete'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/ed-backref1.log: examples/ed-backref1 + @p='examples/ed-backref1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/ed-backref2.log: examples/ed-backref2 + @p='examples/ed-backref2'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/ed-expr.log: examples/ed-expr + @p='examples/ed-expr'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/ed-insert.log: examples/ed-insert + @p='examples/ed-insert'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/ed-literal.log: examples/ed-literal + @p='examples/ed-literal'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/ed-move.log: examples/ed-move + @p='examples/ed-move'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/ed-namespace.log: examples/ed-namespace + @p='examples/ed-namespace'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/ed-nop.log: examples/ed-nop + @p='examples/ed-nop'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/ed-subnode.log: examples/ed-subnode + @p='examples/ed-subnode'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/elem1.log: examples/elem1 + @p='examples/elem1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/elem2.log: examples/elem2 + @p='examples/elem2'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/elem3.log: examples/elem3 + @p='examples/elem3'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/elem-depth.log: examples/elem-depth + @p='examples/elem-depth'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/elem-uniq.log: examples/elem-uniq + @p='examples/elem-uniq'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/escape1.log: examples/escape1 + @p='examples/escape1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/exslt-ed.log: examples/exslt-ed + @p='examples/exslt-ed'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/exslt1.log: examples/exslt1 + @p='examples/exslt1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/external-entity.log: examples/external-entity + @p='examples/external-entity'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/findfile1.log: examples/findfile1 + @p='examples/findfile1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/genxml1.log: examples/genxml1 + @p='examples/genxml1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/hello1.log: examples/hello1 + @p='examples/hello1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/localname1.log: examples/localname1 + @p='examples/localname1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/look1.log: examples/look1 + @p='examples/look1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/move1.log: examples/move1 + @p='examples/move1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/N-order.log: examples/N-order + @p='examples/N-order'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/noindent1.log: examples/noindent1 + @p='examples/noindent1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/ns1.log: examples/ns1 + @p='examples/ns1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/pyx.log: examples/pyx + @p='examples/pyx'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/pyx-ns.log: examples/pyx-ns + @p='examples/pyx-ns'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/recover1.log: examples/recover1 + @p='examples/recover1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/rename-attr1.log: examples/rename-attr1 + @p='examples/rename-attr1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/rename-elem1.log: examples/rename-elem1 + @p='examples/rename-elem1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/schema1.log: examples/schema1 + @p='examples/schema1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/sel-literal.log: examples/sel-literal + @p='examples/sel-literal'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/sel-if.log: examples/sel-if + @p='examples/sel-if'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/sel-many-values.log: examples/sel-many-values + @p='examples/sel-many-values'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/sel-root.log: examples/sel-root + @p='examples/sel-root'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/sel-xpath-c.log: examples/sel-xpath-c + @p='examples/sel-xpath-c'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/sel-xpath-i.log: examples/sel-xpath-i + @p='examples/sel-xpath-i'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/sel-xpath-m.log: examples/sel-xpath-m + @p='examples/sel-xpath-m'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/sel-xpath-v.log: examples/sel-xpath-v + @p='examples/sel-xpath-v'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/sel1.log: examples/sel1 + @p='examples/sel1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/sort1.log: examples/sort1 + @p='examples/sort1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/sort2.log: examples/sort2 + @p='examples/sort2'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/sort3.log: examples/sort3 + @p='examples/sort3'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/structure1.log: examples/structure1 + @p='examples/structure1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/sum1.log: examples/sum1 + @p='examples/sum1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/tab1.log: examples/tab1 + @p='examples/tab1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/table1.log: examples/table1 + @p='examples/table1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/table2.log: examples/table2 + @p='examples/table2'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/table3.log: examples/table3 + @p='examples/table3'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/unicode1.log: examples/unicode1 + @p='examples/unicode1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/update-attr1.log: examples/update-attr1 + @p='examples/update-attr1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/update-elem1.log: examples/update-elem1 + @p='examples/update-elem1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/valid1.log: examples/valid1 + @p='examples/valid1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/xinclude1.log: examples/xinclude1 + @p='examples/xinclude1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/xsl-param1.log: examples/xsl-param1 + @p='examples/xsl-param1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +examples/xsl-sum1.log: examples/xsl-sum1 + @p='examples/xsl-sum1'; $(am__check_pre) $(LOG_COMPILE) "$$tst" $(am__check_post) +.test.log: + @p='$<'; $(am__check_pre) $(TEST_LOG_COMPILE) "$$tst" $(am__check_post) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; $(am__check_pre) $(TEST_LOG_COMPILE) "$$tst" $(am__check_post) distdir: $(DISTFILES) @list='$(MANS)'; if test -n "$$list"; then \ @@ -1126,6 +1412,9 @@ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS_TMP)" || rm -f $(TEST_LOGS_TMP) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -1200,7 +1489,8 @@ mostlyclean: mostlyclean-am -mostlyclean-am: mostlyclean-compile mostlyclean-generic +mostlyclean-am: am--mostlyclean-test-html mostlyclean-compile \ + mostlyclean-generic pdf: pdf-am @@ -1215,28 +1505,33 @@ uninstall-man: uninstall-man1 -.MAKE: all check-am install-am install-strip +.MAKE: all check-am check-html install-am install-strip recheck-html -.PHONY: CTAGS GTAGS all all-am am--refresh check check-TESTS check-am \ - clean clean-binPROGRAMS clean-generic ctags dist dist-all \ - dist-bzip2 dist-gzip dist-hook dist-lzip dist-lzma dist-shar \ - dist-tarZ dist-xz dist-zip distcheck distclean \ - distclean-compile distclean-generic distclean-hdr \ - distclean-tags distcleancheck distdir distuninstallcheck dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am \ - install-dist_docDATA install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-man1 install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installcheck-binPROGRAMS \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ - ps ps-am tags uninstall uninstall-am uninstall-binPROGRAMS \ +.PHONY: CTAGS GTAGS all all-am am--mostlyclean-test-html am--refresh \ + check check-TESTS check-am check-html clean clean-binPROGRAMS \ + clean-generic ctags dist dist-all dist-bzip2 dist-gzip \ + dist-hook dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \ + dist-zip distcheck distclean distclean-compile \ + distclean-generic distclean-hdr distclean-tags distcleancheck \ + distdir distuninstallcheck dvi dvi-am html html-am info \ + info-am install install-am install-binPROGRAMS install-data \ + install-data-am install-dist_docDATA install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-man1 install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installcheck-binPROGRAMS installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic pdf pdf-am ps ps-am recheck recheck-html \ + tags uninstall uninstall-am uninstall-binPROGRAMS \ uninstall-dist_docDATA uninstall-man uninstall-man1 +# TODO: figure out why log removal is needed and/or make it completely automatic dist-hook: + @for log in $(srcdir)/examples/*.log ; do if [ -f "$$log" ] ; then \ + rm $(srcdir)/examples/*.log ; \ + echo 'ERROR: log files need to cleaned BEFORE making tarball, try again'; exit 1 ; fi ; done @ if [ -d .git ] ; then \ if [ $(VERSION) != `$(GIT_DESCRIBE)` ] ; then \ echo 'ERROR: version mismatch, rerun autoconf -f' ; exit 1 ; fi ; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/NEWS new/xmlstarlet-1.4.1/NEWS --- old/xmlstarlet-1.4.0/NEWS 2012-08-26 16:31:10.000000000 +0200 +++ new/xmlstarlet-1.4.1/NEWS 2012-12-08 23:31:43.000000000 +0100 @@ -1,3 +1,27 @@ +1.4.1: Dec 8, 2012 + + - avoid segfault when attempting to edit the document node (Bug + #3575722) + + - Packaging: + - include doc/xmlstar-fodoc-style.xsl in the dist so that the + --enable-build-docs option works from the tarball (Bug + #3580667) + - AC_SUBST PACKAGE_TARNAME for automake so that documentation is + installed to the right place (Bug #3561958) + + - Test Suite: + - avoid test failures due to XML formatting and whitespace + changes (also fixes Bug #3572789) + - use automake's parallel test suite + - make bigxml tests much faster by using whitespace instead of nodes + - don't test str:replace() with ed: it doesn't work outside of + xslt in new libxslt + - ignore extra errors from libxml 2.9.0 bug + - let tests run using busybox + - add runAllTests.sh to run tests without make + + 1.4.0: Aug 26, 2012 - Documentation: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/configure new/xmlstarlet-1.4.1/configure --- old/xmlstarlet-1.4.0/configure 2012-08-26 16:31:57.000000000 +0200 +++ new/xmlstarlet-1.4.1/configure 2012-12-08 23:32:36.000000000 +0100 @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac 1.4.0. +# From configure.ac 1.4.1. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for XMLStarlet 1.4.0. +# Generated by GNU Autoconf 2.69 for XMLStarlet 1.4.1. # # Report bugs to <http://sourceforge.net/projects/xmlstar/support>. # @@ -641,8 +641,8 @@ # Identity of this package. PACKAGE_NAME='XMLStarlet' PACKAGE_TARNAME='xmlstarlet' -PACKAGE_VERSION='1.4.0' -PACKAGE_STRING='XMLStarlet 1.4.0' +PACKAGE_VERSION='1.4.1' +PACKAGE_STRING='XMLStarlet 1.4.1' PACKAGE_BUGREPORT='http://sourceforge.net/projects/xmlstar/support' PACKAGE_URL='http://xmlstar.sourceforge.net/' @@ -1379,7 +1379,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 XMLStarlet 1.4.0 to adapt to many kinds of systems. +\`configure' configures XMLStarlet 1.4.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1449,7 +1449,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of XMLStarlet 1.4.0:";; + short | recursive ) echo "Configuration of XMLStarlet 1.4.1:";; esac cat <<\_ACEOF @@ -1570,7 +1570,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -XMLStarlet configure 1.4.0 +XMLStarlet configure 1.4.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2039,7 +2039,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by XMLStarlet $as_me 1.4.0, which was +It was created by XMLStarlet $as_me 1.4.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2859,7 +2859,7 @@ # Define the identity of the package. PACKAGE='xmlstarlet' - VERSION='1.4.0' + VERSION='1.4.1' # Some tools Automake needs. @@ -6679,7 +6679,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by XMLStarlet $as_me 1.4.0, which was +This file was extended by XMLStarlet $as_me 1.4.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6746,7 +6746,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -XMLStarlet config.status 1.4.0 +XMLStarlet config.status 1.4.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/configure.ac new/xmlstarlet-1.4.1/configure.ac --- old/xmlstarlet-1.4.0/configure.ac 2012-08-26 18:58:05.000000000 +0200 +++ new/xmlstarlet-1.4.1/configure.ac 2012-12-08 23:32:54.000000000 +0100 @@ -1,11 +1,11 @@ AC_PREREQ([2.62]) -AC_INIT([XMLStarlet], [1.4.0], +AC_INIT([XMLStarlet], [1.4.1], [http://sourceforge.net/projects/xmlstar/support], [], [http://xmlstar.sourceforge.net/]) AC_REVISION(AC_PACKAGE_VERSION) -AM_INIT_AUTOMAKE([1.11 foreign -Wall subdir-objects no-define std-options color-tests]) +AM_INIT_AUTOMAKE([1.11 foreign -Wall subdir-objects no-define std-options parallel-tests color-tests]) AM_SILENT_RULES([yes]) AM_MAINTAINER_MODE @@ -167,9 +167,9 @@ np_SILENT_RULE([FOP]) np_SILENT_RULE([DOCBOOK], [DBOOK]) -AM_SUBST_NOTMAKE(PACKAGE_NAME) -AM_SUBST_NOTMAKE(PACKAGE_TARNAME) -AM_SUBST_NOTMAKE(PACKAGE_VERSION) +AC_SUBST(PACKAGE_NAME) +AC_SUBST(PACKAGE_TARNAME) +AC_SUBST(PACKAGE_VERSION) AC_DEFINE([_XOPEN_SOURCE], [500], [needed to get lstat declaration in -ansi mode]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/doc/doc.mk new/xmlstarlet-1.4.1/doc/doc.mk --- old/xmlstarlet-1.4.0/doc/doc.mk 2012-08-15 18:42:12.000000000 +0200 +++ new/xmlstarlet-1.4.1/doc/doc.mk 2012-11-14 03:01:11.000000000 +0100 @@ -9,6 +9,7 @@ manpage_src = doc/xmlstarlet-man.xml generated_docs = $(userguide_gen) $(txtguide) $(manpage) +buildfiles_docs = doc/replace-PROG-VERSION.xsl doc/xmlstar-fodoc-style.xsl DOCBOOK_PARAMS = \ --param section.autolabel 1 \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/doc/xmlstar-fodoc-style.xsl new/xmlstarlet-1.4.1/doc/xmlstar-fodoc-style.xsl --- old/xmlstarlet-1.4.0/doc/xmlstar-fodoc-style.xsl 1970-01-01 01:00:00.000000000 +0100 +++ new/xmlstarlet-1.4.1/doc/xmlstar-fodoc-style.xsl 2012-06-18 00:05:16.000000000 +0200 @@ -0,0 +1,17 @@ +<?xml version='1.0'?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> + + <xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/fo/docbook.xsl"/> + + <xsl:param name="fop1.extensions" select="1"/> + + <xsl:attribute-set name="toc.line.properties"> + <xsl:attribute name="font-weight"> + <xsl:choose> + <xsl:when test="self::chapter">bold</xsl:when> + <xsl:otherwise>normal</xsl:otherwise> + </xsl:choose> + </xsl:attribute> + </xsl:attribute-set> + +</xsl:stylesheet> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/examples/bigxml new/xmlstarlet-1.4.1/examples/bigxml --- old/xmlstarlet-1.4.0/examples/bigxml 2011-12-31 19:54:15.000000000 +0100 +++ new/xmlstarlet-1.4.1/examples/bigxml 2012-11-14 03:01:11.000000000 +0100 @@ -11,7 +11,7 @@ echo '<?xml version="1.0"?>' [ -n "$DOCTYPE" ] && echo "$DOCTYPE" echo '<root>' - awk 'BEGIN{for(i=0; i < 69999; i++) print "<a/>"}' < /dev/null + ${AWK:-awk} 'BEGIN{for(i=0; i < 69999; i++) print ""}' < /dev/null echo "$BAD" echo '</root>' } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/examples/bigxml-embed-ref new/xmlstarlet-1.4.1/examples/bigxml-embed-ref --- old/xmlstarlet-1.4.0/examples/bigxml-embed-ref 2011-05-23 22:45:02.000000000 +0200 +++ new/xmlstarlet-1.4.1/examples/bigxml-embed-ref 2012-11-14 03:01:11.000000000 +0100 @@ -2,4 +2,6 @@ . ./bigxml xmldoc '<a>foo</a>' '<!DOCTYPE root SYSTEM "dtd/bigxml.dtd">' \ | ./xmlstarlet val --embed --err - 2>&1 >/dev/null \ - | ${SED:-sed} -n "$SEDLINUM_PROG" + | ${SED:-sed} -n "$SEDLINUM_PROG" \ + | head -n 1 # a bug in libxml 2.9.0 causes extra errors to be + # printed, so we take just the first diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/examples/count1 new/xmlstarlet-1.4.1/examples/count1 --- old/xmlstarlet-1.4.0/examples/count1 2011-05-23 22:45:02.000000000 +0200 +++ new/xmlstarlet-1.4.1/examples/count1 2012-11-14 03:01:11.000000000 +0100 @@ -1,3 +1,3 @@ #!/bin/sh # Count elements matching XPath expression -./xmlstarlet sel -t -v "count(/xml/table/rec/numField)" xml/table.xml +./xmlstarlet sel -T -t -v "count(/xml/table/rec/numField)" xml/table.xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/examples/countnode1 new/xmlstarlet-1.4.1/examples/countnode1 --- old/xmlstarlet-1.4.0/examples/countnode1 2011-05-23 22:45:02.000000000 +0200 +++ new/xmlstarlet-1.4.1/examples/countnode1 2012-11-14 03:01:11.000000000 +0100 @@ -1,3 +1,3 @@ #!/bin/sh # Count all nodes in XML document -./xmlstarlet sel -t -f -o " " -v "count(//node())" xml/table.xml xml/tab-obj.xml +./xmlstarlet sel -T -t -f -o " " -v "count(//node())" --nl xml/table.xml xml/tab-obj.xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/examples/delete1 new/xmlstarlet-1.4.1/examples/delete1 --- old/xmlstarlet-1.4.0/examples/delete1 2011-05-23 22:45:02.000000000 +0200 +++ new/xmlstarlet-1.4.1/examples/delete1 2012-11-14 03:01:11.000000000 +0100 @@ -1,3 +1,3 @@ #!/bin/sh # Delete elements matching XPath expression -./xmlstarlet ed -d /xml/table/rec[@id='2'] xml/table.xml +./xmlstarlet ed -d '/xml/table/rec[@id="2"]' xml/table.xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/examples/ed-backref2 new/xmlstarlet-1.4.1/examples/ed-backref2 --- old/xmlstarlet-1.4.0/examples/ed-backref2 2012-08-12 18:04:49.000000000 +0200 +++ new/xmlstarlet-1.4.1/examples/ed-backref2 2012-11-14 03:01:11.000000000 +0100 @@ -4,4 +4,4 @@ --var new-field '$prev' \ -i '$new-field' -t attr -n new-attr -v new-attr-value \ -s '$new-field' -t elem -n new-subelem -v '' \ - xml/table.xml + xml/table.xml | ./xmlstarlet c14n diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/examples/exslt-ed new/xmlstarlet-1.4.1/examples/exslt-ed --- old/xmlstarlet-1.4.0/examples/exslt-ed 2012-02-19 16:02:07.000000000 +0100 +++ new/xmlstarlet-1.4.1/examples/exslt-ed 2012-11-14 03:01:12.000000000 +0100 @@ -3,4 +3,3 @@ echo '<x/>' | ./xmlstarlet ed -O -u /x -x 'date:day-name("2011-09-24")' echo '<x/>' | ./xmlstarlet ed -O -u /x -x 'math:abs(-1000)' echo '<x><n>a</n><n>b</n><n>a</n></x>' | ./xmlstarlet ed -O -u /x -x 'count(set:distinct(/x/*))' -echo '<x>abc</x>' | ./xmlstarlet ed -O -u /x -x 'str:replace(., "b", "BEE")' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/examples/exslt1 new/xmlstarlet-1.4.1/examples/exslt1 --- old/xmlstarlet-1.4.0/examples/exslt1 2011-05-23 22:45:02.000000000 +0200 +++ new/xmlstarlet-1.4.1/examples/exslt1 2012-11-14 03:01:12.000000000 +0100 @@ -1,3 +1,3 @@ #!/bin/sh # Calculate EXSLT (XSLT extentions) XPath value -echo "<x/>" | ./xmlstarlet sel -t -v "math:abs(-1000)" +echo "<x/>" | ./xmlstarlet sel -T -t -v "math:abs(-1000)" --nl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/examples/external-entity new/xmlstarlet-1.4.1/examples/external-entity --- old/xmlstarlet-1.4.0/examples/external-entity 2012-02-19 16:02:09.000000000 +0100 +++ new/xmlstarlet-1.4.1/examples/external-entity 2012-11-14 03:01:12.000000000 +0100 @@ -1,3 +1,4 @@ #!/bin/sh -./xmlstarlet sel -t -c //foo xml/external-pe.xml -./xmlstarlet sel -t -v //foo xml/external-pe.xml +./xmlstarlet sel -t -c //foo xml/external-pe.xml | ./xmlstarlet c14n +echo +./xmlstarlet sel -T -t -v //foo --nl xml/external-pe.xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/examples/findfile1 new/xmlstarlet-1.4.1/examples/findfile1 --- old/xmlstarlet-1.4.0/examples/findfile1 2011-05-23 22:45:02.000000000 +0200 +++ new/xmlstarlet-1.4.1/examples/findfile1 2012-11-14 03:01:12.000000000 +0100 @@ -1,3 +1,3 @@ #!/bin/sh # Find XML files matching XPath expression (containing 'object' element) -./xmlstarlet sel -t -m //object -f xml/table.xml xml/tab-obj.xml +./xmlstarlet sel -T -t -m //object -f --nl xml/table.xml xml/tab-obj.xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/examples/foreach-literal.sh new/xmlstarlet-1.4.1/examples/foreach-literal.sh --- old/xmlstarlet-1.4.0/examples/foreach-literal.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/xmlstarlet-1.4.1/examples/foreach-literal.sh 2012-11-14 03:01:12.000000000 +0100 @@ -0,0 +1,8 @@ +#!/bin/sh +the_test abc +the_test "a'c" +the_test 'a"c' +the_test a\'\"c +the_test \"\'a\'b\"\" +the_test '!@#$%^&*()_+-=~`\|'\''";:/?.>,<[]{}' +the_test ']]>' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/examples/foreach-xpath.sh new/xmlstarlet-1.4.1/examples/foreach-xpath.sh --- old/xmlstarlet-1.4.0/examples/foreach-xpath.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/xmlstarlet-1.4.1/examples/foreach-xpath.sh 2012-11-14 03:01:12.000000000 +0100 @@ -0,0 +1,8 @@ +#!/bin/sh +the_test "'abc'" +the_test \"a\'c\" +the_test \'a\"c\' +the_test 'concat("a'\''", '\'\"c\'\) +the_test 'concat('\'\"\',\ \"\'a\'b\",\ \'\"\"\'\) +the_test 'concat("!@#$%^&*()_+-=~`\|'\'\",\''";:/?.>,<[]{}'\'\) +the_test '"]]>"' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/examples/genxml1 new/xmlstarlet-1.4.1/examples/genxml1 --- old/xmlstarlet-1.4.0/examples/genxml1 2011-05-23 22:45:02.000000000 +0200 +++ new/xmlstarlet-1.4.1/examples/genxml1 2012-11-14 03:01:12.000000000 +0100 @@ -1,3 +1,4 @@ #!/bin/sh # Generate XML document using command line xml sel -echo "<x/>" | ./xmlstarlet sel -t -m / -e xml -e child -a data -o value +echo "<x/>" | ./xmlstarlet sel -t -m / -e xml -e child -a data -o value | ./xmlstarlet c14n +echo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/examples/localname1 new/xmlstarlet-1.4.1/examples/localname1 --- old/xmlstarlet-1.4.0/examples/localname1 2011-05-23 22:45:02.000000000 +0200 +++ new/xmlstarlet-1.4.1/examples/localname1 2012-11-14 03:01:12.000000000 +0100 @@ -1,3 +1,3 @@ #!/bin/sh # Use local-name() XSLT function in XPath expression -./xmlstarlet sel -t -v "//*[local-name()='query']" xsql/jobserve.xsql +./xmlstarlet sel -T -t -v "//*[local-name()='query']" --nl xsql/jobserve.xsql diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/examples/look1 new/xmlstarlet-1.4.1/examples/look1 --- old/xmlstarlet-1.4.0/examples/look1 2011-05-23 22:45:02.000000000 +0200 +++ new/xmlstarlet-1.4.1/examples/look1 2012-11-14 03:01:12.000000000 +0100 @@ -1,3 +1,3 @@ #!/bin/sh # Select text value of an XML element mathing given XPath expression -./xmlstarlet sel -t -m "/xml/table/rec[@id='2']" -v numField xml/table.xml +./xmlstarlet sel -T -t -m "/xml/table/rec[@id='2']" -v numField --nl xml/table.xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/examples/ns1 new/xmlstarlet-1.4.1/examples/ns1 --- old/xmlstarlet-1.4.0/examples/ns1 2011-05-23 22:45:02.000000000 +0200 +++ new/xmlstarlet-1.4.1/examples/ns1 2012-11-14 03:01:12.000000000 +0100 @@ -1,3 +1,3 @@ #!/bin/sh # Predefine namespaces for XPath expressions -./xmlstarlet sel -N xsql=urn:oracle-xsql -t -v /xsql:query xsql/jobserve.xsql +./xmlstarlet sel -T -N xsql=urn:oracle-xsql -t -v /xsql:query --nl xsql/jobserve.xsql diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/examples/results/count1.out new/xmlstarlet-1.4.1/examples/results/count1.out --- old/xmlstarlet-1.4.0/examples/results/count1.out 2010-11-11 00:42:26.000000000 +0100 +++ new/xmlstarlet-1.4.1/examples/results/count1.out 2012-11-14 03:01:12.000000000 +0100 @@ -1 +1 @@ -3 +3 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/examples/results/ed-backref2.out new/xmlstarlet-1.4.1/examples/results/ed-backref2.out --- old/xmlstarlet-1.4.0/examples/results/ed-backref2.out 2012-08-12 18:06:45.000000000 +0200 +++ new/xmlstarlet-1.4.1/examples/results/ed-backref2.out 2012-11-14 03:01:12.000000000 +0100 @@ -1,20 +1,19 @@ -<?xml version="1.0"?> <xml> <table> <rec id="1"> <numField>123</numField> <stringField>String Value</stringField> - <new-field new-attr="new-attr-value">new-value<new-subelem/></new-field> + <new-field new-attr="new-attr-value">new-value<new-subelem></new-subelem></new-field> </rec> <rec id="2"> <numField>346</numField> <stringField>Text Value</stringField> - <new-field new-attr="new-attr-value">new-value<new-subelem/></new-field> + <new-field new-attr="new-attr-value">new-value<new-subelem></new-subelem></new-field> </rec> <rec id="3"> <numField>-23</numField> <stringField>stringValue</stringField> - <new-field new-attr="new-attr-value">new-value<new-subelem/></new-field> + <new-field new-attr="new-attr-value">new-value<new-subelem></new-subelem></new-field> </rec> </table> -</xml> +</xml> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/examples/results/exslt-ed.out new/xmlstarlet-1.4.1/examples/results/exslt-ed.out --- old/xmlstarlet-1.4.0/examples/results/exslt-ed.out 2012-02-19 16:02:07.000000000 +0100 +++ new/xmlstarlet-1.4.1/examples/results/exslt-ed.out 2012-11-14 03:01:12.000000000 +0100 @@ -1,4 +1,3 @@ <x>Saturday</x> <x>1000</x> <x>2</x> -<x>aBEEc</x> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/examples/results/genxml1.out new/xmlstarlet-1.4.1/examples/results/genxml1.out --- old/xmlstarlet-1.4.0/examples/results/genxml1.out 2010-11-11 00:42:26.000000000 +0100 +++ new/xmlstarlet-1.4.1/examples/results/genxml1.out 2012-11-14 03:01:12.000000000 +0100 @@ -1 +1 @@ -<xml><child data="value"/></xml> +<xml><child data="value"></child></xml> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/examples/results/sel-root.out new/xmlstarlet-1.4.1/examples/results/sel-root.out --- old/xmlstarlet-1.4.0/examples/results/sel-root.out 2011-05-23 22:45:02.000000000 +0200 +++ new/xmlstarlet-1.4.1/examples/results/sel-root.out 2012-11-14 03:01:12.000000000 +0100 @@ -1,2 +1,2 @@ -<xsl-select><x/></xsl-select> -<xsl-select><x/><x/></xsl-select> +<xsl-select><x></x></xsl-select> +<xsl-select><x></x><x></x></xsl-select> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/examples/results/sel1.out new/xmlstarlet-1.4.1/examples/results/sel1.out --- old/xmlstarlet-1.4.0/examples/results/sel1.out 2010-11-11 00:42:26.000000000 +0100 +++ new/xmlstarlet-1.4.1/examples/results/sel1.out 2012-11-14 03:01:12.000000000 +0100 @@ -1,4 +1,4 @@ -<rec id="1"><numField>123</numField><stringField>String Value</stringField></rec> +<ROOT><rec id="1"><numField>123</numField><stringField>String Value</stringField></rec> <rec id="2"><numField>346</numField><stringField>Text Value</stringField></rec> <rec id="3"><numField>-23</numField><stringField>stringValue</stringField></rec> - +</ROOT> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/examples/results/xinclude1.out new/xmlstarlet-1.4.1/examples/results/xinclude1.out --- old/xmlstarlet-1.4.0/examples/results/xinclude1.out 2010-11-11 00:42:26.000000000 +0100 +++ new/xmlstarlet-1.4.1/examples/results/xinclude1.out 2012-11-14 03:01:12.000000000 +0100 @@ -1,4 +1,3 @@ -<?xml version="1.0" encoding="utf-8"?> <document xmlns:xi="http://www.w3.org/2003/XInclude"> 120 Mz is adequate for an average home user. <disclaimer> @@ -6,4 +5,4 @@ and should not be interpreted as official policy endorsed by this organization. </disclaimer> -</document> +</document> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/examples/sel-literal new/xmlstarlet-1.4.1/examples/sel-literal --- old/xmlstarlet-1.4.0/examples/sel-literal 2011-05-23 22:45:02.000000000 +0200 +++ new/xmlstarlet-1.4.1/examples/sel-literal 2012-12-08 23:28:19.000000000 +0100 @@ -1,4 +1,6 @@ #!/bin/sh +the_test() { + ./xmlstarlet sel --text -t -m /doc -o "$1" --nl xml/foo.xml +} -${SED:-sed} "s/[\\'\"]/\\\&/g" < results/sel-literal.out | xargs -I LIT \ - ./xmlstarlet sel --text -t -m /doc -o LIT --nl xml/foo.xml +. "${srcdir-..}"/examples/foreach-literal.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/examples/sel-root new/xmlstarlet-1.4.1/examples/sel-root --- old/xmlstarlet-1.4.0/examples/sel-root 2011-05-23 22:45:02.000000000 +0200 +++ new/xmlstarlet-1.4.1/examples/sel-root 2012-11-14 03:01:12.000000000 +0100 @@ -1,3 +1,5 @@ #!/bin/sh -echo '<x/>' | ./xmlstarlet sel --root -t -c / -echo '<x/>' | ./xmlstarlet sel --root -t -c / -t -c / +echo '<x/>' | ./xmlstarlet sel --root -t -c / | ./xmlstarlet c14n +echo +echo '<x/>' | ./xmlstarlet sel --root -t -c / -t -c / | ./xmlstarlet c14n +echo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/examples/sel-xpath-c new/xmlstarlet-1.4.1/examples/sel-xpath-c --- old/xmlstarlet-1.4.0/examples/sel-xpath-c 2011-05-23 22:45:02.000000000 +0200 +++ new/xmlstarlet-1.4.1/examples/sel-xpath-c 2012-12-08 21:24:33.000000000 +0100 @@ -1,4 +1,6 @@ #!/bin/sh +the_test() { + ./xmlstarlet sel --text -t -m /doc -c "$1" --nl xml/foo.xml +} -${SED:-sed} "s/[\\'\"]/\\\&/g" < sel-xpath.input | xargs -I XPATH \ - ./xmlstarlet sel --text -t -m /doc -c XPATH --nl xml/foo.xml +. "${srcdir-..}"/examples/foreach-xpath.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/examples/sel-xpath-i new/xmlstarlet-1.4.1/examples/sel-xpath-i --- old/xmlstarlet-1.4.0/examples/sel-xpath-i 2011-05-23 22:45:02.000000000 +0200 +++ new/xmlstarlet-1.4.1/examples/sel-xpath-i 2012-12-08 21:24:55.000000000 +0100 @@ -1,4 +1,6 @@ #!/bin/sh +the_test() { + ./xmlstarlet sel --text -t -i "$1" -v "$1" --nl xml/foo.xml +} -${SED:-sed} "s/[\\'\"]/\\\&/g" < sel-xpath.input | xargs -I XPATH \ - ./xmlstarlet sel --text -t -i XPATH -v XPATH --nl xml/foo.xml +. "${srcdir-..}"/examples/foreach-xpath.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/examples/sel-xpath-m new/xmlstarlet-1.4.1/examples/sel-xpath-m --- old/xmlstarlet-1.4.0/examples/sel-xpath-m 2011-05-23 22:45:02.000000000 +0200 +++ new/xmlstarlet-1.4.1/examples/sel-xpath-m 2012-12-08 21:25:04.000000000 +0100 @@ -1,4 +1,6 @@ #!/bin/sh +the_test() { + ./xmlstarlet sel --text -t -m "/*[boolean($1)]" -v "$1" --nl xml/foo.xml +} -${SED:-sed} "s/[\\'\"]/\\\&/g" < sel-xpath.input | xargs -I XPATH \ - ./xmlstarlet sel --text -t -m '/*[boolean(XPATH)]' -v XPATH --nl xml/foo.xml +. "${srcdir-..}"/examples/foreach-xpath.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/examples/sel-xpath-v new/xmlstarlet-1.4.1/examples/sel-xpath-v --- old/xmlstarlet-1.4.0/examples/sel-xpath-v 2011-05-23 22:45:02.000000000 +0200 +++ new/xmlstarlet-1.4.1/examples/sel-xpath-v 2012-12-08 21:25:12.000000000 +0100 @@ -1,4 +1,6 @@ #!/bin/sh +the_test() { + ./xmlstarlet sel --text -t -m /doc -v "$1" --nl xml/foo.xml +} -${SED:-sed} "s/[\\'\"]/\\\&/g" < sel-xpath.input | xargs -I XPATH \ - ./xmlstarlet sel --text -t -m /doc -v XPATH --nl xml/foo.xml +. "${srcdir-..}"/examples/foreach-xpath.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/examples/sel-xpath.input new/xmlstarlet-1.4.1/examples/sel-xpath.input --- old/xmlstarlet-1.4.0/examples/sel-xpath.input 2012-02-20 22:30:28.000000000 +0100 +++ new/xmlstarlet-1.4.1/examples/sel-xpath.input 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -'abc' -"a'c" -'a"c' -concat("a'", '"c') -concat('"', "'a'b", '""') -concat("!@#$%^&*()_+-=~`\|'",'";:/?.>,<[]{}') -"]]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/examples/sel1 new/xmlstarlet-1.4.1/examples/sel1 --- old/xmlstarlet-1.4.0/examples/sel1 2011-05-23 22:45:02.000000000 +0200 +++ new/xmlstarlet-1.4.1/examples/sel1 2012-11-14 03:01:12.000000000 +0100 @@ -1,3 +1,3 @@ #!/bin/sh # xsl:copy-of in xml sel command -./xmlstarlet sel -B -t -m /xml/table/rec -c . -n xml/table.xml +./xmlstarlet sel -B -t -e ROOT -m /xml/table/rec -c . -n xml/table.xml | ./xmlstarlet c14n diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/examples/sum1 new/xmlstarlet-1.4.1/examples/sum1 --- old/xmlstarlet-1.4.0/examples/sum1 2011-05-23 22:45:02.000000000 +0200 +++ new/xmlstarlet-1.4.1/examples/sum1 2012-11-14 03:01:12.000000000 +0100 @@ -1,3 +1,3 @@ #!/bin/sh # Calculating running sum on XML document -./xmlstarlet sel -t -v "sum(/xml/table/rec/numField)" xml/table.xml +./xmlstarlet sel -T -t -v "sum(/xml/table/rec/numField)" --nl xml/table.xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/examples/tests.mk new/xmlstarlet-1.4.1/examples/tests.mk --- old/xmlstarlet-1.4.0/examples/tests.mk 2012-08-12 17:51:02.000000000 +0200 +++ new/xmlstarlet-1.4.1/examples/tests.mk 2012-11-14 03:01:12.000000000 +0100 @@ -1,5 +1,6 @@ -TESTS_ENVIRONMENT = abs_builddir=$(abs_builddir) EXEEXT=$(EXEEXT) SED=$(SED) \ - $(srcdir)/tests/runTest.sh +LOG_COMPILER = abs_builddir=$(abs_builddir) \ +EXEEXT=$(EXEEXT) SED=$(SED) AWK=$(AWK) SHELL=$(SHELL) \ + $(SHELL) $(srcdir)/tests/runTest.sh # split tests into fast and slow, so we can run just the fast ones diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/examples/xinclude1 new/xmlstarlet-1.4.1/examples/xinclude1 --- old/xmlstarlet-1.4.0/examples/xinclude1 2011-05-23 22:45:02.000000000 +0200 +++ new/xmlstarlet-1.4.1/examples/xinclude1 2012-11-14 03:01:12.000000000 +0100 @@ -1,3 +1,3 @@ #!/bin/sh # Include one XML document into another using XInclude -./xmlstarlet tr --xinclude xsl/cat.xsl xml/document.xml +./xmlstarlet tr --xinclude xsl/cat.xsl xml/document.xml | ./xmlstarlet c14n diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/solaris/package/sol8-sparc/pkginfo new/xmlstarlet-1.4.1/solaris/package/sol8-sparc/pkginfo --- old/xmlstarlet-1.4.0/solaris/package/sol8-sparc/pkginfo 2012-08-26 18:51:47.000000000 +0200 +++ new/xmlstarlet-1.4.1/solaris/package/sol8-sparc/pkginfo 2012-12-08 23:32:49.000000000 +0100 @@ -3,7 +3,7 @@ PKG=SFxmlstar NAME="xmlstarlet Command Line XML Toolkit" ARCH=sparc -VERSION=1.4.0 +VERSION=1.4.1 MAXINST=1 CATEGORY=application DESC="XmlStarlet Command Line XML Toolkit" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/solaris/package/sol9-sparc/pkginfo new/xmlstarlet-1.4.1/solaris/package/sol9-sparc/pkginfo --- old/xmlstarlet-1.4.0/solaris/package/sol9-sparc/pkginfo 2012-08-26 18:51:47.000000000 +0200 +++ new/xmlstarlet-1.4.1/solaris/package/sol9-sparc/pkginfo 2012-12-08 23:32:49.000000000 +0100 @@ -3,7 +3,7 @@ PKG=SFxmlstar NAME="xmlstarlet Command Line XML Toolkit" ARCH=sparc -VERSION=1.4.0 +VERSION=1.4.1 MAXINST=1 CATEGORY=application DESC="XmlStarlet Command Line XML Toolkit" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/src/xml_edit.c new/xmlstarlet-1.4.1/src/xml_edit.c --- old/xmlstarlet-1.4.0/src/xml_edit.c 2012-08-12 18:03:48.000000000 +0200 +++ new/xmlstarlet-1.4.1/src/xml_edit.c 2012-11-14 03:01:12.000000000 +0100 @@ -329,6 +329,12 @@ for (i = 0; i < nodes->nodeNr; i++) { xmlNodePtr node; + + if (nodes->nodeTab[i] == (void*) doc && mode != 0) { + fprintf(stderr, "The document node cannot have siblings.\n"); + exit(EXIT_INTERNAL_ERROR); + } + /* update node */ if (type == XML_ATTR) { @@ -367,6 +373,10 @@ int i; for (i = 0; i < nodes->nodeNr; i++) { + if (nodes->nodeTab[i] == (void*) doc) { + fprintf(stderr, "The document node cannot be renamed.\n"); + exit(EXIT_INTERNAL_ERROR); + } xmlNodeSetName(nodes->nodeTab[i], BAD_CAST val); } } @@ -380,6 +390,11 @@ int i; for (i = nodes->nodeNr - 1; i >= 0; i--) { + if (nodes->nodeTab[i] == (void*) doc) { + fprintf(stderr, "The document node cannot be deleted.\n"); + exit(EXIT_INTERNAL_ERROR); + } + if (nodes->nodeTab[i]->type == XML_NAMESPACE_DECL) { fprintf(stderr, "FIXME: can't delete namespace nodes\n"); exit(EXIT_INTERNAL_ERROR); @@ -402,6 +417,11 @@ int i; for (i = 0; i < nodes->nodeNr; i++) { + if (nodes->nodeTab[i] == (void*) doc) { + fprintf(stderr, "The document node cannot be moved.\n"); + exit(EXIT_INTERNAL_ERROR); + } + if (nodes->nodeTab[i]->type == XML_NAMESPACE_DECL) { fprintf(stderr, "FIXME: can't move namespace nodes\n"); exit(EXIT_INTERNAL_ERROR); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/tests/runAllTests.sh new/xmlstarlet-1.4.1/tests/runAllTests.sh --- old/xmlstarlet-1.4.0/tests/runAllTests.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/xmlstarlet-1.4.1/tests/runAllTests.sh 2012-12-08 23:28:58.000000000 +0100 @@ -0,0 +1,128 @@ +#!/bin/sh + +# This script is a replacement for make check, for machines that don't +# have make installed. + +TESTS=' +bigxml-dtd +bigxml-embed-ref +bigxml-embed +bigxml-relaxng +bigxml-well-formed +bigxml-xsd +c14n-default-attr +c14n-newlines +c14n1 +c14n2 +command-help +count1 +countnode1 +delete1 +dtd1 +dtd2 +dtd3 +dtd4 +ed-2op +ed-append +ed-backref-delete +ed-backref1 +ed-backref2 +ed-expr +ed-insert +ed-literal +ed-move +ed-namespace +ed-nop +ed-subnode +elem1 +elem2 +elem3 +elem-depth +elem-uniq +escape1 +exslt-ed +exslt1 +external-entity +findfile1 +genxml1 +hello1 +localname1 +look1 +move1 +N-order +noindent1 +ns1 +pyx +pyx-ns +recover1 +rename-attr1 +rename-elem1 +schema1 +sel-literal +sel-if +sel-many-values +sel-root +sel-xpath-c +sel-xpath-i +sel-xpath-m +sel-xpath-v +sel1 +sort1 +sort2 +sort3 +structure1 +sum1 +tab1 +table1 +table2 +table3 +unicode1 +update-attr1 +update-elem1 +valid1 +xinclude1 +xsl-param1 +xsl-sum1' + +XFAIL_TESTS='bigxml-dtd|ed-namespace' + + +testdir=`dirname $0` + +: ${srcdir:=$testdir/..} +export srcdir + +pass=0; xpass=0; fail=0; xfail=0; total=0 + +for t in $TESTS ; do + $SHELL ./runTest.sh "$t" > /dev/null ; rc=$? + echo "$t" | grep -E "$XFAIL_TESTS" ; xfail_test=$? + + echo -n "$t: " + if [ $rc -eq 0 ] ; then + if [ $xfail_test -eq 0 ] ; then + echo BAD, XPASS + xpass=`expr $xpass + 1` + else + echo GOOD, PASS + pass=`expr $pass + 1` + fi + else + if [ $xfail_test -eq 0 ] ; then + echo GOOD, XFAIL + xfail=`expr $xfail + 1` + else + echo BAD, FAIL + fail=`expr $fail + 1` + fi + fi + + total=`expr $total + 1` +done + +good=`expr $pass + $xfail` +bad=`expr $xpass + $fail` + +echo "$pass passed, $xfail xfails ($good good)" +echo "$xpass xpassed, $fail fails ($bad bad)" +echo "$total total." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/tests/runTest.sh new/xmlstarlet-1.4.1/tests/runTest.sh --- old/xmlstarlet-1.4.0/tests/runTest.sh 2012-05-14 06:41:08.000000000 +0200 +++ new/xmlstarlet-1.4.1/tests/runTest.sh 2012-12-08 23:30:50.000000000 +0100 @@ -3,5 +3,5 @@ TEST=`basename $1` cd "$srcdir"/examples || exit 77 -srcdir="$srcdir"/.. ./$TEST | tr -d "\r" \ - | diff - results/$TEST.out >/dev/null 2>&1 +srcdir=.. $SHELL ./$TEST | tr -d "\r" \ + | diff -u - results/$TEST.out diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/usage2c.awk new/xmlstarlet-1.4.1/usage2c.awk --- old/xmlstarlet-1.4.0/usage2c.awk 2012-08-26 16:31:10.000000000 +0200 +++ new/xmlstarlet-1.4.1/usage2c.awk 2012-11-14 03:01:12.000000000 +0100 @@ -37,6 +37,6 @@ printf(" fprintf(out, %s", command_name); for (i = 1; i <= progs; i++) printf(", argv0"); - printf(");\n}"); + print(");\n}"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmlstarlet-1.4.0/version.h new/xmlstarlet-1.4.1/version.h --- old/xmlstarlet-1.4.0/version.h 2012-08-26 18:56:32.000000000 +0200 +++ new/xmlstarlet-1.4.1/version.h 2012-12-08 23:32:50.000000000 +0100 @@ -1 +1 @@ -#define VERSION "1.4.0" +#define VERSION "1.4.1" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xflr5 for openSUSE:Factory
by root＠hilbert.suse.de 28 Dec '12

28 Dec '12

Hello community, here is the log from the commit of package xflr5 for openSUSE:Factory checked in at 2012-12-28 22:51:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xflr5 (Old) and /work/SRC/openSUSE:Factory/.xflr5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xflr5", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-12-21 01:49:00.356010756 +0100 +++ /work/SRC/openSUSE:Factory/.xflr5.new/xflr5.changes 2012-12-28 22:51:15.000000000 +0100 @@ -0,0 +1,115 @@ +------------------------------------------------------------------- +Wed Dec 26 08:15:10 UTC 2012 - dmitry_r(a)opensuse.org + +- Update to version 6.09 + * see included ReleaseNotes.txt for details +- spec file cleanup + +------------------------------------------------------------------- +Tue Jun 26 00:00:00 UTC 2012 - adeperrois(a)xflr5.com + +- xflr5 v6.07 + * fixed type 2 batch polar analysis + * fixed the issue with incorrect 3D-panel calculations + * Corrected the incorrect aileron control derivatives + * Corrected the bug in wing analysis with ground effect + * Corrected the bug in type 4 analysis for wings and planes + * Corrected the bug which modified the chord length as twist increases: + impact results for wings with high dihedral + * Cleaned, corrected, and improved the code for B-Splines + * Removed the option for Min/Max type controls in Stabillity Polars + * Added an option to edit Wing Polar paramaters + * Fixed the crash bug when defining wings with more than 16 span sections + * Corrected a bug leading to incorrect results in stability derivatives + with active controls (CPanel::RotateBC()) + * Removed the Splined Points Foil option + * Other minor corrections and enhancements + * Code cleaning + +------------------------------------------------------------------- +Fri Jan 06 00:00:00 UTC 2012 - adeperrois(a)xflr5.com + +- xflr5 v6.06 + * Minor corrections and improvements + +------------------------------------------------------------------- +Sun Jul 24 00:00:00 UTC 2011 - adeperrois(a)xflr5.com + +- xflr5 v6.05 beta, July 15th, 2011 + * For Type 7 polars, listed the control value instead of the aoa in the top drop down box + * Added a calculation form to determine Re.sqrt(Cl) for foil Type 2 polars + * Added the Japanese translation to the repository - thanks to Koichi + * Minor corrections and improvements + +------------------------------------------------------------------- +Sun May 15 00:00:00 UTC 2011 - adeperrois(a)xflr5.com + +- xflr5 v6.04 beta, May 14th, 2011 + * added a settings save at each project save + * added and option to view forces on panels as coloured arrows + * fixed the incorrect setting of AVL-type controls for flaps in T7 analysis + * added the missing write operation in the project file of the control variable for wing operating points + * modified the setting of boundary conditions in T7 analysis with activated controls - impact on balanced aoa + * modified the wing construction process to allow for a gap in the middle of the wing + * corrected the bug which caused the disapperance of the left stability toolbar when switching to 3D view + * corrected the bug which prevented from changing the default number of panels in naca foil generation + * continued the code cleaning process + +------------------------------------------------------------------- +Sun Feb 13 00:00:00 UTC 2011 - adeperrois(a)xflr5.com + +- XFLR5v6.03 beta rpm release + * modified the geometry connection between panels with dihedral and twist - may slightly impact the results + * corrected the calculations with sideslip + * added multi-threading capability for foil batch analysis + * added an option to display the position of point masses in 3d-view + * in the export to AVL of point masses, corrected the missing addition of wing x & z position + * modified the export format to AVL of with wing flaps + * added an option to highlight the currently selected operating point, or the mode in root locs view + * changed the interface for stability analysis + * added a properties dialog box option for operating points + * corrected various minor bugs + * made several minor enhancements + +------------------------------------------------------------------- +Sun Dec 19 00:00:00 UTC 2010 - adeperrois(a)xflr5.com + +- XFLR5v6.02 beta rpm release + * added an option to load a background image in the foil direct design module + * corrected some errors in CoG and inertia automatic calculations, with impact on results + * did some deep code cleaning + * re-organized the panel analysis code to perform only one far field calculation per operating point + * optimized the panel method for increased speed of execution + * corrected the mesh edition for NURBS bodies + * changed the export format for graphs + * implemented the stability method for mixed panel/vlm method + * implemented the stability method for full 3D panel method + * corrected the bug which lead to incorrect results in 3D panel with Neumann B.C. + * corrected the error in the jump in potential at the wing's trailing edage in full 3d panel method + * set the estimation of inertia properties at the time of polar definition instead of evaluating at the time of analysis + * fixed the bug which could cause a crash when dragging a point in splines design + * corrected the asymetric transition location for symetric wings + * corrected the source strength influence of thick panels on thin surfaces, with impact on results for planes with body + * corrected the Cp 3D color display for VLM2 analysis + * added the influence of pressure forces acting on the body to induced pitching moment coefficient + * added calculation of neutral point position based on Cma/Cza ratio + * corrected various minor bugs + * made several minor enhancements + +------------------------------------------------------------------- +Thu Oct 14 00:00:00 UTC 2010 - adeperrois(a)xflr5.com + +- XFLR5v6.01 beta rpm release + * Corrected the incorrect balance speed in 3D type 2 polars for planes + * Corrected the final moment calculation in stability analysis + * Corrected the incorrect lift calculation in stability analysis + +------------------------------------------------------------------- +Sat Sep 19 00:00:00 UTC 2010 - adeperrois(a)xflr5.com + +- XFLR5v6.00 beta rpm release + +------------------------------------------------------------------- +Fri Apr 3 00:00:00 UTC 2010 - adeperrois(a)xflr5.com + +- First rpm release New: ---- xflr5-6.09.tar.bz2 xflr5.changes xflr5.desktop xflr5.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xflr5.spec ++++++ # # spec file for package xflr5 # # Copyright (c) 2012 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: xflr5 Version: 6.09 Release: 0 License: GPL-2.0 Group: Productivity/Scientific/Other Summary: Analysis tool for airfoils and planes operating at low Re numbers URL: http://xflr5.com # there is no released tarballs # svn checkout svn://svn.code.sf.net/p/xflr5/code/branches/xflr5-%{version} xflr5-%{version} Source0: %{name}-%{version}.tar.bz2 Source1: %{name}.desktop BuildRequires: gcc-c++ BuildRequires: libqt4-devel >= 4.7.0 BuildRequires: Mesa-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description XFLR5 is a design tool intended for the design and analysis of reduced scaled model airplanes. It includes the XFoil program for the analysis of airfoils. It includes a non-linear Lifting Line method (LLT), two Vortex Lattice Methods (VLM), and a 3D panel flat panel,first-order method for the analysis of wings and planes. XFLR5 v5 is a re-write of XFLR5 v4 using Qt4 libraries instead of Microsoft's MFC. XFLR5 v6 introduces stability and control analysis %prep %setup -q cp %{SOURCE1} . # fix wrong-file-end-of-line-encoding sed -i 's/\r$//' {License.txt,doc/ReleaseNotes.txt} %build qmake -o Makefile %{name}_%{version}.pro make %{?_smp_mflags} lrelease %{name}_%{version}.pro %install install -Dm 755 %{name} %{buildroot}%{_bindir}/%{name} install -Dm 644 images/%{name}.png %{buildroot}%{_datadir}/pixmaps/%{name}.png install -Dm 644 %{name}.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop install -d %{buildroot}%{_datadir}/%{name}/translations install -m 644 translations/*.qm %{buildroot}%{_datadir}/%{name}/translations %files %defattr(-,root,root) %doc License.txt doc/ReleaseNotes.txt doc/*.odt %{_bindir}/%{name} %{_datadir}/%{name}/ %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png %changelog ++++++ xflr5.desktop ++++++ [Desktop Entry] Categories=Engineering; Comment[en_US]=XFLR5 is an analysis tool for airfoils, wings and planes operating at low Reynolds numbers Comment=XFLR5 is an analysis tool for airfoils, wings and planes operating at low Reynolds numbers Exec=xflr5 %u GenericName[en_US]=XFLR5 v6 GenericName=XFLR5 v6 Icon=xflr5 MimeType= Name[en_US]=xflr5 Name=xflr5 Path= StartupNotify=true Terminal=false TerminalOptions= Type=Application X-DBUS-ServiceName= X-DBUS-StartupType= X-KDE-SubstituteUID=false X-KDE-Username= X-SuSE-translate=true -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xfdesktop for openSUSE:Factory
by root＠hilbert.suse.de 28 Dec '12

28 Dec '12

Hello community, here is the log from the commit of package xfdesktop for openSUSE:Factory checked in at 2012-12-28 22:51:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfdesktop (Old) and /work/SRC/openSUSE:Factory/.xfdesktop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xfdesktop", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/xfdesktop/xfdesktop.changes 2012-06-28 17:22:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xfdesktop.new/xfdesktop.changes 2012-12-28 22:51:06.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Dec 20 12:07:44 UTC 2012 - gber(a)opensuse.org + +- added xfdesktop-fix-backdrop-timer.patch in order to fix the + backdrop timer not being rescheduled (bnc#793723, bxo#8962) + +------------------------------------------------------------------- New: ---- xfdesktop-fix-backdrop-timer.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfdesktop.spec ++++++ --- /var/tmp/diff_new_pack.rLkFg3/_old 2012-12-28 22:51:07.000000000 +0100 +++ /var/tmp/diff_new_pack.rLkFg3/_new 2012-12-28 22:51:07.000000000 +0100 @@ -30,6 +30,8 @@ Patch1: xfdesktop-default-background-image.patch # PATCH-FIX-UPSTREAM xfdesktop-4.10.0-fix-use-after-free.patch bnc#768985 bxo#9059 seife+obs(a)b1-systems.com -- fix use-after free detected by MALLOC_CHECK_ / valgrind -- to be sent upstream! Patch2: xfdesktop-4.10.0-fix-use-after-free.patch +# PATCH-FIX-UPSTREAM xfdesktop-fix-backdrop-timer.patch bnc#793723 bxo#8962 gber(a)opensuse.org -- Fix backdrop timer not being rescheduled +Patch3: xfdesktop-fix-backdrop-timer.patch BuildRequires: fdupes BuildRequires: intltool BuildRequires: update-desktop-files @@ -87,6 +89,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build export CFLAGS="%{optflags} -fno-strict-aliasing" ++++++ xfdesktop-fix-backdrop-timer.patch ++++++ Index: xfdesktop-4.10.0/src/xfce-backdrop.c =================================================================== --- xfdesktop-4.10.0.orig/src/xfce-backdrop.c +++ xfdesktop-4.10.0/src/xfce-backdrop.c @@ -52,7 +52,7 @@ static void xfce_backdrop_get_property(G guint property_id, GValue *value, GParamSpec *pspec); -static void xfce_backdrop_timer(XfceBackdrop *backdrop); +static gboolean xfce_backdrop_timer(XfceBackdrop *backdrop); struct _XfceBackdropPriv { @@ -831,12 +831,14 @@ xfce_backdrop_get_saturation(XfceBackdro return backdrop->priv->saturation; } -static void +static gboolean xfce_backdrop_timer(XfceBackdrop *backdrop) { - g_return_if_fail(XFCE_IS_BACKDROP(backdrop)); + g_return_val_if_fail(XFCE_IS_BACKDROP(backdrop), FALSE); g_signal_emit(G_OBJECT(backdrop), backdrop_signals[BACKDROP_CYCLE], 0); + + return TRUE; } /** -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xf86-video-mach64 for openSUSE:Factory
by root＠hilbert.suse.de 28 Dec '12

28 Dec '12

Hello community, here is the log from the commit of package xf86-video-mach64 for openSUSE:Factory checked in at 2012-12-28 22:50:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-mach64 (Old) and /work/SRC/openSUSE:Factory/.xf86-video-mach64.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xf86-video-mach64", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-mach64/xf86-video-mach64.changes 2012-09-23 08:10:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xf86-video-mach64.new/xf86-video-mach64.changes 2012-12-28 22:50:58.000000000 +0100 @@ -1,0 +2,12 @@ +Sat Dec 22 23:45:48 UTC 2012 - zaitor(a)opensuse.org + +- Update to version 6.9.4: + + Remove call to obsolete miInitializeBackingStore() + + Remove dummy UTS / DFS hooks. fdo#51137 + + Mach64PixelARGB should use exaGetPixmapFirstPixel + + Fix build with neither XAA nor EXA against xserver 1.13.0 + + Don't gratuitously disable Render when ShadowFBing + + mach64: fix build on 32-bit. tvout code only builds on 32-bit. +- Drop U_mach64-fix-build-on-32-bit.patch, fixed upstream. + +------------------------------------------------------------------- Old: ---- U_mach64-fix-build-on-32-bit.patch xf86-video-mach64-6.9.3.tar.bz2 New: ---- xf86-video-mach64-6.9.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-mach64.spec ++++++ --- /var/tmp/diff_new_pack.erhrqb/_old 2012-12-28 22:50:59.000000000 +0100 +++ /var/tmp/diff_new_pack.erhrqb/_new 2012-12-28 22:50:59.000000000 +0100 @@ -17,14 +17,13 @@ Name: xf86-video-mach64 -Version: 6.9.3 +Version: 6.9.4 Release: 0 Summary: ATI Mach64 series video driver for the Xorg X server License: MIT Group: System/X11/Servers/XF86_4 Url: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.t… -Patch0: U_mach64-fix-build-on-32-bit.patch BuildRequires: Mesa-devel BuildRequires: pkg-config BuildRequires: pkgconfig(fontsproto) @@ -49,7 +48,6 @@ %prep %setup -q -%patch0 -p1 %build %configure ++++++ xf86-video-mach64-6.9.3.tar.bz2 -> xf86-video-mach64-6.9.4.tar.bz2 ++++++ ++++ 23183 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/xf86-video-mach64-6.9.3/ChangeLog new/xf86-video-mach64-6.9.4/ChangeLog --- old/xf86-video-mach64-6.9.3/ChangeLog 2012-07-17 08:22:32.000000000 +0200 +++ new/xf86-video-mach64-6.9.4/ChangeLog 2012-12-20 07:16:30.000000000 +0100 @@ -1,3 +1,101 @@ +commit 0d8639f3cd4128ae856ae27f3787c1da224bb564 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Wed Dec 19 22:14:08 2012 -0800 + + xf86-video-mach64 6.9.4 + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit f694490b3cec78d7b17eeb0a9c4daadd1028776a +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Tue Dec 18 15:42:30 2012 -0800 + + Remove call to obsolete miInitializeBackingStore() + + Definition was deleted from Xorg during 1.14 merge window, but has + been a no-op since 1.10 merge window. + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + Reviewed-by: Alex Deucher <alexander.deucher(a)amd.com> + +commit ece8d3557eb1ffb27104bffb7841503aae4dcd6f +Author: Connor Behan <connor.behan(a)gmail.com> +Date: Fri Dec 7 13:53:38 2012 -0800 + + Remove dummy UTS / DFS hooks + + When EXA was added to mach64, it included UploadToScreen and + DownloadFromScreen hooks that did the same thing that EXA would do in a + software fallback. Now they are out of date and cause crashes. The + slight benefit of reimplementing those hooks (if there is any) is not + worth the maintenance burden of having to rewrite them every time there + is a change to the way EXA handles pixmaps. + Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=51137 + + Signed-off-by: Connor Behan <connor.behan(a)gmail.com> + Tested-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + +commit f0d44c18d71e7450b99189c1221a2f89c7817ab6 +Author: Alan Coopersmith <alan.coopersmith(a)oracle.com> +Date: Thu Dec 6 16:49:12 2012 -0800 + + Mach64PixelARGB should use exaGetPixmapFirstPixel + + Fixes crash attempting to read a pixel from a NULL pPixmap->devPrivate.ptr + + Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com> + Reviewed-by: Michel Dänzer <michel(a)daenzer.net> + +commit 42c4e423eec789606eec9703be23a9fd4483a14a +Author: Adam Jackson <ajax(a)redhat.com> +Date: Tue Oct 2 10:19:47 2012 -0400 + + Fix build with neither XAA nor EXA against xserver 1.13.0 + + Pull in picturestr.h to get GLYPH_HAS_GLYPH_PICTURE_ACCESSOR defined + before compat-api.h is parsed, otherwise you fail with: + + In file included from /usr/include/xorg/picturestr.h:28:0, + from /usr/include/xorg/exa.h:38, + from atimach64accel.h:31, + from atiscreen.c:46: + /usr/include/xorg/glyphstr.h:138:2: error: expected ')' before '*' token + /usr/include/xorg/glyphstr.h:138:2: error: expected ')' before '(' token + /usr/include/xorg/glyphstr.h:140:2: error: expected ')' before '*' token + /usr/include/xorg/glyphstr.h:140:2: error: expected ')' before '(' token + + Signed-off-by: Adam Jackson <ajax(a)redhat.com> + +commit 104e3e067a7dcac143cb672fe42d56396ba6087b +Author: Adam Jackson <ajax(a)redhat.com> +Date: Wed Sep 26 16:21:25 2012 -0400 + + Don't gratuitously disable Render when ShadowFBing + + There's no reason to do this, and I am at a loss to explain why that was + ever done. The first instance of this logic comes from xfree86 (over 11 + years ago!): + + http://cvsweb.xfree86.org/cvsweb/xc/programs/Xserver/hw/xfree86/drivers/ati… + + Now, cfb never had Render support, so that might make some sense if + there was an intermediate uncommitted state where the driver used fb for + direct but cfb for shadowed. But that's really the only plausible + explanation I can think of. + + Signed-off-by: Adam Jackson <ajax(a)redhat.com> + +commit 5eb7fec958bc6ba8a1a2b0be4916cac818866e1c +Author: Dave Airlie <airlied(a)gmail.com> +Date: Wed Jul 18 18:46:49 2012 +1000 + + mach64: fix build on 32-bit. + + tvout code only builds on 32-bit, fix build. + + Signed-off-by: Dave Airlie <airlied(a)redhat.com> + commit 2776fc9cd69f18ba6f09f39ca747f3a9333bf9e4 Author: Dave Airlie <airlied(a)redhat.com> Date: Tue Jul 17 16:05:09 2012 +1000 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/xf86-video-mach64-6.9.3/configure.ac new/xf86-video-mach64-6.9.4/configure.ac --- old/xf86-video-mach64-6.9.3/configure.ac 2012-07-17 08:00:16.000000000 +0200 +++ new/xf86-video-mach64-6.9.4/configure.ac 2012-12-20 07:16:00.000000000 +0100 @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-mach64], - [6.9.3], + [6.9.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-mach64]) AC_CONFIG_SRCDIR([Makefile.am]) 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/xf86-video-mach64-6.9.3/missing new/xf86-video-mach64-6.9.4/missing --- old/xf86-video-mach64-6.9.3/missing 2012-06-05 21:11:37.000000000 +0200 +++ new/xf86-video-mach64-6.9.4/missing 2012-12-20 07:16:11.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2012-01-06.13; # UTC +scriptversion=2009-04-28.21; # UTC # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -84,6 +84,7 @@ help2man touch the output file lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file + tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and @@ -121,6 +122,15 @@ # Not GNU programs, they don't have --version. ;; + tar*) + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. @@ -216,7 +226,7 @@ \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG=\${$#} + eval LASTARG="\${$#}" case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -246,7 +256,7 @@ \`Flex' from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG=\${$#} + eval LASTARG="\${$#}" case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -308,6 +318,41 @@ touch $file ;; + tar*) + shift + + # We have already tried tar in the generic part. + # Look for gnutar/gtar before invocation to avoid ugly error + # messages. + if (gnutar --version > /dev/null 2>&1); then + gnutar "$@" && exit 0 + fi + if (gtar --version > /dev/null 2>&1); then + gtar "$@" && exit 0 + fi + firstarg="$1" + if shift; then + case $firstarg in + *o*) + firstarg=`echo "$firstarg" | sed s/o//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + case $firstarg in + *h*) + firstarg=`echo "$firstarg" | sed s/h//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + fi + + echo 1>&2 "\ +WARNING: I can't seem to be able to run \`tar' with the given arguments. + You may want to install GNU tar or Free paxutils, or check the + command line arguments." + exit 1 + ;; + *) echo 1>&2 "\ WARNING: \`$1' is needed, and is $msg. 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/xf86-video-mach64-6.9.3/src/atimach64exa.c new/xf86-video-mach64-6.9.4/src/atimach64exa.c --- old/xf86-video-mach64-6.9.3/src/atimach64exa.c 2012-06-06 11:36:01.000000000 +0200 +++ new/xf86-video-mach64-6.9.4/src/atimach64exa.c 2012-12-20 07:16:00.000000000 +0100 @@ -387,60 +387,6 @@ static void Mach64DoneSolid(PixmapPtr pPixmap) { } -/* - * Memcpy-based UTS. - */ -static Bool -Mach64UploadToScreen(PixmapPtr pDst, int x, int y, int w, int h, - char *src, int src_pitch) -{ - char *dst = pDst->devPrivate.ptr; - int dst_pitch = exaGetPixmapPitch(pDst); - - int bpp = pDst->drawable.bitsPerPixel; - int cpp = (bpp + 7) / 8; - int wBytes = w * cpp; - - exaWaitSync(pDst->drawable.pScreen); - - dst += (x * cpp) + (y * dst_pitch); - - while (h--) { - memcpy(dst, src, wBytes); - src += src_pitch; - dst += dst_pitch; - } - - return TRUE; -} - -/* - * Memcpy-based DFS. - */ -static Bool -Mach64DownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h, - char *dst, int dst_pitch) -{ - char *src = pSrc->devPrivate.ptr; - int src_pitch = exaGetPixmapPitch(pSrc); - - int bpp = pSrc->drawable.bitsPerPixel; - int cpp = (bpp + 7) / 8; - int wBytes = w * cpp; - - exaWaitSync(pSrc->drawable.pScreen); - - src += (x * cpp) + (y * src_pitch); - - while (h--) { - memcpy(dst, src, wBytes); - src += src_pitch; - dst += dst_pitch; - } - - return TRUE; -} - #include "atimach64render.c" /* Compute log base 2 of val. */ @@ -659,12 +605,6 @@ pExa->Copy = Mach64Copy; pExa->DoneCopy = Mach64DoneCopy; - /* EXA hits more optimized paths when it does not have to fallback because - * of missing UTS/DFS, hook memcpy-based UTS/DFS. - */ - pExa->UploadToScreen = Mach64UploadToScreen; - pExa->DownloadFromScreen = Mach64DownloadFromScreen; - if (pATI->RenderAccelEnabled) { if (pATI->Chip >= ATI_CHIP_264GTPRO) { /* 3D Rage Pro does not support NPOT textures. */ 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/xf86-video-mach64-6.9.3/src/atimach64render.c new/xf86-video-mach64-6.9.4/src/atimach64render.c --- old/xf86-video-mach64-6.9.3/src/atimach64render.c 2012-06-06 11:36:01.000000000 +0200 +++ new/xf86-video-mach64-6.9.4/src/atimach64render.c 2012-12-20 07:16:00.000000000 +0100 @@ -209,22 +209,7 @@ CARD8 comp; int bits, shift; - /* Ensure that texture drawing has completed. */ - exaWaitSync(pPixmap->drawable.pScreen); - - /* exaGetPixmapFirstPixel() */ - - switch (pPixmap->drawable.bitsPerPixel) { - case 32: - pixel = *(CARD32 *)(pPixmap->devPrivate.ptr); - break; - case 16: - pixel = *(CARD16 *)(pPixmap->devPrivate.ptr); - break; - default: - pixel = *(CARD8 *)(pPixmap->devPrivate.ptr); - break; - } + pixel = exaGetPixmapFirstPixel(pPixmap); /* exaGetRGBAFromPixel()/viaPixelARGB8888() */ 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/xf86-video-mach64-6.9.3/src/atiscreen.c new/xf86-video-mach64-6.9.4/src/atiscreen.c --- old/xf86-video-mach64-6.9.3/src/atiscreen.c 2012-06-06 11:36:01.000000000 +0200 +++ new/xf86-video-mach64-6.9.4/src/atiscreen.c 2012-12-20 07:16:00.000000000 +0100 @@ -476,21 +476,11 @@ } } - /* If applicable, initialise RENDER extension */ + /* initialise RENDER extension */ + if (!fbPictureInit(pScreen, NULL, 0) && (serverGeneration == 1)) { - if (pATI->OptionShadowFB) - { - if (serverGeneration == 1) - xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, - "RENDER extension not supported with a shadowed" - " framebuffer.\n"); - } - else if (!fbPictureInit(pScreen, NULL, 0) && - (serverGeneration == 1)) - { - xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, - "RENDER extension initialisation failed.\n"); - } + xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING, + "RENDER extension initialisation failed.\n"); } xf86SetBlackWhitePixels(pScreen); @@ -542,7 +532,6 @@ #endif /* AVOID_DGA */ /* Initialise backing store */ - miInitializeBackingStore(pScreen); xf86SetBackingStore(pScreen); /* Initialise cursor */ @@ -580,7 +569,7 @@ #ifdef TV_OUT /* Fix-up TV out after ImpacTV probe */ if (pATI->OptionTvOut && pATI->Chip < ATI_CHIP_264GTPRO) - ATISwitchMode(0, pScreenInfo->currentMode, 0); + ATISwitchMode(SWITCH_MODE_ARGS(pScreenInfo, pScreenInfo->currentMode)); #endif /* TV_OUT */ #ifdef XF86DRI_DEVEL 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/xf86-video-mach64-6.9.3/src/atistruct.h new/xf86-video-mach64-6.9.4/src/atistruct.h --- old/xf86-video-mach64-6.9.3/src/atistruct.h 2012-06-06 11:36:01.000000000 +0200 +++ new/xf86-video-mach64-6.9.4/src/atistruct.h 2012-12-20 07:16:00.000000000 +0100 @@ -51,6 +51,7 @@ #endif /* TV_OUT */ +#include "picturestr.h" #ifdef USE_EXA #include "exa.h" #endif -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xf86-video-intel for openSUSE:Factory
by root＠hilbert.suse.de 28 Dec '12

28 Dec '12

Hello community, here is the log from the commit of package xf86-video-intel for openSUSE:Factory checked in at 2012-12-28 22:50:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-intel (Old) and /work/SRC/openSUSE:Factory/.xf86-video-intel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xf86-video-intel", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-intel/xf86-video-intel.changes 2012-12-19 14:02:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xf86-video-intel.new/xf86-video-intel.changes 2012-12-28 22:50:49.000000000 +0100 @@ -1,0 +2,19 @@ +Wed Dec 26 16:28:09 UTC 2012 - tobias.johannes.klausmann(a)mni.thm.de + +- Update to 2.20.17: + A minor update to prepare for co-operating with the kernel over managing + stability on 830gm/845g. On this pair of chipsets, the kernel will perform + an extra copy of the batchbuffer into reserved memory, which prevents them + from randomly dying. However, that extra copy does have a noticeable + impact upon throughput, so we also have a mechanism for userspace to + opt-out of the kernel workaround and take responsibility for ensuring its + batches are coherent. + Bugs fixed since 2.20.16: + + Build fixes against xorg-1.14 + https://bugs.freedesktop.org/show_bug.cgi?id=58552 + https://bugs.freedesktop.org/show_bug.cgi?id=58406 + + Fixed the origin of cropped (textured) video windows (Xv and XvMC) + https://bugs.freedesktop.org/show_bug.cgi?id=23033 + + Fix potential corruption when using images larger than ~1GiB + +------------------------------------------------------------------- Old: ---- xf86-video-intel-2.20.16.tar.bz2 New: ---- xf86-video-intel-2.20.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-intel.spec ++++++ --- /var/tmp/diff_new_pack.GKFl3g/_old 2012-12-28 22:50:50.000000000 +0100 +++ /var/tmp/diff_new_pack.GKFl3g/_new 2012-12-28 22:50:50.000000000 +0100 @@ -19,7 +19,7 @@ %define glamor 1 Name: xf86-video-intel -Version: 2.20.16 +Version: 2.20.17 Release: 0 Summary: Intel video driver for the Xorg X server License: MIT ++++++ xf86-video-intel-2.20.16.tar.bz2 -> xf86-video-intel-2.20.17.tar.bz2 ++++++ ++++ 9823 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xf86-video-geode for openSUSE:Factory
by root＠hilbert.suse.de 28 Dec '12

28 Dec '12

Hello community, here is the log from the commit of package xf86-video-geode for openSUSE:Factory checked in at 2012-12-28 22:50:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-geode (Old) and /work/SRC/openSUSE:Factory/.xf86-video-geode.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xf86-video-geode", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-geode/xf86-video-geode.changes 2012-09-26 10:11:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xf86-video-geode.new/xf86-video-geode.changes 2012-12-28 22:50:45.000000000 +0100 @@ -1,0 +2,13 @@ +Sun Dec 23 00:05:59 UTC 2012 - zaitor(a)opensuse.org + +- Update to version 2.11.14: + + Better compatibility with xserver-1.13, cairo-1.12 and gtk3. + + Fix building on Xservers without XAA. + + Fix building with new xserver-1.13 API. + + Implement solid source pictures acceleration. + + Handle negative srcX and srcY parameters better in EXA Composite + operations, used via the RENDER extension. fdo#51360 + + Fix builds for exotic and/or non-target platforms. + + Clarify the copyright of older AMD commits. + +------------------------------------------------------------------- Old: ---- xf86-video-geode-2.11.13_4a20e8a.tar.bz2 New: ---- xf86-video-geode-2.11.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-geode.spec ++++++ --- /var/tmp/diff_new_pack.MKcQz4/_old 2012-12-28 22:50:46.000000000 +0100 +++ /var/tmp/diff_new_pack.MKcQz4/_new 2012-12-28 22:50:46.000000000 +0100 @@ -17,13 +17,13 @@ Name: xf86-video-geode -Version: 2.11.13 +Version: 2.11.14 Release: 0 Summary: AMD Geode GX and LX video driver for the Xorg X server License: MIT Group: System/X11/Servers/XF86_4 Url: http://xorg.freedesktop.org/ -Source0: %{name}-%{version}_4a20e8a.tar.bz2 +Source0: http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.t… BuildRequires: pkg-config BuildRequires: pkgconfig(fontsproto) BuildRequires: pkgconfig(pciaccess) >= 0.8.0 ++++++ xf86-video-geode-2.11.13_4a20e8a.tar.bz2 -> xf86-video-geode-2.11.14.tar.bz2 ++++++ ++++ 20222 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/xf86-video-geode-2.11.13/ChangeLog new/xf86-video-geode-2.11.14/ChangeLog --- old/xf86-video-geode-2.11.13/ChangeLog 2012-09-17 14:26:34.000000000 +0200 +++ new/xf86-video-geode-2.11.14/ChangeLog 2012-11-25 10:43:28.000000000 +0100 @@ -1,3 +1,132 @@ +commit a96a4e28a079499b18b441f0b6c05c50dd86ead6 +Author: Martin-Éric Racine <martin-eric.racine(a)iki.fi> +Date: Sun Nov 25 11:12:58 2012 +0200 + + Geode 2.11.14 + + This release restores compatibility with xserver-1.13, cairo-1.12 and gtk-3: + + * Fix building with new xserver-1.13 (Maarten Lankhorst) + + Implement xserver-1.13 API changes. + + Make XAA support optional (dropped as of xserver-1.13). + * Implement solid source pictures acceleration for cairo-1.12 (Mart Raudsepp) + * Fix EXA Composite implementation in the LX component (Mart Raudsepp) + Restores icon and text rendering for GNOME 3 fallback mode. + + This release also improves compatibility with non-Linux/non-32-bit hardware: + * Fix compiling on 64-bit hosts (Dave Airlie) + * Fix compiling on non-Linux platforms (Martin-Éric Racine) + + VALIDATION PLATFORMS + * Debian (X server 1.7.7) on Artec DBE61. + * Debian (X server 1.12.14) on FIC ION603A. + * Fedora (X server 1.13) on OLPC XO-1. + +commit cec433840fde8be3ee6b8ce916b416f44d15a794 +Author: Martin-Éric Racine <martin-eric.racine(a)iki.fi> +Date: Sat Nov 24 12:02:32 2012 +0200 + + pre-release whitespace cleanup using ../modular/x-indent-all.sh + +commit 4e6f1e68344d52cd80f85843a2a9830add042a34 +Author: Mart Raudsepp <leio(a)gentoo.org> +Date: Tue Nov 20 09:14:31 2012 +0200 + + NEWS: Release notes for 2.11.14 + +commit a02c099af60c96b440edcc2b0afbd0be0b349ee8 +Author: Mart Raudsepp <leio(a)gentoo.org> +Date: Tue Nov 20 08:30:13 2012 +0200 + + NEWS: Fix placement order of 2.11.10 NEWS compared to others + +commit 45ca66ee73bfe04a7ac17e2086f2e5d20bfa93e9 +Author: Mart Raudsepp <leio(a)gentoo.org> +Date: Sat Nov 17 23:51:39 2012 +0200 + + lx_exa: Improvements to negative srcX/Y PictOpSrc/Over operations + + Adds handling of negative srcX or srcY coordinates, which is used by gtk3 + GtkTrayIcon implementation via cairo for centering icons on top of the + destination area. + + For now just handle the drawing within source pixmap bounds in these + cases, as full handling of the out of bound zero-vector for PictOpSrc + seems to require bigger refactoring, which is not suitable for the + impending stable release. + The approach implemented here should result in correct rendering for + PictOpOver (as out of bounds with non-repeat mode ends up meaning + transparency). For PictOpSrc no black borders are rendered where + appropriate, but before this approach, no source pixmap would even be + rendered at all, so it should be a net improvement for the upcoming + release, while fixing the gtk3 icons in GNOME3 fallback. + + The completely out of bounds special case check didn't work correctly for + negative srcX or srcY because exaScratch.srcWidth/Height are unsigned + types, so the negative srcX or srcY got casted to unsigned, which resulted + in a big number, so srcX >= 0 was always true (but GCC managed to not warn + of the implicit signedness cast). + + Fixes https://bugs.freedesktop.org/show_bug.cgi?id=51360 + +commit a46486b05f4674fc17f36947c97bc281c1d00d26 +Author: Mart Raudsepp <leio(a)gentoo.org> +Date: Tue Oct 23 11:40:11 2012 +0300 + + lx_exa: Implement solid pictures support as source with a mask + + cairo-1.12 uses solid pictures instead of 1x1R pixmaps in glyph rendering + paths, so accelerate it. + In addition to acceleration, it avoids a bug in xserver-1.13.0 and earlier + which causes visible misrendering for fallback path, making cairo-1.12 a + viable and desired choice on GeodeLX systems. + Quick benchmarking suggests a 4-12% win in cairo-traces. + +commit 85f25321661b24324d9e8fb6415abc0fda12436d +Author: Mart Raudsepp <leio(a)gentoo.org> +Date: Tue Oct 23 11:35:18 2012 +0300 + + lx_exa: Remove unused srcPixmap member from exaScratch + + Became redundant with commit 32a927b8e6 + +commit 5cfd7591b2f6ccb57d698738faa3fa800088f972 +Author: Martin-Éric Racine <martin-eric.racine(a)iki.fi> +Date: Tue Oct 2 18:05:55 2012 +0300 + + Clarified the copyright and license of src/geode_msr.c src/geode_blend.h + + Debian's 'licensecheck' tool showed these two files to have unspecified + copyright and license. Git log clarifies that these had been created by + Jordan Crouse when he was still at AMD, so their stock copyright notice + was copied as-is from other files in src/ + +commit 65d9954ef61b7e22252d38cc81db710a8ec0b22b +Author: Mart Raudsepp <leio(a)gentoo.org> +Date: Tue Sep 18 08:43:51 2012 +0300 + + lx_exa: Downgrade src/dst format warnings to fallbacks to not spam the log + + We don't support 10bit wide color channels, BGRA and other types, which mainly + cause these fallbacks. The ErrorF's were unwarranted, these are just fallbacks + as any other, so don't output these warnings without GEODE_TRACE_FALL. + +commit 5f7797cadeaf8a28612b9d0c394f8507eb687c34 +Author: Mart Raudsepp <leio(a)gentoo.org> +Date: Tue Sep 18 08:41:53 2012 +0300 + + lx_exa: Fix crash with solid fills on PictOpAdd operations + + lx_check_composite has many special checks for PictOpAdd to return + successfully early, but these were done even earlier than the check + for solid fills. This resulted in lx_prepare_composite assuming + the source pixmap exists, which is not the case with solid fills. + Move the solid fill fallback checks before the others, so we are + guaranteed to always have a source pixmap in PrepareComposite and + Composite and don't crash trying to access a NULL pointer. + + Also move up the mask check to do less checks in the PictOpAdd logic. + commit 4a20e8ac285cfe8a033f771ac8df25f873db9908 Author: Martin-Éric Racine <martin-eric.racine(a)iki.fi> Date: Wed Aug 29 12:53:00 2012 +0300 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/xf86-video-geode-2.11.13/INSTALL new/xf86-video-geode-2.11.14/INSTALL --- old/xf86-video-geode-2.11.13/INSTALL 2012-09-17 14:26:34.000000000 +0200 +++ new/xf86-video-geode-2.11.14/INSTALL 2012-11-25 10:43:28.000000000 +0100 @@ -0,0 +1,291 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007, 2008 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. Caching is +disabled by default to prevent problems with accidental use of stale +cache files. + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. + + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +Compilers and Options +===================== + + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c99 CFLAGS=-g LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + + You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you can use GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. + + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + +Installation Names +================== + + By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + + Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + +Specifying the System Type +========================== + + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + + Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + +`configure' Invocation +====================== + + `configure' recognizes the following options to control how it +operates. + +`--help' +`-h' + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + +`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/xf86-video-geode-2.11.13/NEWS new/xf86-video-geode-2.11.14/NEWS --- old/xf86-video-geode-2.11.13/NEWS 2012-09-17 14:21:01.000000000 +0200 +++ new/xf86-video-geode-2.11.14/NEWS 2012-11-25 10:10:47.000000000 +0100 @@ -1,3 +1,51 @@ +Geode 2.11.14 (2012-11-25) +========================== +Better compatibility with xserver-1.13, cairo-1.12 and gtk3: + + * Fix building on Xservers without XAA (Maarten Lankhorst) + xserver-1.13 dropped XAA acceleration method, as it does not accel + anything important used on modern desktops. + The geode driver now supports configuring whether to include XAA + support - by default it is automatically disabled with newest + xservers that do not support it, but can be explicitly disabled for + older xservers as well if desired (particularly for LX deployments). + XAA support remains in place for the time being for older xservers, + as the EXA support for GX2 GPUs is of unknown quality and speed. + + * Fix building with new xserver-1.13 API (Maarten Lankhorst) + xserver-1.13 changed API, including moving various global symbols + behind function calls, to better support multiple switchable graphics + cards and hotplugged (USB) graphics cards. Work done to support both + pre-1.13 and 1.13+ APIs in other drivers is reused to bring the same + support to the Geode driver. + + * Implement solid source pictures acceleration (Mart Raudsepp) + cairo-1.12 uses these extensively for text rendering, instead of 1x1 + repeating images that cairo-1.10 used and we already accelerate. + Without acceleration, in addition to being slow, we'd hit a fallback + handling bug in EXA with xserver older than 1.13.1, which results in + very visible text corruption in many instances. + + * Handle negative srcX and srcY parameters better in EXA Composite + operations, used via the RENDER extension (Mart Raudsepp) + Handling of source picture coordinates outside actual source pixmap + area is still subpar and ignoring spec in some corner cases, but + a more specific case is improved to provide correct results in more + situations. In particular this fixes GtkTrayIcon drawing via cairo as + used by gtk3, specifically as seen in GNOME3 fallback desktop. + Previously no icon was drawn at all if the icon needed centering to the + drawing area, which in the end is achieved via a negative srcX/srcY. + https://bugs.freedesktop.org/show_bug.cgi?id=51360 + + * Fix builds for exotic and/or non-target platforms (Dave Airlie) + + * Clarify the copyright of older AMD commits (Martin-Éric Racine) + +VALIDATION PLATFORMS + * Debian (X server 1.7.7) on Artec DBE61 and Hercules EC-800. + * Debian (X server 1.12.14) on FIC ION603A. + * Fedora (X server 1.13) on OLPC XO-1. + Geode 2.11.13 (2011-12-26) ========================== This release mainly features a complete overhaul of the building scripts plus @@ -17,8 +65,8 @@ Fixes to keep this driver compilable on recent X servers are also included. VALIDATION PLATFORMS -* Debian/stable (X server 1.7.7) on Artec DBE61 and Hercules EC-800. -* Ubuntu/Precise (X server 1.10.4) on FIC ION603A. +* Debian (X server 1.7.7) on Artec DBE61 and Hercules EC-800. +* Ubuntu (X server 1.10.4) on FIC ION603A. Geode 2.11.12 (2011-02-13) ========================== @@ -26,18 +74,18 @@ V4L1 support was dropped as of Linux kernel 2.6.38, and it fixes packed overlay offscreen allocations. -Geode 2.11.10 (2010-11-09) -========================== -This release migrates deprecated xalloc/xrealloc/xfree/xcalloc calls -to malloc/realloc/free/calloc, fixes several DCON-specific issues, -improves mode validation and adds support for one WXGA resolution. - Geode 2.11.11 (2010-12-27) ========================== This release restores code compatibility down to X server 1.4, it fixes compilation under 1.9.99 and newer, and it improves handling of gamma correction in video vs graphics +Geode 2.11.10 (2010-11-09) +========================== +This release migrates deprecated xalloc/xrealloc/xfree/xcalloc calls +to malloc/realloc/free/calloc, fixes several DCON-specific issues, +improves mode validation and adds support for one WXGA resolution. + Geode 2.11.9 (2010-08-23) ========================= We are pleased to announce this maintenance release of xf86-video-geode. 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/xf86-video-geode-2.11.13/configure.ac new/xf86-video-geode-2.11.14/configure.ac --- old/xf86-video-geode-2.11.13/configure.ac 2012-09-17 14:21:01.000000000 +0200 +++ new/xf86-video-geode-2.11.14/configure.ac 2012-11-24 16:12:06.000000000 +0100 @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ(2.59) AC_INIT([xf86-video-geode], - [2.11.13], + [2.11.14], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver%2F…], [xf86-video-geode], [http://www.x.org/wiki/GeodeDriver]) 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/xf86-video-geode-2.11.13/missing new/xf86-video-geode-2.11.14/missing --- old/xf86-video-geode-2.11.13/missing 2008-04-01 16:57:18.000000000 +0200 +++ new/xf86-video-geode-2.11.14/missing 2012-11-24 11:00:16.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2012-01-06.13; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# 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 <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -86,9 +84,11 @@ help2man touch the output file lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags 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. + Send bug reports to <bug-automake(a)gnu.org>." exit $? ;; @@ -106,23 +106,21 @@ esac +# 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). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. @@ -138,7 +136,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +146,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +155,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +185,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +208,7 @@ fi ;; - bison|yacc) + 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 @@ -218,7 +216,7 @@ \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@ -240,7 +238,7 @@ fi ;; - lex|flex) + 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 @@ -248,7 +246,7 @@ \`Flex' from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then - eval LASTARG="\${$#}" + eval LASTARG=\${$#} case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@ -263,7 +261,7 @@ fi ;; - help2man) + 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 @@ -277,11 +275,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + 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 @@ -310,41 +308,6 @@ touch $file ;; - tar) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - *) echo 1>&2 "\ WARNING: \`$1' is needed, and is $msg. @@ -363,5 +326,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: 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/xf86-video-geode-2.11.13/src/cim/cim_df.c new/xf86-video-geode-2.11.14/src/cim/cim_df.c --- old/xf86-video-geode-2.11.13/src/cim/cim_df.c 2012-09-17 14:21:01.000000000 +0200 +++ new/xf86-video-geode-2.11.14/src/cim/cim_df.c 2012-11-24 11:01:14.000000000 +0100 @@ -153,8 +153,8 @@ /* PARAMETER - VIDEO PITCH */ pitch = - (video_source_odd-> - y_pitch >> 3) | ((video_source_odd->uv_pitch >> 3) << 16); + (video_source_odd->y_pitch >> 3) | ((video_source_odd->uv_pitch >> 3) << + 16); /* PARAMETER - VIDEO FORMAT */ @@ -1031,8 +1031,8 @@ key = READ_VID32(DF_CURSOR_COLOR_KEY) & DF_CURSOR_COLOR_KEY_ENABLE; key = - key | (cursor_color_key-> - key & 0xFFFFFF) | (cursor_color_key->select_color2 << 24); + key | (cursor_color_key->key & 0xFFFFFF) | (cursor_color_key-> + select_color2 << 24); WRITE_VID32(DF_CURSOR_COLOR_KEY, key); WRITE_VID32(DF_CURSOR_COLOR_MASK, (cursor_color_key->mask & 0xFFFFFF)); 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/xf86-video-geode-2.11.13/src/cim/cim_vg.c new/xf86-video-geode-2.11.14/src/cim/cim_vg.c --- old/xf86-video-geode-2.11.13/src/cim/cim_vg.c 2012-09-17 14:21:01.000000000 +0200 +++ new/xf86-video-geode-2.11.14/src/cim/cim_vg.c 2012-11-24 11:01:15.000000000 +0100 @@ -897,9 +897,8 @@ if ((mode_params->flags & VG_MODEFLAG_BANDWIDTHMASK) == VG_MODEFLAG_HIGH_BAND || ((mode_params->flags & VG_MODEFLAG_INTERLACED) - && (mode_params-> - flags & VG_MODEFLAG_INT_MASK) == - VG_MODEFLAG_INT_FLICKER) || + && (mode_params->flags & VG_MODEFLAG_INT_MASK) + == VG_MODEFLAG_INT_FLICKER) || (irq_ctl & DC3_IRQFILT_GFX_FILT_EN)) { /* HIGH BANDWIDTH */ /* Set agressive watermarks and disallow forced low priority */ 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/xf86-video-geode-2.11.13/src/cim/cim_vip.c new/xf86-video-geode-2.11.14/src/cim/cim_vip.c --- old/xf86-video-geode-2.11.13/src/cim/cim_vip.c 2012-09-17 14:21:01.000000000 +0200 +++ new/xf86-video-geode-2.11.14/src/cim/cim_vip.c 2012-11-24 11:01:15.000000000 +0100 @@ -794,8 +794,7 @@ VIP_MSR_MCR_SECOND_PRIORITY_SHIFT) & VIP_MSR_MCR_SECOND_PRIORITY_MASK; q_word.low |= - (buffer-> - primary << VIP_MSR_MCR_PRIMARY_PRIORITY_SHIFT) & + (buffer->primary << VIP_MSR_MCR_PRIMARY_PRIORITY_SHIFT) & VIP_MSR_MCR_PRIMARY_PRIORITY_MASK; q_word.low |= (buffer->pid << VIP_MSR_MCR_PID_SHIFT) & VIP_MSR_MCR_PID_MASK; @@ -922,8 +921,7 @@ WRITE_VIP32(VIP_VERTICAL_START_STOP, ((buffer->stop << VIP_VSTART_VERTEND_SHIFT) & VIP_VSTART_VERTEND_MASK) | - ((buffer-> - start << VIP_VSTART_VERTSTART_SHIFT) & + ((buffer->start << VIP_VSTART_VERTSTART_SHIFT) & VIP_VSTART_VERTSTART_MASK)); /* ENABLE IN THE CONTROL REGISTER */ 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/xf86-video-geode-2.11.13/src/cim/cim_vop.c new/xf86-video-geode-2.11.14/src/cim/cim_vop.c --- old/xf86-video-geode-2.11.13/src/cim/cim_vop.c 2012-09-17 14:21:01.000000000 +0200 +++ new/xf86-video-geode-2.11.14/src/cim/cim_vop.c 2012-11-24 11:01:15.000000000 +0100 @@ -101,17 +101,13 @@ WRITE_REG32(DC3_VBI_LN_ODD, ((buffer->odd_line_offset << DC3_VBI_ODD_LINE_SHIFT) & - DC3_VBI_ODD_LINE_MASK) | (buffer-> - odd_line_capture_mask - & - DC3_VBI_ODD_ENABLE_MASK)); + DC3_VBI_ODD_LINE_MASK) | + (buffer->odd_line_capture_mask & DC3_VBI_ODD_ENABLE_MASK)); WRITE_REG32(DC3_VBI_LN_EVEN, ((buffer->even_line_offset << DC3_VBI_EVEN_LINE_SHIFT) & - DC3_VBI_EVEN_LINE_MASK) | (buffer-> - even_line_capture_mask - & - DC3_VBI_EVEN_ENABLE_MASK)); + DC3_VBI_EVEN_LINE_MASK) | + (buffer->even_line_capture_mask & DC3_VBI_EVEN_ENABLE_MASK)); /* PROGRAM SOURCE OFFSETS * Start with the even offsets. Note that we always enable 16-bit VBI, 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/xf86-video-geode-2.11.13/src/compat-api.h new/xf86-video-geode-2.11.14/src/compat-api.h --- old/xf86-video-geode-2.11.13/src/compat-api.h 2012-09-17 14:21:01.000000000 +0200 +++ new/xf86-video-geode-2.11.14/src/compat-api.h 2012-11-24 11:01:15.000000000 +0100 @@ -77,7 +77,7 @@ #define VALID_MODE_ARGS_DECL int arg, DisplayModePtr pMode, Bool Verbose, int flags -#else /*XF86_SCRN_INTERFACE)*/ +#else /*XF86_SCRN_INTERFACE) */ #define DDC_CALL(pScrni) (pScrni) 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/xf86-video-geode-2.11.13/src/geode.h new/xf86-video-geode-2.11.14/src/geode.h --- old/xf86-video-geode-2.11.13/src/geode.h 2012-09-17 14:21:01.000000000 +0200 +++ new/xf86-video-geode-2.11.14/src/geode.h 2012-11-24 11:01:15.000000000 +0100 @@ -395,6 +395,7 @@ int + GeodeQueryImageAttributes(ScrnInfoPtr, int id, unsigned short *w, unsigned short *h, int *pitches, int *offsets); 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/xf86-video-geode-2.11.13/src/geode_blend.h new/xf86-video-geode-2.11.14/src/geode_blend.h --- old/xf86-video-geode-2.11.13/src/geode_blend.h 2008-04-01 16:53:08.000000000 +0200 +++ new/xf86-video-geode-2.11.14/src/geode_blend.h 2012-11-24 11:01:15.000000000 +0100 @@ -1,3 +1,29 @@ +/* + * Copyright (c) 2007 Advanced Micro Devices, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Neither the name of the Advanced Micro Devices, Inc. nor the names of its + * contributors may be used to endorse or promote products derived from this + * software without specific prior written permission. + */ + #ifndef AMD_BLEND_H_ #define AMD_BLEND_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/xf86-video-geode-2.11.13/src/geode_msr.c new/xf86-video-geode-2.11.14/src/geode_msr.c --- old/xf86-video-geode-2.11.13/src/geode_msr.c 2012-09-17 14:21:01.000000000 +0200 +++ new/xf86-video-geode-2.11.14/src/geode_msr.c 2012-11-24 11:01:15.000000000 +0100 @@ -1,3 +1,29 @@ +/* + * Copyright (c) 2008 Advanced Micro Devices, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Neither the name of the Advanced Micro Devices, Inc. nor the names of its + * contributors may be used to endorse or promote products derived from this + * software without specific prior written permission. + */ + #ifdef HAVE_CONFIG_H #include "config.h" #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/xf86-video-geode-2.11.13/src/gx_accel.c new/xf86-video-geode-2.11.14/src/gx_accel.c --- old/xf86-video-geode-2.11.13/src/gx_accel.c 2012-09-17 14:21:02.000000000 +0200 +++ new/xf86-video-geode-2.11.14/src/gx_accel.c 2012-11-24 11:01:15.000000000 +0100 @@ -2082,7 +2082,7 @@ #endif return (XAAInit(pScrn, localRecPtr)); -#else /* XF86XAA */ +#else /* XF86XAA */ return FALSE; #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/xf86-video-geode-2.11.13/src/gx_randr.c new/xf86-video-geode-2.11.14/src/gx_randr.c --- old/xf86-video-geode-2.11.13/src/gx_randr.c 2012-09-17 14:21:02.000000000 +0200 +++ new/xf86-video-geode-2.11.14/src/gx_randr.c 2012-11-24 11:01:15.000000000 +0100 @@ -181,7 +181,8 @@ #endif if (pRoot) - (*pScrni->EnableDisableFBAccess) (XF86_ENABLEDISABLEFB_ARG(pScrni, FALSE)); + (*pScrni-> + EnableDisableFBAccess) (XF86_ENABLEDISABLEFB_ARG(pScrni, FALSE)); if (useVirtual) { pScrni->virtualX = pRandr->virtualX; @@ -236,7 +237,8 @@ xf86SetViewport(pScreen, 0, 0); if (pRoot) - (*pScrni->EnableDisableFBAccess) (XF86_ENABLEDISABLEFB_ARG(pScrni, TRUE)); + (*pScrni-> + EnableDisableFBAccess) (XF86_ENABLEDISABLEFB_ARG(pScrni, TRUE)); return ret; } 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/xf86-video-geode-2.11.13/src/gx_rotate.c new/xf86-video-geode-2.11.14/src/gx_rotate.c --- old/xf86-video-geode-2.11.13/src/gx_rotate.c 2012-09-17 14:21:02.000000000 +0200 +++ new/xf86-video-geode-2.11.14/src/gx_rotate.c 2012-11-24 11:01:15.000000000 +0100 @@ -152,8 +152,8 @@ pScrni->pScreen->rootDepth, pScrni->bitsPerPixel, PixmapBytePad(pScrni->displayWidth, - pScrni->pScreen-> - rootDepth), + pScrni-> + pScreen->rootDepth), (pointer) (pGeode->FBBase + pScrni->fbOffset)); 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/xf86-video-geode-2.11.13/src/lx_exa.c new/xf86-video-geode-2.11.14/src/lx_exa.c --- old/xf86-video-geode-2.11.13/src/lx_exa.c 2012-09-17 14:21:02.000000000 +0200 +++ new/xf86-video-geode-2.11.14/src/lx_exa.c 2012-11-24 11:01:15.000000000 +0100 @@ -95,7 +95,6 @@ unsigned int srcPitch; unsigned int srcBpp; unsigned int srcWidth, srcHeight; - PixmapPtr srcPixmap; unsigned int srcColor; int op; @@ -285,6 +284,7 @@ * exaGetPixmapFirstPixel, so this should be adjusted so * the stall isn't run needlessly */ + /* FIXME: xserver-1.4 with a supposed fix for this is really old, so kill the stall? */ gp_wait_until_idle(); in = exaGetPixmapFirstPixel(pSrc); @@ -547,28 +547,39 @@ if (op > PictOpAdd) GEODE_FALLBACK(("Operation %d is not supported\n", op)); + /* XXX - don't know if we can do any hwaccel on solid fills or gradient types in generic cases */ + if (pMsk && pMsk->pSourcePict) + GEODE_FALLBACK(("%s are not supported as a mask\n", + pMsk->pSourcePict->type == + SourcePictTypeSolidFill ? "Solid pictures" : + "Gradients")); + + if (pSrc->pSourcePict && pSrc->pSourcePict->type != SourcePictTypeSolidFill) + GEODE_FALLBACK(("Gradients are not supported as the source\n")); + + if (pMsk && op == PictOpAdd) + GEODE_FALLBACK(("PictOpAdd with mask is not supported\n")); + /* FIXME: Meet this conditions from the debug for PictOpAdd. * Any Other possibilities? Add a judge for the future supplement */ if (op == PictOpAdd && pSrc->format == PICT_a8r8g8b8 && - pDst->format == PICT_a8 && !pMsk) + pDst->format == PICT_a8) return TRUE; if (op == PictOpAdd && pSrc->format == PICT_x8r8g8b8 && - pDst->format == PICT_a8 && !pMsk) + pDst->format == PICT_a8) return TRUE; if (op == PictOpAdd && pSrc->format == PICT_r5g6b5 && - pDst->format == PICT_a8 && !pMsk) + pDst->format == PICT_a8) return TRUE; if (usesPasses(op)) { + /* FIXME: Slightly misleading fallback msg when !pMsk */ if (pGeode->exaBfrOffset == 0 || !pMsk) GEODE_FALLBACK(("Multipass operation requires off-screen buffer\n")); } - if (pMsk && op == PictOpAdd) - GEODE_FALLBACK(("PictOpAdd with mask is not supported\n")); - /* Check that the filter matches what we support */ switch (pSrc->filter) { @@ -585,10 +596,6 @@ if (pMsk && pMsk->transform) GEODE_FALLBACK(("Mask transforms are not supported\n")); - /* XXX - don't know if we can do any hwaccel on solid fills or gradient types */ - if (pSrc->pSourcePict || (pMsk && pMsk->pSourcePict)) - GEODE_FALLBACK(("Solid fills or gradient types are not supported\n")); - /* Keep an eye out for source rotation transforms - those we can * do something about */ @@ -607,8 +614,9 @@ struct blend_ops_t *opPtr = &lx_alpha_ops[op * 2]; int direction = (opPtr->channel == CIMGP_CHANNEL_A_SOURCE) ? 0 : 1; - /* Direction 0 indicates src->dst, 1 indiates dst->src */ - if (((direction == 0) && (pSrc->pDrawable->bitsPerPixel < 16)) || + /* Direction 0 indicates src->dst, 1 indicates dst->src */ + if (((direction == 0) && + (pSrc->pDrawable && pSrc->pDrawable->bitsPerPixel < 16)) || ((direction == 1) && (pDst->pDrawable->bitsPerPixel < 16))) { ErrorF("Mask blending unsupported with <16bpp\n"); return FALSE; @@ -617,27 +625,32 @@ GEODE_FALLBACK(("Masks can be only done with a 8bpp or 4bpp depth\n")); /* The pSrc should be 1x1 pixel if the pMsk is not zero */ - if (pSrc->pDrawable->width != 1 || pSrc->pDrawable->height != 1) + if (pSrc->pDrawable && + (pSrc->pDrawable->width != 1 || pSrc->pDrawable->height != 1)) GEODE_FALLBACK(("pSrc should be 1x1 pixel if pMsk is not zero\n")); /* FIXME: In lx_prepare_composite, there are no variables to record the * one pixel source's width and height when the mask is not zero. * That will lead to bigger region to render instead of one pixel in lx * _do_composite, so we should fallback currently to avoid this */ - if (!pSrc->repeat) + /* Not an issue for solid pictures, because we'll treat it as 1x1R too */ + if (!pSrc->repeat && + !(pSrc->pSourcePict && + pSrc->pSourcePict->type == SourcePictTypeSolidFill)) { GEODE_FALLBACK(("FIXME: unzero mask might lead to bigger rendering region than 1x1 pixels\n")); + } + } + else { + if (pSrc->pSourcePict) + GEODE_FALLBACK(("Solid source pictures without a mask are not supported\n")); } /* Get the formats for the source and destination */ - if ((srcFmt = lx_get_format(pSrc)) == NULL) { - ErrorF("EXA: Invalid source format %x\n", pSrc->format); - return FALSE; - } + if ((srcFmt = lx_get_format(pSrc)) == NULL) + GEODE_FALLBACK(("Unsupported source format %x\n", pSrc->format)); - if ((dstFmt = lx_get_format(pDst)) == NULL) { - ErrorF("EXA: Invalid destination format %x\n", pDst->format); - return FALSE; - } + if ((dstFmt = lx_get_format(pDst)) == NULL) + GEODE_FALLBACK(("Unsupported destination format %x\n", pDst->format)); /* Make sure operations that need alpha bits have them */ /* If a mask is enabled, the alpha will come from there */ @@ -684,25 +697,29 @@ if (pMsk && op != PictOpClear) { /* Get the source color */ - /* If the op is PictOpOver(or PictOpOutReverse, PictOpInReverse, - * PictOpIn, PictOpOut, PictOpOverReverse), we should get the - * ARGB32 source format */ - - if ((op == PictOpOver || op == PictOpOutReverse || op == - PictOpInReverse || op == PictOpIn || op == PictOpOut || - op == PictOpOverReverse) && (srcFmt->alphabits != 0)) - exaScratch.srcColor = exaGetPixmapFirstPixel(pxSrc); - else if ((op == PictOpOver || op == PictOpOutReverse || op == - PictOpInReverse || op == PictOpIn || op == PictOpOut || - op == PictOpOverReverse) && (srcFmt->alphabits == 0)) - exaScratch.srcColor = lx_get_source_color(pxSrc, pSrc->format, - PICT_a8r8g8b8); - else - exaScratch.srcColor = lx_get_source_color(pxSrc, pSrc->format, - pDst->format); + if (pSrc->pSourcePict) { + exaScratch.srcColor = pSrc->pSourcePict->solidFill.color; + } + else { + /* If the op is PictOpOver(or PictOpOutReverse, PictOpInReverse, + * PictOpIn, PictOpOut, PictOpOverReverse), we should get the + * ARGB32 source format */ + + if ((op == PictOpOver || op == PictOpOutReverse || op == + PictOpInReverse || op == PictOpIn || op == PictOpOut || + op == PictOpOverReverse) && (srcFmt->alphabits != 0)) + exaScratch.srcColor = exaGetPixmapFirstPixel(pxSrc); + else if ((op == PictOpOver || op == PictOpOutReverse || op == + PictOpInReverse || op == PictOpIn || op == PictOpOut || + op == PictOpOverReverse) && (srcFmt->alphabits == 0)) + exaScratch.srcColor = lx_get_source_color(pxSrc, pSrc->format, + PICT_a8r8g8b8); + else + exaScratch.srcColor = lx_get_source_color(pxSrc, pSrc->format, + pDst->format); + } /* Save off the info we need (reuse the source values to save space) */ - exaScratch.type = COMP_TYPE_MASK; exaScratch.maskrepeat = pMsk->repeat; @@ -973,12 +990,9 @@ opWidth = ((opX + width) - optempX) > exaScratch.srcWidth ? exaScratch.srcWidth : ((opX + width) - optempX); opHeight = ((opY + height) - optempY) > (exaScratch.srcHeight - - srcY) ? (exaScratch. - srcHeight - - srcY) : ((opY + - height) - - - optempY); + srcY) + ? (exaScratch.srcHeight - srcY) : ((opY + height) + - optempY); } else { srcOffset = GetSrcOffset(0, 0); @@ -1295,8 +1309,8 @@ if (exaScratch.type == COMP_TYPE_ONEPASS) { /* This is the condition srcX or/and srcY is/are out of source * region */ - if (((srcX >= 0 && srcY >= exaScratch.srcHeight) - || (srcX >= exaScratch.srcWidth && srcY >= 0)) && + if (((srcY >= 0 && srcY >= exaScratch.srcHeight) + || (srcX >= 0 && srcX >= exaScratch.srcWidth)) && (exaScratch.op == PictOpOver || exaScratch.op == PictOpSrc)) { if (exaScratch.repeat == 1) { opWidth = width; @@ -1337,8 +1351,29 @@ opHeight = height; } else { - /* Have not met this condition till now */ - return; + /* FIXME: We can't support negative srcX/Y for all corner cases in + * a sane way without a bit bigger refactoring. So as to avoid + * gross misrenderings (e.g missing tray icons) in current real-world + * applications, just shift destination appropriately for now and + * ignore out of bounds source pixmap zero-vector handling. This is + * actually correct for PictOpOver, but PictOpSrc out of bounds regions + * should be blacked out, but aren't - without this workaround however + * it'd be simply all black instead, which is probably worse till a full + * clean solution solves it for all cases. */ + if (srcX < 0) { + opX -= srcX; + srcX = 0; + } + + if (srcY < 0) { + opY -= srcY; + srcY = 0; + } + + /* EXA has taken care of adjusting srcWidth if it gets cut on the right */ + width = opWidth = exaScratch.srcWidth; + /* EXA has taken care of adjusting srcHeight if it gets cut on the bottom */ + height = opHeight = exaScratch.srcHeight; } } else { @@ -1462,6 +1497,17 @@ } /* All black out of the source */ if (!exaScratch.repeat && (exaScratch.type == COMP_TYPE_ONEPASS)) { + /* FIXME: We black out the source here, so that any further regions + * in the loop get handled as a source that's a zero-vector (as + * defined for out-of-bounds from source pixmap for RepeatModeNone), + * but this will likely interfere with cases where srcX and/or srcY + * is negative - as opposed to e.g width being larger than srcWidth, + * which is exercised in rendercheck (always rectangle in top-left + * corner). + * Additionally it forces the drawing into tiles of srcWidth/srcHeight + * for non-repeat modes too, where we don't really need to tile it like + * this and could draw the out of bound regions all at once (or at most + * in 4 operations without the big loop). */ lx_composite_all_black(srcOffset, exaScratch.srcWidth, exaScratch.srcHeight); } 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/xf86-video-geode-2.11.13/src/lx_video.c new/xf86-video-geode-2.11.14/src/lx_video.c --- old/xf86-video-geode-2.11.13/src/lx_video.c 2012-09-17 14:21:02.000000000 +0200 +++ new/xf86-video-geode-2.11.14/src/lx_video.c 2012-11-24 11:01:15.000000000 +0100 @@ -70,6 +70,7 @@ static void + LXDisplayVideo(ScrnInfoPtr pScrni, int id, short width, short height, BoxPtr dstBox, short srcW, short srcH, short drawW, short drawH); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0