openSUSE Commits
Threads by month
- ----- 2025 -----
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
May 2007
- 1 participants
- 1082 discussions
Hello community,
here is the log from the commit of package xorg-x11-libs
checked in at Fri May 4 00:34:22 CEST 2007.
--------
--- xorg-x11-libs/xorg-x11-libs.changes 2007-04-11 22:16:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-libs/xorg-x11-libs.changes 2007-05-03 06:58:52.049180000 +0200
@@ -1,0 +2,12 @@
+Thu May 3 06:57:44 CEST 2007 - sndirsch(a)suse.de
+
+- updated libXcomposite to release 0.3.2
+ * No code changes since 0.3.1 - just adding a man page for the
+ API. …
[View More]
+
+-------------------------------------------------------------------
+Tue May 1 12:45:29 CEST 2007 - sndirsch(a)suse.de
+
+- updated libvnc/libXcliplist to current CVS (2007-05-01)
+
+-------------------------------------------------------------------
Old:
----
libvnc-20070111.tar.bz2
libXcliplist-20070111.tar.bz2
libXcomposite-0.3.1.tar.bz2
New:
----
libvnc-20070501.tar.bz2
libXcliplist-20070501.tar.bz2
libXcomposite-0.3.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-libs.spec ++++++
--- /var/tmp/diff_new_pack.I10792/_old 2007-05-04 00:33:37.000000000 +0200
+++ /var/tmp/diff_new_pack.I10792/_new 2007-05-04 00:33:37.000000000 +0200
@@ -19,7 +19,7 @@
%endif
URL: http://xorg.freedesktop.org/
Version: 7.2
-Release: 53
+Release: 57
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/Libraries
@@ -30,7 +30,7 @@
Source3: libXScrnSaver-1.1.2.tar.bz2
Source4: libXTrap-X11R7.0-1.0.0.tar.bz2
Source5: libXaw-1.0.3.tar.bz2
-Source6: libXcomposite-0.3.1.tar.bz2
+Source6: libXcomposite-0.3.2.tar.bz2
Source7: libXcursor-1.1.8.tar.bz2
Source8: libXdamage-1.1.1.tar.bz2
Source9: libXevie-1.0.2.tar.bz2
@@ -53,8 +53,8 @@
Source26: xbitmaps-X11R7.0-1.0.1.tar.bz2
Source27: libXres-1.0.3.tar.bz2
Source28: libXft1-X11R6.9-1.2.tar.bz2
-Source29: libvnc-20070111.tar.bz2
-Source30: libXcliplist-20070111.tar.bz2
+Source29: libvnc-20070501.tar.bz2
+Source30: libXcliplist-20070501.tar.bz2
Source31: xcb-util-0.2.tar.bz2
Patch: libXrandr.diff
Patch2: libXft-2.1.7-lcd-filter-2.patch
@@ -215,6 +215,12 @@
%{_mandir}/man3/*
%changelog
+* Thu May 03 2007 - sndirsch(a)suse.de
+- updated libXcomposite to release 0.3.2
+ * No code changes since 0.3.1 - just adding a man page for the
+ API.
+* Tue May 01 2007 - sndirsch(a)suse.de
+- updated libvnc/libXcliplist to current CVS (2007-05-01)
* Wed Apr 11 2007 - sndirsch(a)suse.de
- updated libXi to release 1.0.4
* Don't call XInput_find_display in _XiGetExtensionVersion, while
++++++ libvnc-20070111.tar.bz2 -> libvnc-20070501.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libvnc/configure.ac new/libvnc/configure.ac
--- old/libvnc/configure.ac 2006-08-04 21:05:49.000000000 +0200
+++ new/libvnc/configure.ac 2007-01-16 23:47:57.000000000 +0100
@@ -11,10 +11,10 @@
AC_PROG_LIBTOOL
# Check for dependencies
-PKG_CHECK_MODULES(VNC, x11 xext xextproto vncproto)
+PKG_CHECK_MODULES(VNCEXT, x11 xext xextproto vncproto)
-AC_SUBST(VNC_CFLAGS)
-AC_SUBST(VNC_LIBS)
+AC_SUBST(VNCEXT_CFLAGS)
+AC_SUBST(VNCEXT_LIBS)
XORG_CHECK_MALLOC_ZERO
XORG_MANPAGE_SECTIONS
++++++ libXcliplist-20070111.tar.bz2 -> libXcliplist-20070501.tar.bz2 ++++++
++++ no output (probably identical)
++++++ libXcomposite-0.3.1.tar.bz2 -> libXcomposite-0.3.2.tar.bz2 ++++++
++++ 29788 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/libXcomposite-0.3.1/ChangeLog new/libXcomposite-0.3.2/ChangeLog
--- old/libXcomposite-0.3.1/ChangeLog 2006-10-12 00:30:42.000000000 +0200
+++ new/libXcomposite-0.3.2/ChangeLog 2007-05-03 00:14:02.000000000 +0200
@@ -1,93 +1,240 @@
-2006-04-03 Adam Jackson <ajax(a)freedesktop.org>
+commit 1ff9d8a7c9e5ab784b0bed38e968b3d56c434cad
+Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
+Date: Wed May 2 14:49:47 2007 -0700
- Tag as 0.3 and release.
+ Give more explicit warning messages if xmlto is needed but not found
-2006-04-02 Adam Jackson <ajax(a)freedesktop.org>
+commit 81a8a71d888d16989a096195dfd96b10fadeba5d
+Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
+Date: Mon Apr 23 19:14:22 2007 -0700
- * src/Xcomposite.c:
- Coverity #573: Plug a leak on the error path.
+ Replace static ChangeLog with dist-hook to generate from git log
-2006-3-13 Deron Johnson <deron.johnson(a)sun.com>
+commit 3d6927c680e6aba14e0a7d771ce8891606cb7fbd
+Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
+Date: Mon Apr 23 19:09:59 2007 -0700
- * configure.ac
- * include/X11/extensions/Xcomposite.h
- * src/Xcomposite.c
- * src/xcompositeint.h
- Composite Version 0.3: CompositeGetOverlayWindow, CompositeReleaseOverlayWindow
+ man page: oops, lost Deron's credit for 0.3
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 258736fa5371c31bcde7f76f1089f0721c7f2275
+Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
+Date: Mon Apr 23 17:36:41 2007 -0700
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Add libXcomposite man page (converted from protocol specs)
+
+ Translate protocol specs + header into library/API documentation in
+ Docbook/XML format
+
+ Convert XML -> nroff/man at dist time so that only maintainers and
+ developers building from git need xmlto installed.
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit bb772fb6c515bcccbde0947ca9fad03b350ae012
+Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
+Date: Mon Apr 23 14:52:40 2007 -0700
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Add *~ to .gitignore to skip emacs/patch droppings
-2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 2bf6c2fd0dc825c0aec7b262736b2a87aeb2183c
+Author: Adam Jackson <ajax(a)benzedrine.nwnk.net>
+Date: Fri Oct 13 15:59:16 2006 -0400
- * xcomposite.pc.in:
- Update pkgconfig files to separate library build-time dependencies
- from application build-time dependencies.
- * configure.ac:
- Update dependencies to work with separate build roots.
+ Bump to 0.3.1
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit f0a1453f24e29a9badc8f29d81c42c0eb3f67065
+Author: Jamey Sharp <jamey(a)minilop.net>
+Date: Thu Oct 12 17:42:18 2006 -0700
- * configure.ac:
- Update package version number for X11R7 RC2 release.
+ Do not call UnlockDisplay without calling LockDisplay.
+
+ Thanks to Magnus Kessler <Magnus.Kessler(a)gmx.net> for reporting this
+ bug and a correct fix.
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 5f2879d1ff86979b6654022031373ce0c9861207
+Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
+Date: Thu Jul 13 14:58:49 2006 -0700
- * configure.ac:
- Update pkgcheck dependencies to work with separate build roots.
+ renamed: .cvsignore -> .gitignore
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit c382f5e2b048879b553672e3a9400d0729fc4001
+Author: Adam Jackson <ajax(a)nwnk.net>
+Date: Mon Apr 3 14:58:15 2006 +0000
- * configure.ac:
- Update package version number for RC1 release.
+ Tag as 0.3 and release.
-2005-07-15 Alexander Gottwald <ago at freedesktop dot org>
+commit 416d6c61338acaa58f986b27408992a0f324d32f
+Author: Adam Jackson <ajax(a)nwnk.net>
+Date: Mon Apr 3 01:03:11 2006 +0000
- * src/Makefile.am:
- Add DEP_LIBS
+ Coverity #573: Plug a leak on the error path.
-2005-07-11 Keith Packard <keithp(a)keithp.com>
+commit 32cba66971545abf95e272cce635a8b0df882272
+Author: Deron Johnson <deron.johnson(a)sun.com>
+Date: Mon Mar 13 21:59:05 2006 +0000
- * src/.cvsignore:
- * src/Makefile.am:
- Add missing files
+ Part 2 of 3 (Other parts are in proto and xserver) Composite Version 0.3:
+ CompositeGetOverlayWindow, CompositeReleaseOverlayWindow Xfixes Version
+ 4.0: XFixesHideCursor, XFixesShowCursor
-2005-07-11 Keith Packard <keithp(a)keithp.com>
+commit 71a706971e7b4d82c128eb82ede2b7e573c0642b
+Author: Kevin E Martin <kem(a)kem.org>
+Date: Thu Dec 15 00:24:28 2005 +0000
- * configure.ac:
- * xcomposite.pc.in:
- Require modular X library.
- Unify dependency _CFLAGS/_LIBS
+ Update package version number for final X11R7 release candidate.
-2004-11-22 Carl Worth <cworth(a)cworth.org>
+commit a05661afa2fd3ec976473976dff0fa25ac3b8253
+Author: Kevin E Martin <kem(a)kem.org>
+Date: Sat Dec 3 05:49:43 2005 +0000
- * configure.ac: Remove AC_CONFIG_AUX_DIR (it was in the wrong
- place for automake-1.9, and it was set to the default value
- anyway).
+ Update package version number for X11R7 RC3 release.
-2004-07-08 Keith Packard <keithp(a)keithp.com>
+commit ce28a0e130db08ebcef5834764c2fc5640f90189
+Author: Eric Anholt <anholt(a)freebsd.org>
+Date: Sun Nov 20 23:17:40 2005 +0000
- * Makefile.am:
- * Xcomposite.c: (XCompositeVersion), (XCompositeNameWindowPixmap):
- * Xcomposite.h:
- * configure.ac:
- Add library API for Composite 0.2 changes
- Add XCompositeVersion to get the run-time library version number
- Fix package version number in configure.ac and Xcomposite.h
+ Add/improve libs .cvsignores.
-2004-02-03 Jim Gettys <jg(a)handhelds.org>
+commit 88e068f78c24861599829364b393ebb8b0eb6711
+Author: Kevin E Martin <kem(a)kem.org>
+Date: Sat Nov 19 07:15:40 2005 +0000
- * AUTHORS: Add authors to AUTHORS file
+ Update pkgconfig files to separate library build-time dependencies from
+ application build-time dependencies, and update package deps to work
+ with separate build roots.
-2004-01-15 Daniel Stone <daniel(a)fooishbar.org>
- * Tag release 1.0 for first freedesktop.org clientside lib release.
+commit 5c429e965d88711a836227b65ab4ef2dc4739932
+Author: Kevin E Martin <kem(a)kem.org>
+Date: Wed Nov 9 21:31:19 2005 +0000
-2004-01-15 Harold L Hunt II <huntharo(a)msu.edu>
- * Makefile.am: Pass -no-undefined to libtool via LDFLAGS.
+ Bump version numbers for X11R6.9/X11R7 RC2.
+
+commit 036ddad7a3152bcdbae68c75efbfc0aabae19302
+Author: Kevin E Martin <kem(a)kem.org>
+Date: Wed Nov 9 21:19:12 2005 +0000
+
+ Update package version number for X11R7 RC2 release.
+
+commit ae202415c695d1f8ac0588d98235318ed9b059bc
+Author: Kevin E Martin <kem(a)kem.org>
+Date: Tue Nov 1 15:11:51 2005 +0000
+
+ Update pkgcheck dependencies to work with separate build roots.
+
+commit 15a1e6e795311e07edf39b66234268b284f8dcfb
+Author: Kevin E Martin <kem(a)kem.org>
+Date: Wed Oct 19 02:48:09 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit fb4f87c05840d2a77706ad63f0f982ee2057e285
+Author: Kevin E Martin <kem(a)kem.org>
+Date: Wed Oct 19 02:46:56 2005 +0000
+
+ lib/Xcomposite/Xcomposite.h
+ lib/Xft/Imakefile
+ lib/Xft/Xft.h Update library version numbers to match updated package
+ versions.
+ Update driver version numbers for RC1.
+
+commit e937da932f616015befffbf3340b1f3c4a34dc1f
+Author: Adam Jackson <ajax(a)nwnk.net>
+Date: Wed Aug 3 03:28:01 2005 +0000
+
+ Do PKG_CHECK_MODULES on a unique token instead of on "DEP", so builds with
+ a global configure cache don't get confused.
+
+commit 999bc86206564f0adda375076e834465ef97e5f5
+Author: Kevin E Martin <kem(a)kem.org>
+Date: Fri Jul 29 21:22:50 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit f00dc71c280699e7f08b72b59ee74b84afa32956
+Author: Daniel Stone <daniel(a)fooishbar.org>
+Date: Sat Jul 16 06:33:36 2005 +0000
+
+ Change soversion to 1.0.0 with -version-number.
+
+commit 7ad5cea1ca2c64d63a69b04d9eea24d4f29b5ac6
+Author: Alexander Gottwald <alexander.gottwald(a)s1999.tu-chemnitz.de>
+Date: Fri Jul 15 12:41:51 2005 +0000
+
+ Add $(DEP_LIBS)
+
+commit 5379902ddfd8ce084a9de727f3b4626ab61525d4
+Author: Adam Jackson <ajax(a)nwnk.net>
+Date: Thu Jul 14 06:11:09 2005 +0000
+
+ Do pkg-config deps on xfixes and xext
+
+commit 96778a22baf1a80f7167cff5f9d98bcff2f4b39f
+Author: Alan Coopersmith <Alan.Coopersmith(a)sun.com>
+Date: Wed Jul 13 17:03:07 2005 +0000
+
+ Add $(DEP_CFLAGS) to $(AM_CFLAGS) so the Composite extension headers can be
+ found.
+
+commit 71c592267f8305840a3c272576c3ef63a034d6e9
+Author: Keith Packard <keithp(a)keithp.com>
+Date: Tue Jul 12 03:16:02 2005 +0000
+
+ Add missing files
+
+commit db8d18cedb4a948ef0dc37703be4d795d39fef37
+Author: Keith Packard <keithp(a)keithp.com>
+Date: Tue Jul 12 03:10:35 2005 +0000
+
+ Use full path for Xcomposite.h header
+
+commit 0e95afc461f8f72759911400f664a05a6cd90312
+Author: Keith Packard <keithp(a)keithp.com>
+Date: Mon Jul 11 22:28:03 2005 +0000
+
+ Require modular X library. Unify dependency _CFLAGS/_LIBS
+
+commit 7098e81fd4d933ca922431280579049396466d23
+Author: Søren Sandmann Pedersen <sandmann(a)daimi.au.dk>
+Date: Thu Jul 7 18:25:28 2005 +0000
+
+ Add build sytem for Xcomposite
+
+commit 29e0de5f572341b4c05476138aceb8eaa6609a93
+Author: Daniel Stone <daniel(a)fooishbar.org>
+Date: Sun Jul 3 07:00:56 2005 +0000
+
+ Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
+ Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
+ Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
+ source files in the xserver/xorg tree, predicated on defines of
+ HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
+ <X11/fonts/foo.h>.
+
+commit 6a5a9a284a8e0e76aed1302ccb5c423c12b66eac
+Author: Søren Sandmann Pedersen <sandmann(a)daimi.au.dk>
+Date: Tue May 17 16:47:58 2005 +0000
+
+ Add Xdamage build system
+
+commit 66adc0d3b0139c46fa5449ba964b186032f3738c
+Author: Markus Kuhn <Markus.Kuhn(a)cl.cam.ac.uk>
+Date: Sat Dec 4 00:42:47 2004 +0000
+
+ Encoding of numerous files changed to UTF-8
+
+commit 3ed5ac43907916ee6a73aa036a1d806d191a631d
+Author: Eric Anholt <anholt(a)freebsd.org>
+Date: Sat Jul 31 05:50:39 2004 +0000
+
+ Bring in Xfixes, Xdamage, and Xcomposite userland from xserver CVS:
+ - Update Xfixes headers to protocol major version 3.
+ - Add composite headers.
+ - Add libXfixes, libXdamage, and libXcomposite.
+ - Add imake glue for new libraries, but leave Composite off by default
+ until issues are resolved.
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/libXcomposite-0.3.1/config.h.in new/libXcomposite-0.3.2/config.h.in
--- old/libXcomposite-0.3.1/config.h.in 2006-10-13 21:58:55.000000000 +0200
+++ new/libXcomposite-0.3.2/config.h.in 2007-05-03 00:13:30.000000000 +0200
@@ -48,6 +48,15 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
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/libXcomposite-0.3.1/configure.ac new/libXcomposite-0.3.2/configure.ac
--- old/libXcomposite-0.3.1/configure.ac 2006-10-13 20:58:15.000000000 +0200
+++ new/libXcomposite-0.3.2/configure.ac 2007-05-03 00:11:52.000000000 +0200
@@ -34,7 +34,7 @@
dnl that 'revision' number appears in Xcomposite.h and has to be manually
dnl synchronized.
dnl
-AC_INIT(libXcomposite, 0.3.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] libXcomposite)
+AC_INIT(libXcomposite, 0.3.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] libXcomposite)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
@@ -44,6 +44,13 @@
AC_PROG_CC
AC_PROG_LIBTOOL
+AC_ARG_VAR([XMLTO], [Path to xmlto command])
+AC_PATH_PROG([XMLTO], [xmlto])
+AM_CONDITIONAL([HAVE_XMLTO], [test "x$XMLTO" != "x"])
+if test "x$XMLTO" = "x" -a ! -f $srcdir/man/Xcomposite.man ; then
+ AC_MSG_WARN([xmlto not found - cannot create man pages without it])
+fi
+
# Check compositeext configuration, strip extra digits from package version to
# find the required protocol version
@@ -56,9 +63,11 @@
AC_SUBST(XCOMPOSITE_CFLAGS)
AC_SUBST(XCOMPOSITE_LIBS)
+XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
AC_OUTPUT([Makefile
src/Makefile
+ man/Makefile
xcomposite.pc])
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/libXcomposite-0.3.1/Makefile.am new/libXcomposite-0.3.2/Makefile.am
--- old/libXcomposite-0.3.1/Makefile.am 2006-10-12 00:30:42.000000000 +0200
+++ new/libXcomposite-0.3.2/Makefile.am 2007-04-24 04:11:37.000000000 +0200
@@ -21,9 +21,15 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
-SUBDIRS = src
+SUBDIRS = src man
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xcomposite.pc
-EXTRA_DIST = xcomposite.pc.in autogen.sh
+EXTRA_DIST = xcomposite.pc.in autogen.sh ChangeLog
+
+ChangeLog:
+ (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
+
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/libXcomposite-0.3.1/man/Makefile.am new/libXcomposite-0.3.2/man/Makefile.am
--- old/libXcomposite-0.3.1/man/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcomposite-0.3.2/man/Makefile.am 2007-05-02 23:45:05.000000000 +0200
@@ -0,0 +1,77 @@
+libmandir = $(LIB_MAN_DIR)
+
+LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
+
+libman_xml = Xcomposite.xml
+
+libman_PRE = $(libman_xml:xml=man)
+
+Xcomposite_man_aliases = \
+ XCompositeQueryExtension \
+ XCompositeQueryVersion \
+ XCompositeVersion \
+ XCompositeRedirectWindow \
+ XCompositeRedirectSubwindows \
+ XCompositeUnredirectWindow \
+ XCompositeUnredirectSubwindows \
+ XCompositeCreateRegionFromBorderClip \
+ XCompositeNameWindowPixmap \
+ XCompositeGetOverlayWindow \
+ XCompositeReleaseOverlayWindow
+
+libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
+ $(Xcomposite_man_aliases:=.@LIB_MAN_SUFFIX@)
+
+EXTRA_DIST = $(libman_PRE) $(libman_xml)
+
+CLEANFILES = $(libman_DATA)
+
+MAINTAINERCLEANFILES = $(libman_PRE)
+
+# Generate man page shadow files (Replaces InstallManPageAliases from Imake)
+
+BUILT_SOURCES = shadows.DONE
+
+shadows.DONE:
+ -rm -f $(Xcomposite_man_aliases:=.@LIB_MAN_SUFFIX@)
+ (for i in $(Xcomposite_man_aliases:=.@LIB_MAN_SUFFIX@) ; do \
+ echo .so man$(LIB_MAN_DIR_SUFFIX)/Xcomposite.$(LIB_MAN_SUFFIX) > $$i; \
+ done)
+ touch shadows.DONE
+
+CLEANFILES += shadows.DONE
+
+# Substitute system-specific values in man pages
+
+XORGRELSTRING = @PACKAGE_STRING@
+ XORGMANNAME = X Version 11
+
+MAN_SUBSTS = \
+ -e 's|"__vendorversion__"|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+ -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+ -e 's|__xservername__|Xorg|g' \
+ -e 's|__xconfigfile__|xorg.conf|g' \
+ -e 's|__projectroot__|$(prefix)|g' \
+ -e 's|__apploaddir__|$(appdefaultdir)|' \
+ -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
+ -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
+ -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
+ -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
+ -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
+
+SUFFIXES = .$(LIB_MAN_SUFFIX) .man .xml
+
+.man.$(LIB_MAN_SUFFIX):
+ sed $(MAN_SUBSTS) < $< > $@
+
+# Generate nroff sources from DocBook/xml
+
+dist-hook: $(libman_PRE)
+
+if HAVE_XMLTO
+.xml.man:
+ $(XMLTO) man $< && mv $*.__libmansuffix__ $@
+else
+.xml.man:
+ @echo "WARNING: configure did not find xmlto, cannot create $@ without it"
+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/libXcomposite-0.3.1/man/Xcomposite.man new/libXcomposite-0.3.2/man/Xcomposite.man
--- old/libXcomposite-0.3.1/man/Xcomposite.man 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcomposite-0.3.2/man/Xcomposite.man 2007-05-03 00:14:07.000000000 +0200
@@ -0,0 +1,180 @@
+.\" ** You probably do not want to edit this file directly **
+.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
+.\" Instead of manually editing it, you probably should edit the DocBook XML
+.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
+.TH "XCOMPOSITE" "__libmansuffix__" "23 April 2007" "__vendorversion__" "X Composite Extension Library"
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.SH "NAME"
+Xcomposite \- X Composite Extension library
+.SH "SYNOPSIS"
+.PP
+\fB#include <X11/extensions/Xcomposite.h>\fR
+.HP 30
+\fBBool\ \fBXCompositeQueryExtension\fR\fR\fB(\fR\fB\fBDisplay\ *\fR\fR\fB\fIdpy\fR\fR\fB, \fR\fBint\ *\fR\fB\fIevent_basep\fR\fR\fB, \fR\fBint\ *\fR\fB\fIerror_basep\fR\fR\fB);\fR
+.HP 30
+\fBStatus\ \fBXCompositeQueryVersion\fR\fR\fB(\fR\fBDisplay\ *\fR\fB\fIdpy\fR\fR\fB, \fR\fBint\ *\fR\fB\fImajor_versionp\fR\fR\fB, \fR\fBint\ *\fR\fB\fIminor_versionp\fR\fR\fB);\fR
+.HP 22
+\fBint\ \fBXCompositeVersion\fR\fR\fB(\fR\fBvoid);\fR
+.HP 30
+\fBvoid\ \fBXCompositeRedirectWindow\fR\fR\fB(\fR\fBDisplay\ *\fR\fB\fIdpy\fR\fR\fB, \fR\fBWindow\ \fR\fB\fIwindow\fR\fR\fB, \fR\fBint\ \fR\fB\fIupdate\fR\fR\fB);\fR
+.HP 34
+\fBvoid\ \fBXCompositeRedirectSubwindows\fR\fR\fB(\fR\fBDisplay\ *\fR\fB\fIdpy\fR\fR\fB, \fR\fBWindow\ \fR\fB\fIwindow\fR\fR\fB, \fR\fBint\ \fR\fB\fIupdate\fR\fR\fB);\fR
+.HP 32
+\fBvoid\ \fBXCompositeUnredirectWindow\fR\fR\fB(\fR\fBDisplay\ *\fR\fB\fIdpy\fR\fR\fB, \fR\fBWindow\ \fR\fB\fIwindow\fR\fR\fB, \fR\fBint\ \fR\fB\fIupdate\fR\fR\fB);\fR
+.HP 36
+\fBvoid\ \fBXCompositeUnredirectSubwindows\fR\fR\fB(\fR\fBDisplay\ *\fR\fB\fIdpy\fR\fR\fB, \fR\fBWindow\ \fR\fB\fIwindow\fR\fR\fB, \fR\fBint\ \fR\fB\fIupdate\fR\fR\fB);\fR
+.HP 51
+\fBXserverRegion\ \fBXCompositeCreateRegionFromBorderClip\fR\fR\fB(\fR\fBDisplay\ *\fR\fB\fIdpy\fR\fR\fB, \fR\fBWindow\ \fR\fB\fIwindow\fR\fR\fB);\fR
+.HP 34
+\fBPixmap\ \fBXCompositeNameWindowPixmap\fR\fR\fB(\fR\fBDisplay\ *\fR\fB\fIdpy\fR\fR\fB, \fR\fBWindow\ \fR\fB\fIwindow\fR\fR\fB);\fR
+.HP 34
+\fBWindow\ \fBXCompositeGetOverlayWindow\fR\fR\fB(\fR\fBDisplay\ *\fR\fB\fIdpy\fR\fR\fB, \fR\fBWindow\ \fR\fB\fIwindow\fR\fR\fB);\fR
+.HP 36
+\fBvoid\ \fBXCompositeReleaseOverlayWindow\fR\fR\fB(\fR\fBDisplay\ *\fR\fB\fIdpy\fR\fR\fB, \fR\fBWindow\ \fR\fB\fIwindow\fR\fR\fB);\fR
+.SH "DESCRIPTION"
+.PP
+The composite extension provides several related mechanisms:
+.TP
+Per\-hierarchy storage
+The rendering of an entire hierarchy of windows is redirected to off\-screen storage. The pixels of that hierarchy are available whenever it is viewable. Storage is automatically reallocated when the top level window changes size. Contents beyond the geometry of the top window are not preserved.
+.TP
+Automatic shadow update
+When a hierarchy is rendered off\-screen, the X server provides an automatic mechanism for presenting those contents within the parent window. The implementation is free to make this update lag behind actual rendering operations by an unspecified amount of time. This automatic update mechanism may be disabled so that the parent window contents can be completely determined by an external application.
+.TP
+Composite Overlay Window
+Version 0.3 of the protocol adds the Composite Overlay Window, which provides compositing managers with a surface on which to draw without interference. This window is always above normal windows and is always below the screen saver window. It is an InputOutput window whose width and height are the screen dimensions. Its visual is the root visual and its border width is zero. Attempts to redirect it using the composite extension are ignored. This window does not appear in the reply of the QueryTree request. It is also an override redirect window. These last two features make it invisible to window managers and other X11 clients. The only way to access the XID of this window is via the CompositeGetOverlayWindow request. Initially, the Composite Overlay Window is unmapped.
+.PP
+Per\-hierarchy storage may be created for individual windows or for all children of a window. Manual shadow update may be selected by only a single application for each window; manual update may also be selected on a per\-window basis or for each child of a window. Detecting when to update may be done with the Damage extension.
+.PP
+The off\-screen storage includes the window contents, its borders and the contents of all descendants.
+.SH "ARGUMENTS"
+.PP
+.TP
+\fIdisplay\fR
+Pointer to the
+\fBDisplay\fR
+structure returned from
+\fBXOpenDisplay\fR
+for the connection to the X server.
+.TP
+\fIevent_basep\fR
+Pointer to integer where the base value for Composite Extension events will be stored.
+.TP
+\fIerror_basep\fR
+Pointer to integer where the base value for Composite Extension errors will be stored.
+.TP
+\fImajor_versionp\fR
+Pointer to integer where the major version of the Composite Extension supported by the X server will be stored.
+.TP
+\fIminor_versionp\fR
+Pointer to integer where the minor version of the Composite Extension supported by the X server will be stored.
+.TP
+\fIwindow\fR
+Specifies the window ID to operate on.
+.TP
+\fIupdate\fR
+Specifies the mode for updating the window contents. Must be either
+\fBCompositeRedirectAutomatic\fR
+or
+\fBCompositeRedirectManual\fR.
+.SH "FUNCTIONS"
+.PP
+.TP
+\fBXCompositeQueryExtension\fR
+\fBXCompositeQueryExtension\fR
+determines if the Composite Extension is available on the given display. It returns
+\fBTrue\fR
+if the extension is supported, otherwise
+\fBFalse\fR. If the extension is present, the base values for events and errors are returned, and can be used to decode incoming event and error values.
+.TP
+\fBXCompositeQueryVersion\fR
+\fBXCompositeQueryVersion\fR
+determines if the X Server supports a version of the X Composite Extension which is compatible with the client library. A non\-zero Status is returned if a compatible version of the extension is supported, otherwise a zero Status is returned. If the extension is supported, the major and minor version numbers are returned to indicate the level of Composite Extension support. No other XComposite functions (except XCompositeQueryExtension) may be called before this function. If a client violates this rule, the effects of all subsequent XComposite calls that it makes are undefined.
+.TP
+\fBXCompositeVersion\fR
+\fBXCompositeVersion\fR
+returns the version of the X Composite library. The version number is encoded as:
+(major * 10000) + (minor * 100) + revision
+.sp
+For example, version 1.4.6 would be encoded as the integer 10406.
+.TP
+\fBXCompositeRedirectWindow\fR
+\fBXCompositeRedirectWindow\fR
+requests the X server to direct the hierarchy starting at
+\fIwindow\fR
+to off\-screen storage. The
+\fIupdate\fR
+argument specifies whether the contents are mirrored to the parent window automatically or not. Only one client at a time may specify an update type of
+\fBCompositeRedirectManual\fR, another attempt will result in a
+BadAccess
+error. When all clients enabling redirection terminate, the redirection will automatically be disabled.
+.sp
+The root window may not be redirected. Doing so results in a
+BadMatch
+error. Specifying an invalid window id will result in a
+BadWindow
+error.
+.TP
+\fBXCompositeRedirectSubwindows\fR
+\fBXCompositeRedirectSubwindows\fR
+requests the X server to redirect hierarchies starting at all current and future children of
+\fIwindow\fR
+as in
+\fBXCompositeRedirectWindow\fR. If
+\fIupdate\fR
+is
+\fBCompositeRedirectManual\fR, then painting of the window background during window manipulation and ClearArea requests is inhibited.
+.TP
+\fBXCompositeUnredirectWindow\fR
+\fBXCompositeUnredirectWindow\fR
+requests the X server to terminate redirection of
+\fIwindow\fR. If the specified window was not selected for redirection by the current client, a
+BadValue
+error results.
+.TP
+\fBXCompositeUnredirectSubwindows\fR
+\fBXCompositeUnredirectWindow\fR
+requests the X server to terminate redirection of all children of
+\fIwindow\fR. If the specified window was not selected for sub\-redirection by the current client, a
+BadValue
+error results.
+.TP
+\fBXCompositeCreateRegionFromBorderClip\fR
+\fBXCompositeCreateRegionFromBorderClip\fR
+creates a region containing the "usual" border clip value; that is the area of the window clipped against siblings and the parent. This region can be used to restrict rendering to suitable areas while updating only a single window. The region is copied at the moment the request is executed; future changes to the window hierarchy will not be reflected in this region.
+.TP
+\fBXCompositeNameWindowPixmap\fR
+\fBXCompositeNameWindowPixmap\fR
+creates and returns a pixmap id that serves as a reference to the off\-screen storage for
+\fIwindow\fR. This pixmap will remain allocated until freed, even if the window is unmapped, reconfigured or destroyed. However, the window will get a new pixmap allocated each time it is mapped or resized, so this function will need to be reinvoked for the client to continue to refer to the storage holding the current window contents. Generates a
+BadMatch
+error if
+\fIwindow\fR
+is not redirected or is not visible.
+.sp
+The X server must support at least version 0.2 of the Composite Extension for
+\fBXCompositeNameWindowPixmap\fR.
+.TP
+\fBXCompositeGetOverlayWindow\fR
+\fBXCompositeGetOverlayWindow\fR
+returns the window ID of the Composite Overlay Window for the screen specified by the argument
+\fIwindow\fR. This function notifies the X server that the client wishes to use the Composite Overlay Window of this screen. If this Composite Overlay Window has not yet been mapped, it is mapped by this request.
+.sp
+The Composite Overlay Window for a particular screen will be unmapped when all clients who have called this function have either called
+\fBXCompositeReleaseOverlayWindow\fR
+for that screen, or terminated their connection to the X server.
+.sp
+The X server must support at least version 0.3 of the Composite Extension for
+\fBXCompositeGetOverlayWindow\fR.
+.TP
+\fBXCompositeReleaseOverlayWindow\fR
+This request specifies that the client is no longer using the Composite Overlay Window on the screen specified by the argument
+\fIwindow\fR. A screen's Composite Overlay Window is unmapped when there are no longer any clients using it.
+.sp
+The X server must support at least version 0.3 of the Composite Extension for
+\fBXCompositeReleaseOverlayWindow\fR.
+.SH "AUTHOR"
+Keith Packard <keithp(a)keithp.com>, Deron Johnson <deron.johnson(a)sun.com>.
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/libXcomposite-0.3.1/man/Xcomposite.xml new/libXcomposite-0.3.2/man/Xcomposite.xml
--- old/libXcomposite-0.3.1/man/Xcomposite.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/libXcomposite-0.3.2/man/Xcomposite.xml 2007-04-24 04:08:23.000000000 +0200
@@ -0,0 +1,397 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE reference PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" >
+<reference>
+<!--
+ Based on proto/compositeproto/compositeproto.txt
+
+ Conversion to DocBook/XML API documentation is:
+
+ Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+
+ 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, and/or sell copies of the Software, and to permit persons
+ to whom the Software is furnished to do so, provided that the above
+ copyright notice(s) and this permission notice appear in all copies of
+ the Software and that both the above copyright notice(s) and this
+ permission notice appear in supporting documentation.
+
+ 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
+ OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+ INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+ FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+ Except as contained in this notice, the name of a copyright holder
+ shall not be used in advertising or otherwise to promote the sale, use
+ or other dealings in this Software without prior written authorization
+ of the copyright holder.
+
+ -->
+<title>X Composite Extension Library</title>
+
+<refentry id='Xcomposite.man'>
+ <refentryinfo>
+ <productname>__vendorversion__</productname>
+ <pubdate>23 April 2007</pubdate>
+ <authorgroup>
+ <author><firstname>Keith</firstname><surname>Packard</surname>
+ <contrib>Extension specification and implementation</contrib>
+ <email>keithp(a)keithp.com</email>
+ </author>
+ <author><firstname>Deron</firstname><surname>Johnson</surname>
+ <contrib>Overlay Window specification and implementation</contrib>
+ <email>deron.johnson(a)sun.com</email>
+ </author>
+ </authorgroup>
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>Xcomposite</refentrytitle>
+ <manvolnum>__libmansuffix__</manvolnum>
+ </refmeta>
+ <refnamediv>
+ <refname>Xcomposite</refname>
+ <refpurpose>X Composite Extension library</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv><funcsynopsis>
+ <funcsynopsisinfo>#include <X11/extensions/Xcomposite.h></funcsynopsisinfo>
+ <funcprototype>
+ <funcdef>Bool <function>XCompositeQueryExtension</function></funcdef>
+ <paramdef><type>Display *</type><parameter>dpy</parameter></paramdef>
+ <paramdef>int *<parameter>event_basep</parameter></paramdef>
+ <paramdef>int *<parameter>error_basep</parameter></paramdef>
+ </funcprototype>
+ <funcprototype>
+ <funcdef>Status <function>XCompositeQueryVersion</function></funcdef>
+ <paramdef>Display *<parameter>dpy</parameter></paramdef>
+ <paramdef>int *<parameter>major_versionp</parameter></paramdef>
+ <paramdef>int *<parameter>minor_versionp</parameter></paramdef>
+ </funcprototype>
+ <funcprototype>
+ <funcdef>int <function>XCompositeVersion</function></funcdef>
+ <void />
+ </funcprototype>
+ <funcprototype>
+ <funcdef>void <function>XCompositeRedirectWindow</function></funcdef>
+ <paramdef>Display *<parameter>dpy</parameter></paramdef>
+ <paramdef>Window <parameter>window</parameter></paramdef>
+ <paramdef>int <parameter>update</parameter></paramdef>
+ </funcprototype>
+ <funcprototype>
+ <funcdef>void <function>XCompositeRedirectSubwindows</function></funcdef>
+ <paramdef>Display *<parameter>dpy</parameter></paramdef>
+ <paramdef>Window <parameter>window</parameter></paramdef>
+ <paramdef>int <parameter>update</parameter></paramdef>
+ </funcprototype>
+ <funcprototype>
+ <funcdef>void <function>XCompositeUnredirectWindow</function></funcdef>
+ <paramdef>Display *<parameter>dpy</parameter></paramdef>
+ <paramdef>Window <parameter>window</parameter></paramdef>
+ <paramdef>int <parameter>update</parameter></paramdef>
+ </funcprototype>
+ <funcprototype>
+ <funcdef>void <function>XCompositeUnredirectSubwindows</function></funcdef>
+ <paramdef>Display *<parameter>dpy</parameter></paramdef>
+ <paramdef>Window <parameter>window</parameter></paramdef>
+ <paramdef>int <parameter>update</parameter></paramdef>
+ </funcprototype>
+ <funcprototype>
+ <funcdef>XserverRegion <function>XCompositeCreateRegionFromBorderClip</function></funcdef>
+ <paramdef>Display *<parameter>dpy</parameter></paramdef>
+ <paramdef>Window <parameter>window</parameter></paramdef>
+ </funcprototype>
+ <funcprototype>
+ <funcdef>Pixmap <function>XCompositeNameWindowPixmap</function></funcdef>
+ <paramdef>Display *<parameter>dpy</parameter></paramdef>
+ <paramdef>Window <parameter>window</parameter></paramdef>
+ </funcprototype>
+ <funcprototype>
+ <funcdef>Window <function>XCompositeGetOverlayWindow</function></funcdef>
+ <paramdef>Display *<parameter>dpy</parameter></paramdef>
+ <paramdef>Window <parameter>window</parameter></paramdef>
+ </funcprototype>
+ <funcprototype>
+ <funcdef>void <function>XCompositeReleaseOverlayWindow</function></funcdef>
+ <paramdef>Display *<parameter>dpy</parameter></paramdef>
+ <paramdef>Window <parameter>window</parameter></paramdef>
+ </funcprototype>
+ </funcsynopsis></refsynopsisdiv>
+
+<refsect1><title>Description</title>
+<para>
+The composite extension provides several related mechanisms:
+ <variablelist>
+ <varlistentry>
+ <term>Per-hierarchy storage</term>
+ <listitem><para>
+ The rendering of an entire hierarchy of windows
+ is redirected to off-screen storage. The pixels of that hierarchy
+ are available whenever it is viewable. Storage is automatically
+ reallocated when the top level window changes size. Contents beyond
+ the geometry of the top window are not preserved.
+ </para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Automatic shadow update</term>
+ <listitem><para>
+ When a hierarchy is rendered off-screen,
+ the X server provides an automatic mechanism for presenting those
+ contents within the parent window. The implementation is free to
+ make this update lag behind actual rendering operations by an
+ unspecified amount of time. This automatic update mechanism may
+ be disabled so that the parent window contents can be completely
+ determined by an external application.
+ </para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Composite Overlay Window</term>
+ <listitem><para>
+ Version 0.3 of the protocol adds the Composite Overlay Window, which
+ provides compositing managers with a surface on which to draw without
+ interference. This window is always above normal windows and is always
+ below the screen saver window. It is an InputOutput window whose width
+ and height are the screen dimensions. Its visual is the root visual
+ and its border width is zero. Attempts to redirect it using the
+ composite extension are ignored. This window does not appear in the
+ reply of the QueryTree request. It is also an override redirect window.
+ These last two features make it invisible to window managers and other
+ X11 clients. The only way to access the XID of this window is via the
+ CompositeGetOverlayWindow request. Initially, the Composite Overlay
+ Window is unmapped.
+ </para></listitem>
+ </varlistentry>
+ </variablelist>
+</para>
+<para>
+Per-hierarchy storage may be created for individual windows or for all
+children of a window. Manual shadow update may be selected by only a single
+application for each window; manual update may also be selected on a
+per-window basis or for each child of a window. Detecting when to update
+may be done with the Damage extension.
+</para>
+<para>
+The off-screen storage includes the window contents, its borders and the
+contents of all descendants.
+</para>
+</refsect1>
+<refsect1><title>Arguments</title>
+<para>
+ <variablelist>
+ <varlistentry>
+ <term><parameter>display</parameter></term>
+ <listitem><para>
+ Pointer to the <type>Display</type> structure returned from
+ <function>XOpenDisplay</function> for the connection to the X server.
+ </para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>event_basep</parameter></term>
+ <listitem><para>
+ Pointer to integer where the base value for Composite Extension events
+ will be stored.
+ </para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>error_basep</parameter></term>
+ <listitem><para>
+ Pointer to integer where the base value for Composite Extension errors
+ will be stored.
+ </para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>major_versionp</parameter></term>
+ <listitem><para>
+ Pointer to integer where the major version of the Composite Extension
+ supported by the X server will be stored.
+ </para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>minor_versionp</parameter></term>
+ <listitem><para>
+ Pointer to integer where the minor version of the Composite Extension
+ supported by the X server will be stored.
+ </para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>window</parameter></term>
+ <listitem><para>
+ Specifies the window ID to operate on.
+ </para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><parameter>update</parameter></term>
+ <listitem><para>
+ Specifies the mode for updating the window contents. Must be either
+ <constant>CompositeRedirectAutomatic</constant> or
+ <constant>CompositeRedirectManual</constant>.
+ </para></listitem>
+ </varlistentry>
+ </variablelist>
+</para></refsect1>
+<refsect1><title>Functions</title>
+<para>
+ <variablelist>
+ <varlistentry>
+ <term><function>XCompositeQueryExtension</function></term>
+ <listitem><para>
+ <function>XCompositeQueryExtension</function> determines if the
+ Composite Extension is available on the given display. It returns
+ <constant>True</constant> if the extension is supported, otherwise
+ <constant>False</constant>. If the extension is present, the base
+ values for events and errors are returned, and can be used to
+ decode incoming event and error values.
+ </para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><function>XCompositeQueryVersion</function></term>
+ <listitem><para>
+ <function>XCompositeQueryVersion</function> determines if the X Server
+ supports a version of the X Composite Extension which is compatible
+ with the client library. A non-zero Status is returned if a compatible
+ version of the extension is supported, otherwise a zero Status is returned.
+ If the extension is supported, the major and minor version numbers are
+ returned to indicate the level of Composite Extension support.
+ No other XComposite functions (except XCompositeQueryExtension) may be
+ called before this function. If a client violates this rule, the
+ effects of all subsequent XComposite calls that it makes are undefined.
+ </para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><function>XCompositeVersion</function></term>
+ <listitem><para>
+ <function>XCompositeVersion</function> returns the version of the
+ X Composite library. The version number is encoded as:
+ <blockquote><para><code language="C">
+ (major * 10000) + (minor * 100) + revision
+ </code></para></blockquote>
+ </para>
+ <para>
+ For example, version 1.4.6 would be encoded as the integer 10406.
+ </para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><function>XCompositeRedirectWindow</function></term>
+ <listitem><para>
+ <function>XCompositeRedirectWindow</function> requests the X server
+ to direct the hierarchy starting at <parameter>window</parameter> to
+ off-screen storage.
+ The <parameter>update</parameter> argument specifies whether
+ the contents are mirrored to the parent window automatically or not.
+ Only one client at a time may specify an update type of
+ <constant>CompositeRedirectManual</constant>, another attempt will
+ result in a <errorname>BadAccess</errorname> error. When all clients
+ enabling redirection terminate, the redirection will automatically be
+ disabled.
+ </para><para>
+ The root window may not be redirected. Doing so results in a
+ <errorname>BadMatch</errorname> error. Specifying an invalid
+ window id will result in a <errorname>BadWindow</errorname> error.
+ </para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><function>XCompositeRedirectSubwindows</function></term>
+ <listitem><para>
+ <function>XCompositeRedirectSubwindows</function> requests the X
+ server to redirect hierarchies starting at all current and future
+ children of <parameter>window</parameter> as in
+ <function>XCompositeRedirectWindow</function>.
+ If <parameter>update</parameter> is
+ <constant>CompositeRedirectManual</constant>, then painting of the
+ window background during window manipulation and ClearArea requests
+ is inhibited.
+ </para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><function>XCompositeUnredirectWindow</function></term>
+ <listitem><para>
+ <function>XCompositeUnredirectWindow</function> requests the X
+ server to terminate redirection of <parameter>window</parameter>.
+ If the specified window was not selected for redirection by the
+ current client, a <errorname>BadValue</errorname> error results.
+ </para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><function>XCompositeUnredirectSubwindows</function></term>
+ <listitem><para>
+ <function>XCompositeUnredirectWindow</function> requests the X
+ server to terminate redirection of all children of
+ <parameter>window</parameter>.
+ If the specified window was not selected for sub-redirection by the
+ current client, a <errorname>BadValue</errorname> error results.
+ </para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><function>XCompositeCreateRegionFromBorderClip</function></term>
+ <listitem><para>
+ <function>XCompositeCreateRegionFromBorderClip</function>
+ creates a region containing the "usual" border clip
+ value; that is the area of the window clipped against siblings and
+ the parent. This region can be used to restrict rendering to
+ suitable areas while updating only a single window. The region
+ is copied at the moment the request is executed; future changes
+ to the window hierarchy will not be reflected in this region.
+ </para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><function>XCompositeNameWindowPixmap</function></term>
+ <listitem><para>
+ <function>XCompositeNameWindowPixmap</function> creates and returns
+ a pixmap id that serves as a reference to the off-screen storage for
+ <parameter>window</parameter>. This pixmap will remain allocated
+ until freed, even if the window is unmapped, reconfigured or
+ destroyed. However, the window will get a new pixmap allocated each
+ time it is mapped or resized, so this function will need to be
+ reinvoked for the client to continue to refer to the storage holding
+ the current window contents. Generates a
+ <errorname>BadMatch</errorname> error if <parameter>window</parameter>
+ is not redirected or is not visible.
+ </para><para>
+ The X server must support at least version 0.2 of the Composite
+ Extension for <function>XCompositeNameWindowPixmap</function>.
+ </para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><function>XCompositeGetOverlayWindow</function></term>
+ <listitem><para>
+ <function>XCompositeGetOverlayWindow</function> returns the window ID
+ of the Composite Overlay Window for
+ the screen specified by the argument <parameter>window</parameter>.
+ This function notifies the X server that the client wishes to use
+ the Composite Overlay Window of this screen. If this
+ Composite Overlay Window has not yet been mapped, it is mapped by this
+ request.
+ </para><para>
+ The Composite Overlay Window for a particular screen will be
+ unmapped when all clients who have called this function have
+ either called <function>XCompositeReleaseOverlayWindow</function>
+ for that screen, or terminated their connection to the X server.
+ </para><para>
+ The X server must support at least version 0.3 of the Composite
+ Extension for <function>XCompositeGetOverlayWindow</function>.
+ </para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><function>XCompositeReleaseOverlayWindow</function></term>
+ <listitem><para>
+ This request specifies that the client is no longer using the
+ Composite Overlay Window on the screen specified by the
+ argument <parameter>window</parameter>. A screen's Composite
+ Overlay Window is unmapped when there are no longer any clients using it.
+ </para><para>
+ The X server must support at least version 0.3 of the Composite
+ Extension for <function>XCompositeReleaseOverlayWindow</function>.
+ </para></listitem>
+ </varlistentry>
+ </variablelist>
+</para>
+</refsect1>
+</refentry>
+</reference>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
[View Less]
1
0
Hello community,
here is the log from the commit of package xorg-x11-driver-video
checked in at Fri May 4 00:33:28 CEST 2007.
--------
--- xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-04-27 07:59:00.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes 2007-05-02 23:06:15.786740000 +0200
@@ -1,0 +2,6 @@
+Wed May 2 23:05:48 CEST 2007 - sndirsch(a)suse.de
+
+- xf86-video-nv-8800ultra.diff:
+ * support for GeForce 8800 Ultra
+
+-------…
[View More]------------------------------------------------------------
New:
----
xf86-video-nv-8800ultra.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-video.spec ++++++
--- /var/tmp/diff_new_pack.JN8525/_old 2007-05-04 00:33:18.000000000 +0200
+++ /var/tmp/diff_new_pack.JN8525/_new 2007-05-04 00:33:18.000000000 +0200
@@ -14,7 +14,7 @@
BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk
URL: http://xorg.freedesktop.org/
Version: 7.2
-Release: 88
+Release: 90
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -73,6 +73,7 @@
Patch1: radeon-xrandr-dotclock.diff
Patch2: radeon_dell.diff
Patch3: ps_nv.diff
+Patch4: xf86-video-nv-8800ultra.diff
Patch5: mga-g200se_pci-fix.diff
Patch9: xf86-video-sunffb.diff
Patch10: xf86-video-tdfx.diff
@@ -120,6 +121,7 @@
popd
pushd xf86-video-nv-*/src
%patch3 -p6
+%patch4 -p2
popd
pushd xf86-video-mga-*/src
tar xzf %{SOURCE44}
@@ -259,6 +261,9 @@
%{_mandir}/man4/*
%changelog
+* Wed May 02 2007 - sndirsch(a)suse.de
+- xf86-video-nv-8800ultra.diff:
+ * support for GeForce 8800 Ultra
* Fri Apr 27 2007 - sndirsch(a)suse.de
- xf86-video-nv-20070425.tar.bz2
* Merge branch 'randr-1.2'
++++++ xf86-video-nv-8800ultra.diff ++++++
src/nv_driver.c | 1 +
1 files changed, 1 insertion(+)
New commits:
diff-tree 100d7c7393eda92e5b26ac4f4cc33a8dce86c364 (from ed9f98853a781344c10cb801214917e13bddf27c)
Author: Aaron Plattner <aplattner(a)nvidia.com>
Date: Wed May 2 09:33:33 2007 -0700
GeForce 8800 Ultra
diff --git a/src/nv_driver.c b/src/nv_driver.c
index c8b98b8..a20bf64 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -336,6 +336,7 @@ static SymTabRec NVKnownChipsets[] =
/*************** G8x ***************/
{ 0x10DE0191, "GeForce 8800 GTX" },
{ 0x10DE0193, "GeForce 8800 GTS" },
+ { 0x10DE0194, "GeForce 8800 Ultra" },
{ 0x10DE019D, "Quadro FX 5600" },
{ 0x10DE019E, "Quadro FX 4600" },
{ 0x10DE0400, "GeForce 8600 GTS" },
_______________________________________________
xorg-commit mailing list
xorg-commit(a)lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/xorg-commit
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
[View Less]
1
0
Hello community,
here is the log from the commit of package xen
checked in at Fri May 4 00:32:46 CEST 2007.
--------
--- arch/i386/xen/xen.changes 2007-04-25 21:42:09.000000000 +0200
+++ /mounts/work_src_done/STABLE/xen/xen.changes 2007-05-02 01:44:34.000000000 +0200
@@ -1,0 +2,22 @@
+Tue May 1 17:43:33 MDT 2007 - jfehlig(a)novell.com
+
+- Integrated domUloader with 3.0.5. Updated xen-domUloader.diff.
+
+-------------------------------------------------------------------
+Mon Apr 30 10:44:…
[View More]41 MDT 2007 - ccoffing(a)novell.com
+
+- Update to xen-3.0.5-testing rc4 (changeset 14993).
+
+-------------------------------------------------------------------
+Thu Apr 26 13:20:36 MDT 2007 - jfehlig(a)novell.com
+
+- Fixed autobuild error in function that returns random data.
+ File tools/ioemu/hw/piix4acpi.c line 72. Fix added to
+ xen-warnings.diff.
+
+-------------------------------------------------------------------
+Thu Apr 26 11:59:04 MDT 2007 - ccoffing(a)novell.com
+
+- Fix build on SLES 10 SP1.
+
+-------------------------------------------------------------------
Old:
----
xen-bootloader-tidy.diff
xen-man-xm-bad-char.diff
New:
----
pv-driver-build.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xen.spec ++++++
--- /var/tmp/diff_new_pack.wo5475/_old 2007-05-04 00:31:46.000000000 +0200
+++ /var/tmp/diff_new_pack.wo5475/_new 2007-05-04 00:31:46.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package xen (Version 3.0.5_14934)
+# spec file for package xen (Version 3.0.5_14993)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,7 +13,7 @@
Name: xen
%define xvers 3.0
%define xvermaj 3
-%define changeset 14934
+%define changeset 14993
%define xen_build_dir xen-3.0.5-testing
%define with_install 1
%if %sles_version
@@ -22,14 +22,19 @@
# openSUSE 10.3 kernel is not yet ready...
%define with_kmp 0
%endif
-BuildRequires: LibVNCServer SDL-devel autoconf automake bin86 curl-devel dev86 graphviz latex2html libjpeg-devel libxml2-devel openssl openssl-devel python-devel texlive texlive-latex transfig
+BuildRequires: LibVNCServer SDL-devel autoconf automake bin86 curl-devel dev86 graphviz latex2html libjpeg-devel libxml2-devel openssl openssl-devel python-devel transfig
+%if %suse_version >= 1030
+BuildRequires: texlive texlive-latex
+%else
+BuildRequires: te_ams te_latex tetex
+%endif
%ifarch x86_64
BuildRequires: glibc-32bit glibc-devel-32bit
%endif
%if %{?with_kmp}0
BuildRequires: kernel-source kernel-syms xorg-x11
%endif
-Version: 3.0.5_14934
+Version: 3.0.5_14993
Release: 1
License: GNU General Public License (GPL)
Group: System/Kernel
@@ -64,7 +69,6 @@
Patch8: xen-xmexample.diff
Patch9: xen-xmexample-nbd.diff
Patch10: xen-bootloader-dryrun.diff
-Patch11: xen-bootloader-tidy.diff
Patch12: xen-domUloader.diff
Patch13: xen-linguas.diff
Patch14: xen-messages.diff
@@ -80,7 +84,6 @@
Patch24: xen-lowmem-emergency-pool.diff
Patch25: block-losetup-retry.diff
Patch26: block-flags.diff
-Patch27: xen-man-xm-bad-char.diff
Patch28: xen-hvm-default-bridge.diff
Patch29: xen-hvm-netfront.diff
Patch30: xen-hvm-default-pae.diff
@@ -103,6 +106,7 @@
Patch47: supported_module.diff
Patch48: disable_emulated_device.diff
Patch49: balloon-early.patch
+Patch50: pv-driver-build.patch
# Misc unused patches / need to be re-ported:
Patch300: xen-enable-hvm-debug.diff
URL: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/
@@ -514,8 +518,7 @@
%patch8 -p1
%patch9 -p1
%patch10 -p1
-%patch11 -p1
-#%patch12 -p1 # re-port
+%patch12 -p1
#%patch13 -p1 # po files are misnamed upstream
%patch14 -p1
%patch15 -p1
@@ -530,7 +533,6 @@
%patch24 -p1
%patch25 -p1
%patch26 -p1
-%patch27 -p1
%patch28 -p1
%patch29 -p1
%patch30 -p1
@@ -553,6 +555,7 @@
%patch47 -p1
%patch48 -p1
%patch49 -p1
+%patch50 -p1
XEN_EXTRAVERSION=%version-%release
XEN_EXTRAVERSION=${XEN_EXTRAVERSION#%{xvers}}
sed -i "s/XEN_EXTRAVERSION[ ]*.=.*\$/XEN_EXTRAVERSION = $XEN_EXTRAVERSION/" xen/Makefile
@@ -870,6 +873,16 @@
%{insserv_cleanup}
%changelog
+* Tue May 01 2007 - jfehlig(a)novell.com
+- Integrated domUloader with 3.0.5. Updated xen-domUloader.diff.
+* Mon Apr 30 2007 - ccoffing(a)novell.com
+- Update to xen-3.0.5-testing rc4 (changeset 14993).
+* Thu Apr 26 2007 - jfehlig(a)novell.com
+- Fixed autobuild error in function that returns random data.
+ File tools/ioemu/hw/piix4acpi.c line 72. Fix added to
+ xen-warnings.diff.
+* Thu Apr 26 2007 - ccoffing(a)novell.com
+- Fix build on SLES 10 SP1.
* Wed Apr 25 2007 - ccoffing(a)novell.com
- Update to xen-3.0.5-testing rc3 (changeset 14934).
- Switch BuildRequires to texlive.
++++++ balloon-early.patch ++++++
--- /var/tmp/diff_new_pack.wo5475/_old 2007-05-04 00:31:46.000000000 +0200
+++ /var/tmp/diff_new_pack.wo5475/_new 2007-05-04 00:31:46.000000000 +0200
@@ -2,13 +2,17 @@
===================================================================
--- xen-3.0.5-testing.orig/tools/python/xen/xend/XendDomainInfo.py
+++ xen-3.0.5-testing/tools/python/xen/xend/XendDomainInfo.py
-@@ -1444,6 +1444,9 @@ class XendDomainInfo:
+@@ -1440,10 +1440,10 @@ class XendDomainInfo:
+ raise VmError("HVM guest support is unavailable: is VT/AMD-V "
"supported by your CPU and enabled in your "
"BIOS?")
+- # Hack to pre-reserve some memory for HVM setup.
+- # Needed because Xen allocates 1MB by default immediately.
+- balloon.free(2*1024) # 2MB should be plenty
+ # The hypervisor needs some domheap pages to create the VM.
+ # Final ballooning for the domain's pages will be done later.
-+ balloon.free(16 * 1024)
++ balloon.free(2 * 1024)
self.domid = xc.domain_create(
domid = 0,
ssidref = security.get_security_info(self.info, 'ssidref'),
++++++ pv-driver-build.patch ++++++
Index: xen-3.0.5-testing/unmodified_drivers/linux-2.6/mkbuildtree
===================================================================
--- xen-3.0.5-testing.orig/unmodified_drivers/linux-2.6/mkbuildtree
+++ xen-3.0.5-testing/unmodified_drivers/linux-2.6/mkbuildtree
@@ -11,7 +11,12 @@ fi
C=$PWD
XEN=$C/../../xen
-XL=$C/../../linux-2.6-xen-sparse
+if [ -n "$XL" -a -d "$XL" ]; then
+ XL=$(cd $XL && pwd)
+else
+ XL=/usr/src/linux
+fi
+cd "$(dirname "$0")"
for d in $(find ${XL}/drivers/xen/ -maxdepth 1 -type d | sed -e 1d); do
if ! echo $d | egrep -q back; then
Index: xen-3.0.5-testing/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h
===================================================================
--- xen-3.0.5-testing.orig/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h
+++ xen-3.0.5-testing/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h
@@ -107,4 +107,12 @@ extern char *kasprintf(gfp_t gfp, const
#define __supported_pte_mask ((maddr_t)0)
#endif
+/*
+ * This variable at present is referenced by netfront, but only in code that
+ * is dead when running in hvm guests. To detect potential active uses of it
+ * in the future, don't try to supply a 'valid' value here, so that any
+ * mappings created with it will fault when accessed.
+ */
+#define __supported_pte_mask ((maddr_t)0)
+
#endif
Index: xen-3.0.5-testing/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c
===================================================================
--- xen-3.0.5-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c
+++ xen-3.0.5-testing/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c
@@ -119,7 +119,9 @@ void *kzalloc(size_t size, int flags)
EXPORT_SYMBOL(kzalloc);
#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
+#if defined(CONFIG_SUSE_KERNEL) \
+ ? LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16) \
+ : LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
/* Simplified asprintf. */
char *kasprintf(gfp_t gfp, const char *fmt, ...)
{
++++++ x86-extra-trap-info.patch ++++++
--- /var/tmp/diff_new_pack.wo5475/_old 2007-05-04 00:31:46.000000000 +0200
+++ /var/tmp/diff_new_pack.wo5475/_new 2007-05-04 00:31:46.000000000 +0200
@@ -1,9 +1,9 @@
-Index: xen-unstable/xen/arch/x86/x86_32/entry.S
+Index: xen-3.0.5-testing/xen/arch/x86/x86_32/entry.S
===================================================================
---- xen-unstable.orig/xen/arch/x86/x86_32/entry.S
-+++ xen-unstable/xen/arch/x86/x86_32/entry.S
+--- xen-3.0.5-testing.orig/xen/arch/x86/x86_32/entry.S
++++ xen-3.0.5-testing/xen/arch/x86/x86_32/entry.S
@@ -386,21 +386,33 @@ ring1: /* obtain ss/esp from oldss/olde
- movb $0,TRAPBOUNCE_flags(%edx)
+ movl %eax,UREGS_eip+4(%esp)
ret
.section __ex_table,"a"
- .long .Lft6,domain_crash_synchronous , .Lft7,domain_crash_synchronous
@@ -46,12 +46,12 @@
domain_crash_synchronous:
pushl $domain_crash_synchronous_string
call printk
-Index: xen-unstable/xen/arch/x86/x86_64/entry.S
+Index: xen-3.0.5-testing/xen/arch/x86/x86_64/entry.S
===================================================================
---- xen-unstable.orig/xen/arch/x86/x86_64/entry.S
-+++ xen-unstable/xen/arch/x86/x86_64/entry.S
-@@ -339,17 +339,30 @@ create_bounce_frame:
- movb $0,TRAPBOUNCE_flags(%rdx)
+--- xen-3.0.5-testing.orig/xen/arch/x86/x86_64/entry.S
++++ xen-3.0.5-testing/xen/arch/x86/x86_64/entry.S
+@@ -338,17 +338,30 @@ create_bounce_frame:
+ movq %rax,UREGS_rip+8(%rsp)
ret
.section __ex_table,"a"
- .quad .Lft2,domain_crash_synchronous , .Lft3,domain_crash_synchronous
++++++ xen-3.0.5-testing-src.tar.bz2 ++++++
++++ 5981 lines of diff (skipped)
++++++ xen-domUloader.diff ++++++
--- /var/tmp/diff_new_pack.wo5475/_old 2007-05-04 00:31:54.000000000 +0200
+++ /var/tmp/diff_new_pack.wo5475/_new 2007-05-04 00:31:54.000000000 +0200
@@ -1,29 +1,19 @@
-Index: xen-3.0.4-testing/tools/python/xen/xend/XendBootloader.py
+Index: xen-3.0.5-testing/tools/python/xen/xend/XendBootloader.py
===================================================================
---- xen-3.0.4-testing.orig/tools/python/xen/xend/XendBootloader.py
-+++ xen-3.0.4-testing/tools/python/xen/xend/XendBootloader.py
+--- xen-3.0.5-testing.orig/tools/python/xen/xend/XendBootloader.py
++++ xen-3.0.5-testing/tools/python/xen/xend/XendBootloader.py
@@ -14,6 +14,7 @@
- import os, select, errno, stat
+ import os, select, errno, stat, signal
import random
+import re
import shlex
from xen.xend import sxp
-@@ -57,6 +58,8 @@ def bootloader(blexec, disk, quiet = Fal
- args.append("-q")
- if dryrun:
- args.append("--dryrun")
-+ if kernel_args:
-+ args.append("--args=%s" % kernel_args)
- args.append("--output=%s" % fifo)
- if blargs:
- args.extend(shlex.split(blargs))
-@@ -97,3 +100,26 @@ def bootloader(blexec, disk, quiet = Fal
- pin.input_eof()
- blcfg = pin.val
- return blcfg
-+
+@@ -187,3 +188,14 @@ def bootloader_tidy(dom):
+ os.kill(pid, signal.SIGKILL)
+
+
+def bootfilter(bootloader, bootloader_args, vdisk):
+ """Is this virtual disk ok to boot from?"""
+ if vdisk.endswith(':disk'):
@@ -35,81 +25,30 @@
+ if m:
+ return vdisk == m.group(1) or vdisk == m.group(2)
+ return True
-+
-+def bootselector(bootloader, bootloader_args, disks):
-+ """Returns the desired disk to boot from.
-+ @param disks List of (pdev, vdev, ...) tuples.
-+ """
-+ if bootloader.endswith('domUloader.py'):
-+ for disk in disks:
-+ if bootfilter(bootloader, bootloader_args, disk[1]):
-+ return disk
-+ return disks[0]
-+
-Index: xen-3.0.4-testing/tools/python/xen/xend/XendDomainInfo.py
+Index: xen-3.0.5-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
---- xen-3.0.4-testing.orig/tools/python/xen/xend/XendDomainInfo.py
-+++ xen-3.0.4-testing/tools/python/xen/xend/XendDomainInfo.py
-@@ -41,7 +41,7 @@ from xen.xend import balloon, sxp, uuid,
- from xen.xend import XendRoot, XendNode, XendConfig
+--- xen-3.0.5-testing.orig/tools/python/xen/xend/XendDomainInfo.py
++++ xen-3.0.5-testing/tools/python/xen/xend/XendDomainInfo.py
+@@ -42,7 +42,7 @@ from xen.xend import balloon, sxp, uuid,
+ from xen.xend import XendOptions, XendNode, XendConfig
from xen.xend.XendConfig import scrub_password
--from xen.xend.XendBootloader import bootloader
-+from xen.xend.XendBootloader import bootloader, bootfilter
+-from xen.xend.XendBootloader import bootloader, bootloader_tidy
++from xen.xend.XendBootloader import bootloader, bootloader_tidy, bootfilter
from xen.xend.XendError import XendError, VmError
from xen.xend.XendDevices import XendDevices
- from xen.xend.xenstore.xstransact import xstransact, complete
-@@ -1556,13 +1556,17 @@ class XendDomainInfo:
- if not devtype or not devinfo or devtype not in ('vbd', 'tap'):
- continue
- disk = None
-+ vdisk = None
- for param in devinfo:
- if param[0] == 'uname':
- disk = param[1]
-- break
-+ elif param[0] == 'dev':
-+ vdisk = param[1]
-
- if disk is None:
- continue
-+ if not bootfilter(blexec, bootloader_args, vdisk):
-+ continue
- fn = blkdev_uname_to_file(disk)
- mounted = devtype == 'tap' and not os.stat(fn).st_rdev
- if mounted:
-Index: xen-3.0.4-testing/tools/python/xen/xm/create.py
-===================================================================
---- xen-3.0.4-testing.orig/tools/python/xen/xm/create.py
-+++ xen-3.0.4-testing/tools/python/xen/xm/create.py
-@@ -29,7 +29,7 @@ import xmlrpclib
- from xen.xend import sxp
- from xen.xend import PrettyPrint
- import xen.xend.XendClient
--from xen.xend.XendBootloader import bootloader
-+from xen.xend.XendBootloader import bootloader, bootselector
- from xen.util import blkif
- from xen.util import security
-
-@@ -710,16 +710,18 @@ def run_bootloader(vals, config_image):
- err("Bootloader '%s' isn't executable" % vals.bootloader)
- if len(vals.disk) < 1:
- err("No disks configured and boot loader requested")
-- (uname, dev, mode, backend) = vals.disk[0]
-- file = blkif.blkdev_uname_to_file(uname)
-
- if vals.bootentry:
- warn("The bootentry option is deprecated. Use bootargs and pass "
- "--entry= directly.")
- vals.bootargs = "--entry=%s" %(vals.bootentry,)
-
-+ bootdisk = bootselector(vals.bootloader, vals.bootargs, vals.disk)
-+ uname = bootdisk[0]
-+ file = blkif.blkdev_uname_to_file(uname)
- return bootloader(vals.bootloader, file, not vals.console_autoconnect,
-- vals.bootargs, config_image)
-+ vals.bootargs,
-+ kernel_args = sxp.child_value(config_image, 'args'))
+ from xen.xend.XendTask import XendTask
+@@ -1779,8 +1779,11 @@ class XendDomainInfo:
+ blexec = osdep.pygrub_path
+
+ blcfg = None
+- disks = [x for x in self.info['vbd_refs']
+- if self.info['devices'][x][1]['bootable']]
++ disks = []
++ for x in self.info['vbd_refs']:
++ vdisk = self.info['devices'][x][1]['dev']
++ if bootfilter(blexec, bootloader_args, vdisk):
++ disks.append(x)
- def make_config(vals):
- """Create the domain configuration.
+ if not disks:
+ msg = "Had a bootloader specified, but no disks are bootable"
++++++ xen-vm-install.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xen-vm-install/src/gui/gui.py new/xen-vm-install/src/gui/gui.py
--- old/xen-vm-install/src/gui/gui.py 2007-04-06 01:34:12.000000000 +0200
+++ new/xen-vm-install/src/gui/gui.py 2007-04-27 22:06:05.000000000 +0200
@@ -852,18 +852,18 @@
return False
def _stateChangeCB(job, state):
- gtk.threads_enter()
+ gtk.gdk.threads_enter()
label.set_text(state[2])
pbar.set_fraction((state[0]+1) / float(state[1]))
- gtk.threads_leave()
+ gtk.gdk.threads_leave()
def _getSettingsCB(job):
return self.defaults
def _errorCB(job, text):
- gtk.threads_enter()
+ gtk.gdk.threads_enter()
self._error_box(xen.install.msg.error, text)
- gtk.threads_leave()
+ gtk.gdk.threads_leave()
try:
xen.install.log.info("Starting VM creation job...")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xen-vm-install/TODO new/xen-vm-install/TODO
--- old/xen-vm-install/TODO 2007-04-20 23:06:26.000000000 +0200
+++ new/xen-vm-install/TODO 2007-04-27 22:10:05.000000000 +0200
@@ -160,6 +160,10 @@
+ #260983: support booting PV RHEL4,5
===RC3===
+===openSUSE 10.3===
+ + gtk.threads_* -> gtk.gdk.threads_*
+
+
- RHEL4/SLES9 isn't defaulting to FV in GUI (but is in CLI)
- finish virt-manager & disks
- "Virtual Disk" field too wide
++++++ xen-warnings.diff ++++++
--- /var/tmp/diff_new_pack.wo5475/_old 2007-05-04 00:31:55.000000000 +0200
+++ /var/tmp/diff_new_pack.wo5475/_new 2007-05-04 00:31:55.000000000 +0200
@@ -1,21 +1,32 @@
-Index: xen-unstable/xen/tools/symbols.c
+Index: xen-3.0.5-testing/tools/ioemu/hw/piix4acpi.c
===================================================================
---- xen-unstable.orig/xen/tools/symbols.c
-+++ xen-unstable/xen/tools/symbols.c
-@@ -80,7 +80,8 @@ static int read_symbol(FILE *in, struct
- if (rc != 3) {
- if (rc != EOF) {
- /* skip line */
-- fgets(str, 500, in);
-+ if (fgets(str, sizeof(str), in) == NULL)
-+ ; /* don't care */
- }
- return -1;
- }
-Index: xen-unstable/tools/misc/miniterm/miniterm.c
+--- xen-3.0.5-testing.orig/tools/ioemu/hw/piix4acpi.c
++++ xen-3.0.5-testing/tools/ioemu/hw/piix4acpi.c
+@@ -69,6 +69,8 @@ static int piix4acpi_load(QEMUFile *f, v
+ if (version_id > 1)
+ return -EINVAL;
+ qemu_get_be16s(f, &s->pm1_control);
++
++ return 0;
+ }
+
+ static void acpiPm1Control_writeb(void *opaque, uint32_t addr, uint32_t val)
+Index: xen-3.0.5-testing/tools/ioemu/hw/usb-hid.c
+===================================================================
+--- xen-3.0.5-testing.orig/tools/ioemu/hw/usb-hid.c
++++ xen-3.0.5-testing/tools/ioemu/hw/usb-hid.c
+@@ -557,6 +557,7 @@ int usb_mouse_load(QEMUFile *f, void *op
+ fprintf(logfile, "usb_mouse_load:add usb_mouse_event.\n");
+ qemu_add_mouse_event_handler(usb_mouse_event, s, 0);
+ }
++ return 0;
+ }
+
+
+Index: xen-3.0.5-testing/tools/misc/miniterm/miniterm.c
===================================================================
---- xen-unstable.orig/tools/misc/miniterm/miniterm.c
-+++ xen-unstable/tools/misc/miniterm/miniterm.c
+--- xen-3.0.5-testing.orig/tools/misc/miniterm/miniterm.c
++++ xen-3.0.5-testing/tools/misc/miniterm/miniterm.c
@@ -157,7 +157,7 @@ int main(int argc, char **argv)
case 0:
close(1); /* stdout not needed */
@@ -49,15 +60,17 @@
break;
}
-Index: xen-unstable/tools/ioemu/hw/usb-hid.c
+Index: xen-3.0.5-testing/xen/tools/symbols.c
===================================================================
---- xen-unstable.orig/tools/ioemu/hw/usb-hid.c
-+++ xen-unstable/tools/ioemu/hw/usb-hid.c
-@@ -557,6 +557,7 @@ int usb_mouse_load(QEMUFile *f, void *op
- fprintf(logfile, "usb_mouse_load:add usb_mouse_event.\n");
- qemu_add_mouse_event_handler(usb_mouse_event, s, 0);
- }
-+ return 0;
- }
-
-
+--- xen-3.0.5-testing.orig/xen/tools/symbols.c
++++ xen-3.0.5-testing/xen/tools/symbols.c
+@@ -80,7 +80,8 @@ static int read_symbol(FILE *in, struct
+ if (rc != 3) {
+ if (rc != EOF) {
+ /* skip line */
+- fgets(str, 500, in);
++ if (fgets(str, sizeof(str), in) == NULL)
++ ; /* don't care */
+ }
+ return -1;
+ }
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
[View Less]
1
0
Hello community,
here is the log from the commit of package sax2
checked in at Fri May 4 00:31:33 CEST 2007.
--------
--- sax2/sax2.changes 2007-04-26 10:30:40.000000000 +0200
+++ /mounts/work_src_done/STABLE/sax2/sax2.changes 2007-05-03 15:16:26.563133000 +0200
@@ -1,0 +2,22 @@
+Thu May 3 14:37:41 CEST 2007 - ms(a)suse.de
+
+- update translations
+- added support for reverse layout (right-to-left languages).
+ The sax translation file offers a key named "I18N" which could
+ be translated …
[View More]as "RTL". In this case the application will use
+ the reverse layout for displaying the data (#268608)
+
+-------------------------------------------------------------------
+Thu May 3 13:43:56 CEST 2007 - ms(a)suse.de
+
+- fixed info messages not to be showed if specific dialog is
+ requested by option --dialog | -O (#269787)
+
+-------------------------------------------------------------------
+Tue May 1 10:46:22 CEST 2007 - ms(a)suse.de
+
+- added opendir patch by Dieter Jäger <dieter(a)linuxjaeger.de>
+ libsax bug which causes an endless loop if there is no xfine
+ cache directory
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sax2.spec ++++++
--- /var/tmp/diff_new_pack.DG2124/_old 2007-05-04 00:30:30.000000000 +0200
+++ /var/tmp/diff_new_pack.DG2124/_new 2007-05-04 00:30:30.000000000 +0200
@@ -45,7 +45,7 @@
%endif
Summary: SuSE advanced X Window System-configuration
Version: 8.1
-Release: 136
+Release: 140
Group: System/X11/Utilities
License: GNU General Public License (GPL)
Source: sax2.tar.bz2
@@ -472,6 +472,19 @@
%endif
%changelog
+* Thu May 03 2007 - ms(a)suse.de
+- update translations
+- added support for reverse layout (right-to-left languages).
+ The sax translation file offers a key named "I18N" which could
+ be translated as "RTL". In this case the application will use
+ the reverse layout for displaying the data (#268608)
+* Thu May 03 2007 - ms(a)suse.de
+- fixed info messages not to be showed if specific dialog is
+ requested by option --dialog | -O (#269787)
+* Tue May 01 2007 - ms(a)suse.de
+- added opendir patch by Dieter Jäger <dieter(a)linuxjaeger.de>
+ libsax bug which causes an endless loop if there is no xfine
+ cache directory
* Thu Apr 26 2007 - ms(a)suse.de
- disabled modeline calculation for nv driver (#230961)
- fixed monitor detection for Belinea 105075 (#261155)
++++++ sax2.tar.bz2 ++++++
sax2/sax2.tar.bz2 /mounts/work_src_done/STABLE/sax2/sax2.tar.bz2 differ: byte 11, line 1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
[View Less]
1
0
Hello community,
here is the log from the commit of package libpcap
checked in at Fri May 4 00:29:46 CEST 2007.
--------
--- libpcap/libpcap.changes 2007-03-29 11:33:58.000000000 +0200
+++ /mounts/work_src_done/STABLE/libpcap/libpcap.changes 2007-05-02 16:43:31.357516000 +0200
@@ -1,0 +2,5 @@
+Wed May 2 16:40:08 CEST 2007 - pth(a)suse.de
+
+- Use correct version for naming the shared library (#270226)
+
+-------------------------------------------------------------------
++++++++++++++++++++…
[View More]++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libpcap.spec ++++++
--- /var/tmp/diff_new_pack.G32515/_old 2007-05-04 00:28:53.000000000 +0200
+++ /var/tmp/diff_new_pack.G32515/_new 2007-05-04 00:28:53.000000000 +0200
@@ -13,7 +13,7 @@
Name: libpcap
BuildRequires: bison flex
Version: 0.9.5
-Release: 11
+Release: 16
Autoreqprov: on
Group: System/Libraries
License: BSD License and BSD-like
@@ -58,19 +58,20 @@
%build
%{suse_update_config -f}
-aclocal --force
-libtoolize --force
-autoconf --force
-autoheader --force
-CFLAGS="$RPM_OPT_FLAGS -fpic" CXXFLAGS="$RPM_OPT_FLAGS -fpic" \
- ./configure \
+#aclocal --force
+#libtoolize --force
+#autoconf --force
+#autoheader --force
+autoreconf -fi
+export CFLAGS="$RPM_OPT_FLAGS -fpic" CXXFLAGS="$RPM_OPT_FLAGS -fpic"
+./configure \
--prefix=%{_prefix} \
--sysconfdir=%{_sysconfdir} \
--libdir=%{_libdir} \
--infodir=%{_infodir} \
--mandir=%{_mandir} \
--enable-ipv6
-make
+make VERSION=%{version}
%install
make DESTDIR=$RPM_BUILD_ROOT install
@@ -86,6 +87,8 @@
%{_includedir}/*
%changelog
+* Wed May 02 2007 - pth(a)suse.de
+- Use correct version for naming the shared library (#270226)
* Thu Mar 29 2007 - rguenther(a)suse.de
- add flex and bison BuildRequires
* Tue Jan 16 2007 - prusnak(a)suse.cz
++++++ libpcap-0.9.5-config.diff ++++++
--- /var/tmp/diff_new_pack.G32515/_old 2007-05-04 00:28:53.000000000 +0200
+++ /var/tmp/diff_new_pack.G32515/_new 2007-05-04 00:28:53.000000000 +0200
@@ -1,6 +1,6 @@
--- configure.in
+++ configure.in
-@@ -55,7 +55,7 @@
+@@ -56,7 +56,7 @@
AC_CHECK_FUNCS(vsnprintf snprintf,,
[needsnprintf=yes])
if test $needsnprintf = yes; then
++++++ libpcap-0.9.5-nonvoid.diff ++++++
--- /var/tmp/diff_new_pack.G32515/_old 2007-05-04 00:28:53.000000000 +0200
+++ /var/tmp/diff_new_pack.G32515/_new 2007-05-04 00:28:53.000000000 +0200
@@ -8,7 +8,7 @@
}
#endif /*INET6*/
-@@ -5296,6 +5297,7 @@
+@@ -5295,6 +5296,7 @@
}
bpf_error("ethernet address used in non-ether expression");
/* NOTREACHED */
@@ -16,7 +16,7 @@
}
void
-@@ -5725,6 +5727,7 @@
+@@ -5724,6 +5726,7 @@
}
bpf_error("too many registers needed to evaluate expression");
/* NOTREACHED */
@@ -24,7 +24,7 @@
}
/*
-@@ -6315,6 +6318,7 @@
+@@ -6314,6 +6317,7 @@
}
bpf_error("ARCnet address used in non-arc expression");
/* NOTREACHED */
++++++ libpcap-0.9.5-shared.diff ++++++
--- /var/tmp/diff_new_pack.G32515/_old 2007-05-04 00:28:53.000000000 +0200
+++ /var/tmp/diff_new_pack.G32515/_new 2007-05-04 00:28:53.000000000 +0200
@@ -1,20 +1,21 @@
--- Makefile.in
+++ Makefile.in
-@@ -37,6 +37,13 @@
+@@ -37,6 +37,14 @@
srcdir = @srcdir@
VPATH = @srcdir@
+###
+# pcaplib version
-+MAJOR = 0
-+MINOR = 9.3
-+VERSION = $(MAJOR).$(MINOR)
-+export MAJOR MINOR VERSION
++VERSION = @PACKAGE_VERSION@
++MAJOR = $(shell echo $(VERSION)|cut -d. -f1)
++MINOR = $(shell echo $(VERSION)|cut -d. -f2)
++REVISION = $(shell echo $(VERSION)|cut -d. -f3)
++export MAJOR MINOR REVISION VERSION
+
#
# You shouldn't need to edit anything below.
#
-@@ -95,31 +102,22 @@
+@@ -95,31 +103,22 @@
TAGFILES = \
$(SRC) $(HDR) $(TAGHDR)
@@ -53,8 +54,12 @@
scanner.c: $(srcdir)/scanner.l
-@@ -173,8 +171,11 @@
- install: libpcap.a
+@@ -170,11 +169,14 @@
+ bpf_filter.o: bpf_filter.c
+ $(CC) $(CFLAGS) -c bpf_filter.c
+
+-install: libpcap.a
++install: $(all)
[ -d $(DESTDIR)$(libdir) ] || \
(mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
- $(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a
@@ -66,7 +71,7 @@
[ -d $(DESTDIR)$(includedir) ] || \
(mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir))
$(INSTALL_DATA) $(srcdir)/pcap.h $(DESTDIR)$(includedir)/pcap.h
-@@ -196,6 +197,7 @@
+@@ -196,6 +198,7 @@
uninstall:
rm -f $(DESTDIR)$(libdir)/libpcap.a
@@ -74,3 +79,15 @@
rm -f $(DESTDIR)$(includedir)/pcap.h
rm -f $(DESTDIR)$(includedir)/pcap-bpf.h
rm -f $(DESTDIR)$(includedir)/pcap-namedb.h
+--- configure.in
++++ configure.in
+@@ -8,7 +8,8 @@
+
+ AC_REVISION($Revision: 1.120.2.8 $)
+ AC_PREREQ(2.50)
+-AC_INIT(pcap.c)
++AC_INIT([libpcap], [0.9.5])
++AC_CONFIG_SRCDIR([pcap.c])
+
+ AC_CANONICAL_SYSTEM
+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
[View Less]
1
0
Hello community,
here is the log from the commit of package fuse
checked in at Fri May 4 00:28:46 CEST 2007.
--------
--- fuse/fuse.changes 2007-02-09 01:08:58.000000000 +0100
+++ /mounts/work_src_done/STABLE/fuse/fuse.changes 2007-05-02 14:11:35.044799000 +0200
@@ -1,0 +2,10 @@
+Wed May 2 14:02:28 CEST 2007 - mszeredi(a)suse.de
+
+- updated to version 2.6.5
+ * mount.fuse script fixes
+ * fix exiting on umount for filesystems which block SIGHUP
+- udev rule for fuse device is now in udev …
[View More]package
+- don't remove fuse module in the init-script
+- use 'fusectl' as the filesystem source
+
+-------------------------------------------------------------------
Old:
----
fuse-2.6.3.tar.bz2
New:
----
fuse-2.6.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fuse.spec ++++++
--- /var/tmp/diff_new_pack.T30179/_old 2007-05-04 00:28:28.000000000 +0200
+++ /var/tmp/diff_new_pack.T30179/_new 2007-05-04 00:28:28.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package fuse (Version 2.6.3)
+# spec file for package fuse (Version 2.6.5)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,8 +12,8 @@
Name: fuse
Summary: Userspace File System
-Version: 2.6.3
-Release: 3
+Version: 2.6.5
+Release: 1
License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL)
Group: System/Filesystems
Source: %{name}-%{version}.tar.bz2
@@ -96,9 +96,6 @@
%doc AUTHORS COPYING* ChangeLog FAQ NEWS README*
%{_libdir}/lib*.so.*
%verify(not mode) %attr(4750,root,trusted) %{_bindir}/fusermount
-%dir %{_sysconfdir}/udev
-%dir %{_sysconfdir}/udev/rules.d
-%{_sysconfdir}/udev/rules.d/99-fuse.rules
/sbin/mount.fuse
%{_bindir}/ulockmgr_server
@@ -111,7 +108,14 @@
%{_includedir}/ulockmgr.h
%{_libdir}/pkgconfig/*.pc
-%changelog -n fuse
+%changelog
+* Wed May 02 2007 - mszeredi(a)suse.de
+- updated to version 2.6.5
+ * mount.fuse script fixes
+ * fix exiting on umount for filesystems which block SIGHUP
+- udev rule for fuse device is now in udev package
+- don't remove fuse module in the init-script
+- use 'fusectl' as the filesystem source
* Fri Feb 09 2007 - ro(a)suse.de
- change fillup_and_insserv to insserv_force_if_yast in post-script
(there is no sysconfig file involved here)
++++++ boot.fuse ++++++
--- fuse/boot.fuse 2007-02-07 16:37:23.000000000 +0100
+++ /mounts/work_src_done/STABLE/fuse/boot.fuse 2007-05-02 14:09:16.962014000 +0200
@@ -34,7 +34,7 @@
if grep -qw fusectl /proc/filesystems && \
! grep -qw $MOUNTPOINT /proc/mounts; then
echo -n "Mounting fuse control filesystem"
- mount -t fusectl none $MOUNTPOINT >/dev/null 2>&1
+ mount -t fusectl fusectl $MOUNTPOINT >/dev/null 2>&1
else
echo -n "Fuse control filesystem already available"
fi
@@ -54,13 +54,6 @@
echo -n "Fuse control filesystem not mounted"
fi
rc_status -v
- if grep -qw "^fuse" /proc/modules; then
- echo -n "Unloading fuse module"
- rmmod fuse >/dev/null 2>&1
- else
- echo -n "Fuse module not loaded"
- fi
- rc_status -v
;;
reload)
echo -n "Reloading fuse filesystem"
++++++ fuse-2.6.3.tar.bz2 -> fuse-2.6.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fuse-2.6.3/ChangeLog new/fuse-2.6.5/ChangeLog
--- old/fuse-2.6.3/ChangeLog 2007-02-04 14:46:11.000000000 +0100
+++ new/fuse-2.6.5/ChangeLog 2007-04-29 11:05:29.000000000 +0200
@@ -1,3 +1,54 @@
+2007-04-28 Miklos Szeredi <miklos(a)szeredi.hu>
+
+ * Released 2.6.5
+
+2007-04-28 Miklos Szeredi <miklos(a)szeredi.hu>
+
+ * Fix in typo in mount.fuse. Reported by Jakub Moc
+
+2007-04-27 Miklos Szeredi <miklos(a)szeredi.hu>
+
+ * Released 2.6.4
+
+2007-04-26 Miklos Szeredi <miklos(a)szeredi.hu>
+
+ * Ublock SIGHUP in multithreaded loop, since it's needed for
+ exiting on unmount. Reported by Elena
+
+2007-04-18 Miklos Szeredi <miklos(a)szeredi.hu>
+
+ * Use patch from Debian Bug#413403 to fix problems with bash in
+ mount.fuse
+
+2007-04-15 Miklos Szeredi <miklos(a)szeredi.hu>
+
+ * Add -lulockmgr to compilation comment in fusexmp_fh.c
+
+2007-04-05 Miklos Szeredi <miklos(a)szeredi.hu>
+
+ * mount.fuse should handle spaces in paths. Debian Bug#417834.
+ Reported by Alexander Blazej
+
+ * Use "fusectl" as the device for the fusectl filesystem. Debian
+ Bug#417945. Reported by Laurent Bonnaud
+
+2007-03-05 Miklos Szeredi <miklos(a)szeredi.hu>
+
+ * mount.fuse should use /bin/bash. Debian Bug#413403. Reported
+ by Thomas Weinbrenner
+
+2007-02-26 Miklos Szeredi <miklos(a)szeredi.hu>
+
+ * Fix detection of installed fuse in init script. Reported and
+ fix suggested by Davide Canova
+
+2007-02-05 Miklos Szeredi <miklos(a)szeredi.hu>
+
+ * Fix 2.6.9 RHEL kernels, which have compatibility mutex.h, but
+ don't define mutex_destroy(), bummer. Patch from Phil Schwan
+
+ * Fix option parsing in mount.fuse. Patch from Jens M. Noedler
+
2007-02-04 Miklos Szeredi <miklos(a)szeredi.hu>
* Released 2.6.3
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fuse-2.6.3/configure new/fuse-2.6.5/configure
--- old/fuse-2.6.3/configure 2007-02-04 15:30:48.000000000 +0100
+++ new/fuse-2.6.5/configure 2007-04-29 11:13:15.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for fuse 2.6.3.
+# Generated by GNU Autoconf 2.61 for fuse 2.6.5.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -721,8 +721,8 @@
# Identity of this package.
PACKAGE_NAME='fuse'
PACKAGE_TARNAME='fuse'
-PACKAGE_VERSION='2.6.3'
-PACKAGE_STRING='fuse 2.6.3'
+PACKAGE_VERSION='2.6.5'
+PACKAGE_STRING='fuse 2.6.5'
PACKAGE_BUGREPORT=''
# Factoring default headers for most tests.
@@ -1386,7 +1386,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 fuse 2.6.3 to adapt to many kinds of systems.
+\`configure' configures fuse 2.6.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1457,7 +1457,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of fuse 2.6.3:";;
+ short | recursive ) echo "Configuration of fuse 2.6.5:";;
esac
cat <<\_ACEOF
@@ -1558,7 +1558,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-fuse configure 2.6.3
+fuse configure 2.6.5
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1572,7 +1572,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by fuse $as_me 2.6.3, which was
+It was created by fuse $as_me 2.6.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2368,7 +2368,7 @@
# Define the identity of the package.
PACKAGE='fuse'
- VERSION='2.6.3'
+ VERSION='2.6.5'
cat >>confdefs.h <<_ACEOF
@@ -12053,7 +12053,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by fuse $as_me 2.6.3, which was
+This file was extended by fuse $as_me 2.6.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12106,7 +12106,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-fuse config.status 2.6.3
+fuse config.status 2.6.5
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fuse-2.6.3/configure.in new/fuse-2.6.5/configure.in
--- old/fuse-2.6.3/configure.in 2007-02-04 01:10:25.000000000 +0100
+++ new/fuse-2.6.5/configure.in 2007-04-29 11:05:35.000000000 +0200
@@ -1,4 +1,4 @@
-AC_INIT(fuse, 2.6.3)
+AC_INIT(fuse, 2.6.5)
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE
AM_CONFIG_HEADER(include/config.h)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fuse-2.6.3/example/fusexmp_fh.c new/fuse-2.6.5/example/fusexmp_fh.c
--- old/fuse-2.6.3/example/fusexmp_fh.c 2006-12-09 19:51:13.000000000 +0100
+++ new/fuse-2.6.5/example/fusexmp_fh.c 2007-04-15 21:31:57.000000000 +0200
@@ -5,7 +5,7 @@
This program can be distributed under the terms of the GNU GPL.
See the file COPYING.
- gcc -Wall `pkg-config fuse --cflags --libs` fusexmp_fh.c -o fusexmp_fh
+ gcc -Wall `pkg-config fuse --cflags --libs` -lulockmgr fusexmp_fh.c -o fusexmp_fh
*/
#define FUSE_USE_VERSION 26
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fuse-2.6.3/kernel/configure new/fuse-2.6.5/kernel/configure
--- old/fuse-2.6.3/kernel/configure 2007-02-04 15:30:25.000000000 +0100
+++ new/fuse-2.6.5/kernel/configure 2007-04-29 11:12:54.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for fuse-kernel 2.6.3.
+# Generated by GNU Autoconf 2.61 for fuse-kernel 2.6.5.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -572,8 +572,8 @@
# Identity of this package.
PACKAGE_NAME='fuse-kernel'
PACKAGE_TARNAME='fuse-kernel'
-PACKAGE_VERSION='2.6.3'
-PACKAGE_STRING='fuse-kernel 2.6.3'
+PACKAGE_VERSION='2.6.5'
+PACKAGE_STRING='fuse-kernel 2.6.5'
PACKAGE_BUGREPORT=''
ac_subst_vars='SHELL
@@ -1130,7 +1130,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 fuse-kernel 2.6.3 to adapt to many kinds of systems.
+\`configure' configures fuse-kernel 2.6.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1191,7 +1191,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of fuse-kernel 2.6.3:";;
+ short | recursive ) echo "Configuration of fuse-kernel 2.6.5:";;
esac
cat <<\_ACEOF
@@ -1266,7 +1266,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-fuse-kernel configure 2.6.3
+fuse-kernel configure 2.6.5
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1280,7 +1280,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by fuse-kernel $as_me 2.6.3, which was
+It was created by fuse-kernel $as_me 2.6.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2473,7 +2473,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by fuse-kernel $as_me 2.6.3, which was
+This file was extended by fuse-kernel $as_me 2.6.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2522,7 +2522,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-fuse-kernel config.status 2.6.3
+fuse-kernel config.status 2.6.5
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fuse-2.6.3/kernel/configure.ac new/fuse-2.6.5/kernel/configure.ac
--- old/fuse-2.6.3/kernel/configure.ac 2007-02-04 14:25:22.000000000 +0100
+++ new/fuse-2.6.5/kernel/configure.ac 2007-04-29 11:05:44.000000000 +0200
@@ -1,4 +1,4 @@
-AC_INIT(fuse-kernel, 2.6.3)
+AC_INIT(fuse-kernel, 2.6.5)
AC_CONFIG_HEADERS([config.h])
AC_PROG_INSTALL
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fuse-2.6.3/kernel/fuse_i.h new/fuse-2.6.5/kernel/fuse_i.h
--- old/fuse-2.6.3/kernel/fuse_i.h 2007-02-04 14:27:57.000000000 +0100
+++ new/fuse-2.6.5/kernel/fuse_i.h 2007-02-05 09:08:48.000000000 +0100
@@ -67,6 +67,10 @@
#define mutex semaphore
#endif
#ifndef HAVE_I_MUTEX
+#ifndef mutex_destroy
+/* Some RHEL kernels include a backported mutex.h, which lacks mutex_destroy */
+#define mutex_destroy(m) do { } while (0)
+#endif
#define i_mutex i_sem /* Hack for struct inode */
#endif
#ifndef KERNEL_2_6_19_PLUS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fuse-2.6.3/lib/fuse_loop_mt.c new/fuse-2.6.5/lib/fuse_loop_mt.c
--- old/fuse-2.6.3/lib/fuse_loop_mt.c 2006-12-09 19:51:14.000000000 +0100
+++ new/fuse-2.6.5/lib/fuse_loop_mt.c 2007-04-26 18:00:13.000000000 +0200
@@ -182,6 +182,13 @@
err = fuse_start_thread(&mt);
pthread_mutex_unlock(&mt.lock);
if (!err) {
+ sigset_t set;
+
+ /* We need SIGHUP for exiting */
+ sigemptyset(&set);
+ sigaddset(&set, SIGHUP);
+ pthread_sigmask(SIG_UNBLOCK, &set, NULL);
+
while (!fuse_session_exited(se))
pause();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fuse-2.6.3/lib/Makefile.am new/fuse-2.6.5/lib/Makefile.am
--- old/fuse-2.6.3/lib/Makefile.am 2007-02-04 01:29:48.000000000 +0100
+++ new/fuse-2.6.5/lib/Makefile.am 2007-04-29 11:05:56.000000000 +0200
@@ -26,7 +26,7 @@
helper.c \
$(mount_source)
-libfuse_la_LDFLAGS = @libfuse_libs@ -version-number 2:6:3 \
+libfuse_la_LDFLAGS = @libfuse_libs@ -version-number 2:6:5 \
-Wl,--version-script,$(srcdir)/fuse_versionscript
libulockmgr_la_SOURCES = ulockmgr.c
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fuse-2.6.3/lib/Makefile.in new/fuse-2.6.5/lib/Makefile.in
--- old/fuse-2.6.3/lib/Makefile.in 2007-02-04 15:31:02.000000000 +0100
+++ new/fuse-2.6.5/lib/Makefile.in 2007-04-29 11:13:27.000000000 +0200
@@ -219,7 +219,7 @@
helper.c \
$(mount_source)
-libfuse_la_LDFLAGS = @libfuse_libs@ -version-number 2:6:3 \
+libfuse_la_LDFLAGS = @libfuse_libs@ -version-number 2:6:5 \
-Wl,--version-script,$(srcdir)/fuse_versionscript
libulockmgr_la_SOURCES = ulockmgr.c
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fuse-2.6.3/util/init_script new/fuse-2.6.5/util/init_script
--- old/fuse-2.6.3/util/init_script 2006-10-01 15:46:02.000000000 +0200
+++ new/fuse-2.6.5/util/init_script 2007-04-05 20:37:37.000000000 +0200
@@ -12,7 +12,7 @@
MOUNTPOINT=/sys/fs/fuse/connections
# Gracefully exit if the package has been removed.
-test -x `which fusermount` || exit 0
+which fusermount &>/dev/null || exit 0
error()
{
@@ -28,7 +28,7 @@
fi
if grep -qw fusectl /proc/filesystems && \
! grep -qw $MOUNTPOINT /proc/mounts; then
- mount -t fusectl none $MOUNTPOINT >/dev/null 2>&1 || \
+ mount -t fusectl fusectl $MOUNTPOINT >/dev/null 2>&1 || \
error "mounting control filesystem"
fi
echo "done."
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fuse-2.6.3/util/mount.fuse new/fuse-2.6.5/util/mount.fuse
--- old/fuse-2.6.3/util/mount.fuse 2006-12-09 19:51:15.000000000 +0100
+++ new/fuse-2.6.5/util/mount.fuse 2007-04-29 09:23:21.000000000 +0200
@@ -6,7 +6,7 @@
# to kick me to the right way
#
-VERSION="0.0.1"
+VERSION="0.0.2"
PRGNAME=`basename $0`
if [ -z "$HOME" ]; then
@@ -20,8 +20,8 @@
example: ${PRGNAME} sshfs#root@tux:/ /mnt/tuxssh -o rw
"
-function die {
- echo -e "$PRGNAME# $1" >&2
+die() {
+ echo "$PRGNAME# $1" >&2
[ -z "$2" ] && exit 128
exit "$2"
}
@@ -45,8 +45,20 @@
shift
shift
-ignore_opts='\(user\|nouser\|users\|auto\|noauto\|_netdev\)'
-
-OPTIONS=`echo $@ | sed "s/,${ignore_opts}\|${ignore_opts},//g"`
-
-${FSTYPE} ${MOUNTPATH} ${MOUNTPOINT} ${OPTIONS}
+# loop over each mount option and skip all that should be ignored
+IFS=","
+for OPT in $@; do
+ OPT=`echo $OPT | sed "s/^\(-o\|user\|nouser\|users\|auto\|noauto\|_netdev\)$/IGNORE/"`
+ if [ "$OPT" == "IGNORE" ]; then continue; fi
+ OPTIONS="$OPTIONS$OPT,"
+done
+IFS=" "
+
+# add "-o " and remove trailing comma
+OPTIONS="-o `echo $OPTIONS | sed "s/,$//"`"
+
+if test -z "$MOUNTPATH"; then
+ "${FSTYPE}" "${MOUNTPOINT}" ${OPTIONS}
+else
+ "${FSTYPE}" "${MOUNTPATH}" "${MOUNTPOINT}" ${OPTIONS}
+fi
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
[View Less]
1
0
Hello community,
here is the log from the commit of package cracklib
checked in at Fri May 4 00:28:22 CEST 2007.
--------
--- cracklib/cracklib.changes 2007-04-23 12:30:49.000000000 +0200
+++ /mounts/work_src_done/STABLE/cracklib/cracklib.changes 2007-05-03 16:12:32.741195000 +0200
@@ -1,0 +2,5 @@
+Thu May 3 16:02:49 CEST 2007 - mc(a)suse.de
+
+- add translations from Novell
+
+-------------------------------------------------------------------
Old:
----
cracklib-po.diff
New:
----
…
[View More]cracklib-po.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cracklib.spec ++++++
--- /var/tmp/diff_new_pack.o29261/_old 2007-05-04 00:28:16.000000000 +0200
+++ /var/tmp/diff_new_pack.o29261/_new 2007-05-04 00:28:16.000000000 +0200
@@ -16,14 +16,14 @@
Group: System/Libraries
Autoreqprov: on
Version: 2.8.10
-Release: 3
+Release: 6
Requires: cracklib-dict
Summary: Full dictionary for cracklib - A Password-Checking Library
Source: http://prdownloads.sourceforge.net/cracklib/cracklib-%{version}.tar.bz2
+Source1: cracklib-po.tar.gz
Patch: cracklib-magic.diff
Patch1: cracklib-trans.diff
Patch2: datarootdir.patch
-Patch3: cracklib-po.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -67,10 +67,10 @@
%prep
%setup -q
+%setup -a 1 -T -D
%patch
%patch1
%patch2
-%patch3
%build
autoreconf
@@ -136,6 +136,8 @@
%{_datadir}/cracklib/pw_dict.pwi
%changelog
+* Thu May 03 2007 - mc(a)suse.de
+- add translations from Novell
* Mon Apr 23 2007 - mc(a)suse.de
- added cracklib-dict-small and splitted the full dictionary
into a seperate package. [#265733]
++++++ cracklib-trans.diff ++++++
--- /var/tmp/diff_new_pack.o29261/_old 2007-05-04 00:28:16.000000000 +0200
+++ /var/tmp/diff_new_pack.o29261/_new 2007-05-04 00:28:16.000000000 +0200
@@ -5,313 +5,8 @@
dnl Set of available languages.
-ALL_LINGUAS="cs da de el es fi fr hu it ja lt nb nl pa pl pt_BR pt sl_SI sk zh_CN zh_TW"
-+ALL_LINGUAS="cs da de el es fi fr hu it ja km lt nb nl pa pl pt_BR pt sl_SI sk uk zh_CN zh_TW"
++ALL_LINGUAS="af ca cs da de el es fi fr gu hu it ja lt mr nb nl pa pl pt_BR pt ru sk sl_SI sv xh zh_CN zh_TW zu"
dnl Checks for programs.
AC_PROG_LIBTOOL
---- po/fi.po
-+++ po/fi.po 2006/03/27 14:41:04
-@@ -1,24 +1,25 @@
-+# translation of fi.po to
- # translation of cracklib.po to
--# Copyright (C) 2005 Free Software Foundation, Inc.
-+# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
- # This file is distributed under the same license as the PACKAGE package.
--# Jyri Palokangas <jmp(a)netti.fi>, 2005.
- #
-+# Jyri Palokangas <jmp(a)netti.fi>, 2005, 2006.
- msgid ""
- msgstr ""
--"Project-Id-Version: cracklib\n"
-+"Project-Id-Version: fi\n"
- "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2005-06-23 12:52+0200\n"
--"PO-Revision-Date: 2005-08-25 15:20+0300\n"
-+"PO-Revision-Date: 2006-03-23 07:43+0200\n"
- "Last-Translator: Jyri Palokangas <jmp(a)netti.fi>\n"
--"Language-Team: <fi(a)li.org>\n"
-+"Language-Team: <yast-trans-fi(a)kotoistaminen.novell.fi>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
--"X-Generator: KBabel 1.10.2\n"
-+"X-Generator: KBabel 1.11.2\n"
-
- #: lib/fascist.c:555
- msgid "you are not registered in the password file"
--msgstr "sinua ei ole rekisteröity salasana-tiedostossa"
-+msgstr "et ole rekisteröitynä salasana-tiedostossa"
-
- #: lib/fascist.c:569
- msgid "it is based on your username"
---- po/km.po
-+++ po/km.po 2006/03/06 12:05:32
-@@ -0,0 +1,78 @@
-+# translation of km.po to Khmer
-+# Leang Chumsoben <soben(a)khmeros.info>, 2005, 2006.
-+# Hok Kakada <hokkakada(a)khmeros.info>, 2006.
-+# Khoem Sokhem <khoemsokhem(a)khmeros.info>, 2006.
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: km\n"
-+"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2005-12-21 11:23+0100\n"
-+"PO-Revision-Date: 2006-02-15 08:51+0700\n"
-+"Last-Translator: Khoem Sokhem <khoemsokhem(a)khmeros.info>\n"
-+"Language-Team: Khmer <support(a)khmeros.info>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+"Plural-Forms: nplurals=2; plural=n != 1;\n"
-+"X-Generator: KBabel 1.11\n"
-+
-+#: lib/fascist.c:555
-+msgid "you are not registered in the password file"
-+msgstr "អ្នកមិនត្រូវបានចុះឈ្មោះនៅក្នុងឯកសារពាក្យសម្ងាត់ឡើយ"
-+
-+#: lib/fascist.c:569
-+msgid "it is based on your username"
-+msgstr "វាត្រូវបានផ្អែកលើឈ្មោះអ្នកប្រើរបស់អ្នក"
-+
-+#: lib/fascist.c:634
-+msgid "it is based upon your password entry"
-+msgstr "វាត្រូវបានផ្អែកលើធាតុពាក្យសម្ងាត់របស់អ្នក"
-+
-+#: lib/fascist.c:654
-+msgid "it is derived from your password entry"
-+msgstr "វាបានមកពីធាតុពាក្យសម្ងាត់របស់អ្នក"
-+
-+#: lib/fascist.c:667
-+msgid "it's derived from your password entry"
-+msgstr "វាបានមកពីធាតុពាក្យសម្ងាត់របស់អ្នក"
-+
-+#: lib/fascist.c:681
-+msgid "it is derivable from your password entry"
-+msgstr "វាអាចបានមកពីធាតុពាក្យសម្ងាត់របស់អ្នក"
-+
-+#: lib/fascist.c:695
-+msgid "it's derivable from your password entry"
-+msgstr "វាអាចបានមកពីធាតុពាក្យសម្ងាត់របស់អ្នក"
-+
-+#: lib/fascist.c:731
-+msgid "it is WAY too short"
-+msgstr "វាមានលក្ខណៈខ្លីពេក"
-+
-+#: lib/fascist.c:736
-+msgid "it is too short"
-+msgstr "វាខ្លីពេក"
-+
-+#: lib/fascist.c:753
-+msgid "it does not contain enough DIFFERENT characters"
-+msgstr "វាមិនមានតួអក្សរខុសគ្នាគ្រប់គ្រាន់ឡើយ"
-+
-+#: lib/fascist.c:767
-+msgid "it is all whitespace"
-+msgstr "វាជាចន្លោះទាំងអស់"
-+
-+#: lib/fascist.c:783
-+msgid "it is too simplistic/systematic"
-+msgstr "វាសាមញ្ញ ឬ ស៊ាំញ៉ាំពេក"
-+
-+#: lib/fascist.c:788
-+msgid "it looks like a National Insurance number."
-+msgstr "វាមើលទៅដូចជាលេខធានារ៉ាប់រងជាតិអញ្ចឹង ។"
-+
-+#: lib/fascist.c:815
-+msgid "it is based on a dictionary word"
-+msgstr "វាត្រូវបានផ្អែកលើពាក្យវចនានុក្រម"
-+
-+#: lib/fascist.c:834
-+msgid "it is based on a (reversed) dictionary word"
-+msgstr "វាត្រូវបានផ្អែកលើពាក្យវចនានុក្រម (បញ្ច្រាស)"
-+
---- po/pl.po
-+++ po/pl.po 2006/06/12 09:03:21
-@@ -1,47 +1,50 @@
--# SOME DESCRIPTIVE TITLE.
--# Copyright (C) YEAR Free Software Foundation, Inc.
-+# translation of pl.po to
-+# translation of pl.po to polski
-+# Copyright (C) 2006 Free Software Foundation, Inc.
- # This file is distributed under the same license as the PACKAGE package.
--# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-+# Stanisław Małolepszy <smalolepszy(a)aviary.pl>, 2006.
-+# Wojciech Kapusta <wojciech(a)aviary.pl>, 2006.
- #
- msgid ""
- msgstr ""
--"Project-Id-Version: cracklib TBD\n"
-+"Project-Id-Version: pl\n"
- "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2005-06-23 12:52+0200\n"
--"PO-Revision-Date: 2005-08-19 15:20+0200\n"
--"Last-Translator: Piotr Bolek <pb(a)7bull.com>\n"
--"Language-Team: Polish <i18n(a)suse.de>\n"
-+"PO-Revision-Date: 2006-03-23 18:38+0100\n"
-+"Last-Translator: Wojciech Kapusta <wojciech(a)aviary.pl>\n"
-+"Language-Team: <pl(a)li.org>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
-+"X-Generator: KBabel 1.9.1\n"
-
- #: lib/fascist.c:555
- msgid "you are not registered in the password file"
--msgstr "nie jesteś zarejestrowany w pliku passwd"
-+msgstr "brak rejestracji w pliku passwd"
-
- #: lib/fascist.c:569
- msgid "it is based on your username"
--msgstr "to jest oparte na twojej nazwie użytkownika"
-+msgstr "oparte na nazwie użytkownika"
-
- #: lib/fascist.c:634
- msgid "it is based upon your password entry"
--msgstr "oparte na twojej pozycji passwd"
-+msgstr "oparte na wpisie passwd"
-
- #: lib/fascist.c:654
- msgid "it is derived from your password entry"
--msgstr "pochodzi od twojej pozycji passwd"
-+msgstr "pochodzi od wpisu passwd"
-
- #: lib/fascist.c:667
- msgid "it's derived from your password entry"
--msgstr "pochodzi od twojej pozycji passwd"
-+msgstr "pochodzi od wpisu passwd"
-
- #: lib/fascist.c:681
- msgid "it is derivable from your password entry"
--msgstr "da się odtworzyć na podstawie twojej pozycji passwd"
-+msgstr "możliwe do odtworzenia na podstawie wpisu passwd"
-
- #: lib/fascist.c:695
- msgid "it's derivable from your password entry"
--msgstr "da się odtworzyć na podstawie twojej pozycji passwd"
-+msgstr "możliwe do odtworzenia na podstawie wpisu passwd"
-
- #: lib/fascist.c:731
- msgid "it is WAY too short"
-@@ -53,15 +56,15 @@
-
- #: lib/fascist.c:753
- msgid "it does not contain enough DIFFERENT characters"
--msgstr "nie zawiera wystarczająco RÓŻNYCH znaków"
-+msgstr "nie zawiera wystarczająco dużo RÓŻNYCH znaków"
-
- #: lib/fascist.c:767
- msgid "it is all whitespace"
--msgstr "to są same białe znaki"
-+msgstr "składa się z samych białych znaków"
-
- #: lib/fascist.c:783
- msgid "it is too simplistic/systematic"
--msgstr "za proste/systematyczne"
-+msgstr "zbyt proste / powtarzalne"
-
- #: lib/fascist.c:788
- msgid "it looks like a National Insurance number."
---- po/sl_SI.po
-+++ po/sl_SI.po 2005/08/29 14:09:54
-@@ -15,8 +15,7 @@
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
- "X-Generator: KBabel 1.3.1\n"
--"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
--"n%100==4 ? 2 : 3);\n"
-+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
-
- #: lib/fascist.c:555
- msgid "you are not registered in the password file"
-@@ -68,8 +67,7 @@
-
- #: lib/fascist.c:788
- msgid "it looks like a National Insurance number."
--msgstr ""
--"izgleda kot vaša številka (davčna, zdravstvenega zavarovanja, EMŠO, itd.)."
-+msgstr "izgleda kot vaša številka (davčna, zdravstvenega zavarovanja, EMŠO, itd.)."
-
- #: lib/fascist.c:815
- msgid "it is based on a dictionary word"
---- po/uk.po
-+++ po/uk.po 2006/01/13 13:37:46
-@@ -0,0 +1,79 @@
-+# translation of uk.po to Ukrainian
-+# Copyright (C) 2006 Free Software Foundation, Inc.
-+# This file is distributed under the same license as the PACKAGE package.
-+#
-+# Ivan Petrouchtchak <ivanpetrouchtchak(a)yahoo.com>, 2006.
-+msgid ""
-+msgstr ""
-+"Project-Id-Version: uk\n"
-+"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2005-06-23 12:52+0200\n"
-+"PO-Revision-Date: 2006-01-09 14:53-0700\n"
-+"Last-Translator: Ivan Petrouchtchak <ivanpetrouchtchak(a)yahoo.com>\n"
-+"Language-Team: Ukrainian <translation(a)linux.org.ua>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+"X-Generator: KBabel 1.11\n"
-+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-+
-+#: lib/fascist.c:555
-+msgid "you are not registered in the password file"
-+msgstr "ви не зареєстровані у файлі паролів"
-+
-+#: lib/fascist.c:569
-+msgid "it is based on your username"
-+msgstr "основане на вашому імені користувача"
-+
-+#: lib/fascist.c:634
-+msgid "it is based upon your password entry"
-+msgstr "основане на записі вашого пароля"
-+
-+#: lib/fascist.c:654
-+msgid "it is derived from your password entry"
-+msgstr "отримане із запису вашого пароля"
-+
-+#: lib/fascist.c:667
-+msgid "it's derived from your password entry"
-+msgstr "отримане із запису вашого пароля"
-+
-+#: lib/fascist.c:681
-+msgid "it is derivable from your password entry"
-+msgstr "можна отримати із запису вашого пароля"
-+
-+#: lib/fascist.c:695
-+msgid "it's derivable from your password entry"
-+msgstr "можна отримати із запису вашого пароля"
-+
-+#: lib/fascist.c:731
-+msgid "it is WAY too short"
-+msgstr "занадто короткий"
-+
-+#: lib/fascist.c:736
-+msgid "it is too short"
-+msgstr "закороткий"
-+
-+#: lib/fascist.c:753
-+msgid "it does not contain enough DIFFERENT characters"
-+msgstr "не містить достатньо ВІДМІННИХ символів"
-+
-+#: lib/fascist.c:767
-+msgid "it is all whitespace"
-+msgstr "це все пробіли"
-+
-+#: lib/fascist.c:783
-+msgid "it is too simplistic/systematic"
-+msgstr "занадто просте/систематичне"
-+
-+#: lib/fascist.c:788
-+msgid "it looks like a National Insurance number."
-+msgstr "схоже на Національний Ідентифікаційний номер."
-+
-+#: lib/fascist.c:815
-+msgid "it is based on a dictionary word"
-+msgstr "основане на слові зі словника"
-+
-+#: lib/fascist.c:834
-+msgid "it is based on a (reversed) dictionary word"
-+msgstr "основане на (зарезервованому) слові зі словника"
-+
+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
[View Less]
1
0
Hello community,
here is the log from the commit of package apparmor-provider-notifications
checked in at Fri May 4 00:26:46 CEST 2007.
--------
--- apparmor-provider-notifications/apparmor-provider-notifications.changes 2007-01-12 04:54:08.000000000 +0100
+++ /mounts/work_src_done/STABLE/apparmor-provider-notifications/apparmor-provider-notifications.changes 2007-05-03 22:33:36.686203000 +0200
@@ -1,0 +2,6 @@
+Thu May 3 22:31:32 CEST 2007 - mbarringer(a)suse.de
+
+- Fixing bug 270601. The …
[View More]provider now throws an error when a
+ notification is submitted without an email address.
+
+-------------------------------------------------------------------
Old:
----
apparmor-provider-notifications-1.0.0.tar.gz
New:
----
apparmor-provider-notifications-1.0.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apparmor-provider-notifications.spec ++++++
--- /var/tmp/diff_new_pack.o26626/_old 2007-05-04 00:26:25.000000000 +0200
+++ /var/tmp/diff_new_pack.o26626/_new 2007-05-04 00:26:25.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package apparmor-provider-notifications (Version 1.0.0)
+# spec file for package apparmor-provider-notifications (Version 1.0.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -16,7 +16,7 @@
%define novellprefix /usr
%define novelllocalstatedir /var/lib/openwbem
%define novellsysconfdir /etc/openwbem
-Version: 1.0.0
+Version: 1.0.1
Release: 1
License: GNU General Public License (GPL)
Source0: %{name}-%{version}.tar.gz
@@ -75,6 +75,9 @@
%dir %{novellprefix}/share/mof/%{name}
%{novellprefix}/share/mof/%{name}/*
-%changelog -n apparmor-provider-notifications
+%changelog
+* Thu May 03 2007 - mbarringer(a)suse.de
+- Fixing bug 270601. The provider now throws an error when a
+ notification is submitted without an email address.
* Fri Jan 12 2007 - mbarringer(a)suse.de
- Initial checkin of version 1.0.0 (fate #300904)
++++++ apparmor-provider-notifications-1.0.0.tar.gz -> apparmor-provider-notifications-1.0.1.tar.gz ++++++
++++ 17384 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/apparmor-provider-notifications-1.0.0/apparmor-provider-notifications.spec new/apparmor-provider-notifications-1.0.1/apparmor-provider-notifications.spec
--- old/apparmor-provider-notifications-1.0.0/apparmor-provider-notifications.spec 2007-01-12 00:50:45.000000000 +0100
+++ new/apparmor-provider-notifications-1.0.1/apparmor-provider-notifications.spec 2007-05-03 22:02:01.000000000 +0200
@@ -9,16 +9,16 @@
#
Name: apparmor-provider-notifications
-BuildRequires: curl gcc-c++ limal-apparmor-notification-devel limal-devtools openwbem-devel
+BuildRequires: curl gcc-c++ limal-apparmor-notifications-devel limal-devtools openwbem-devel
URL: http://forge.novell.com/modules/xfmod/project/?apparmor
PreReq: /usr/bin/loadmof.sh, coreutils
%define novellprefix /usr
%define novelllocalstatedir /var/lib/openwbem
%define novellsysconfdir /etc/openwbem
-Version: 1.0.0
+Version: 1.0.1
License: GPL
Release: 0
-Source0: %{name}-%{version}.tar.bz2
+Source0: %{name}-%{version}.tar.gz
Source1: %{name}-mof.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/Management
@@ -51,7 +51,7 @@
%post
%run_ldconfig
MOFDIR=%{novellprefix}/share/mof/%{name}
-loadmof.sh -v -n root/cimv2 apparmor-provider-notifications.mof
+loadmof.sh -v -n root/cimv2 $MOFDIR/apparmor-provider-notifications.mof
%preun
if [ "x$1" = "x0" ]; then
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/apparmor-provider-notifications-1.0.0/config.h.in new/apparmor-provider-notifications-1.0.1/config.h.in
--- old/apparmor-provider-notifications-1.0.0/config.h.in 2007-01-12 00:20:50.000000000 +0100
+++ new/apparmor-provider-notifications-1.0.1/config.h.in 2007-05-03 22:02:18.000000000 +0200
@@ -221,7 +221,7 @@
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
- automatically deduced at run-time.
+ automatically deduced at runtime.
STACK_DIRECTION > 0 => grows toward higher addresses
STACK_DIRECTION < 0 => grows toward lower addresses
STACK_DIRECTION = 0 => direction of growth unknown */
@@ -266,7 +266,7 @@
/* Define to rpl_realloc if the replacement function should be used. */
#undef realloc
-/* Define to `unsigned' if <sys/types.h> does not define. */
+/* Define to `unsigned int' if <sys/types.h> does not define. */
#undef size_t
/* Define to `int' if <sys/types.h> doesn't define. */
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/apparmor-provider-notifications-1.0.0/configure.in new/apparmor-provider-notifications-1.0.1/configure.in
--- old/apparmor-provider-notifications-1.0.0/configure.in 2007-01-12 00:20:50.000000000 +0100
+++ new/apparmor-provider-notifications-1.0.1/configure.in 2007-05-03 22:01:51.000000000 +0200
@@ -1,4 +1,4 @@
-AC_INIT(apparmor-provider-notifications, 1.0.0, mbarringer(a)suse.de)
+AC_INIT(apparmor-provider-notifications, 1.0.1, mbarringer(a)suse.de)
AC_CONFIG_SRCDIR(src)
AM_INIT_AUTOMAKE
AC_CONFIG_HEADER([config.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/apparmor-provider-notifications-1.0.0/src/AppArmorNotificationSettingDataProvider.cpp new/apparmor-provider-notifications-1.0.1/src/AppArmorNotificationSettingDataProvider.cpp
--- old/apparmor-provider-notifications-1.0.0/src/AppArmorNotificationSettingDataProvider.cpp 2007-01-12 00:20:50.000000000 +0100
+++ new/apparmor-provider-notifications-1.0.1/src/AppArmorNotificationSettingDataProvider.cpp 2007-05-03 22:00:42.000000000 +0200
@@ -342,6 +342,9 @@
TerseLevel.get(tmpInt);
notifyCfg["terse_level"] = String(tmpInt).c_str();
TerseEmail.get(tmpStr);
+ if (tmpStr.empty())
+ OW_THROWCIMMSG(CIMException::INVALID_PARAMETER,
+ "Cannot allow a notification to be set up without an email address");
notifyCfg["terse_email"] = tmpStr.c_str();
notifyCfg["terse_unknown"] = "0";
TerseUnknown.get(tmpBool);
@@ -362,6 +365,9 @@
SummaryLevel.get(tmpInt);
notifyCfg["summary_level"] = String(tmpInt).c_str();
SummaryEmail.get(tmpStr);
+ if (tmpStr.empty())
+ OW_THROWCIMMSG(CIMException::INVALID_PARAMETER,
+ "Cannot allow a notification to be set up without an email address");
notifyCfg["summary_email"] = tmpStr.c_str();
notifyCfg["summary_unknown"] = "0";
SummaryUnknown.get(tmpBool);
@@ -382,6 +388,9 @@
VerboseLevel.get(tmpInt);
notifyCfg["verbose_level"] = String(tmpInt).c_str();
VerboseEmail.get(tmpStr);
+ if (tmpStr.empty())
+ OW_THROWCIMMSG(CIMException::INVALID_PARAMETER,
+ "Cannot allow a notification to be set up without an email address");
notifyCfg["verbose_email"] = tmpStr.c_str();
notifyCfg["verbose_unknown"] = "0";
VerboseUnknown.get(tmpBool);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
[View Less]
1
0
Hello community,
here is the log from the commit of package alsa-utils
checked in at Fri May 4 00:26:05 CEST 2007.
--------
--- alsa-utils/alsa-utils.changes 2007-04-16 14:15:14.000000000 +0200
+++ /mounts/work_src_done/STABLE/alsa-utils/alsa-utils.changes 2007-05-02 12:33:01.000000000 +0200
@@ -1,0 +2,6 @@
+Wed May 2 12:32:52 CEST 2007 - tiwai(a)suse.de
+
+- updated to version 1.0.14rc4
+ including HG fixes
+
+-------------------------------------------------------------------
Old:
----
…
[View More]alsa-utils-1.0.14rc2.tar.bz2
alsa-utils-hg-fixes.diff
New:
----
alsa-utils-1.0.14rc4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ alsa-utils.spec ++++++
--- /var/tmp/diff_new_pack.j24158/_old 2007-05-04 00:26:00.000000000 +0200
+++ /var/tmp/diff_new_pack.j24158/_new 2007-05-04 00:26:00.000000000 +0200
@@ -12,7 +12,7 @@
Name: alsa-utils
BuildRequires: alsa-devel ncurses-devel
-%define package_version 1.0.14rc2
+%define package_version 1.0.14rc4
License: GNU General Public License (GPL)
Group: Productivity/Multimedia/Sound/Players
Provides: alsa-conf
@@ -20,9 +20,9 @@
Autoreqprov: on
Summary: Advanced Linux Sound Architecture Utilities
Version: 1.0.13
-Release: 1
+Release: 5
Source: ftp://ftp.alsa-project.org/pub/util/alsa-utils-%{package_version}.tar.bz2
-Patch: alsa-utils-hg-fixes.diff
+# Patch: alsa-utils-hg-fixes.diff
URL: http://www.alsa-project.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -39,7 +39,7 @@
%prep
%setup -n %{name}-%{package_version}
-%patch -p1
+# %patch -p1
mv alsamixer/README alsamixer/README-alsamixer
%{?suse_update_config:%{suse_update_config -f .}}
@@ -69,5 +69,8 @@
%{_datadir}/locale/*/*/*
%changelog
+* Wed May 02 2007 - tiwai(a)suse.de
+- updated to version 1.0.14rc4
+ including HG fixes
* Mon Apr 16 2007 - tiwai(a)suse.de
- split from alsa package
++++++ alsa-utils-1.0.14rc2.tar.bz2 -> alsa-utils-1.0.14rc4.tar.bz2 ++++++
++++ 14737 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
[View Less]
1
0
Hello community,
here is the log from the commit of package alsa-plugins
checked in at Fri May 4 00:25:54 CEST 2007.
--------
--- alsa-plugins/alsa-plugins-a52.changes 2007-03-14 17:24:38.000000000 +0100
+++ /mounts/work_src_done/STABLE/alsa-plugins/alsa-plugins-a52.changes 2007-05-02 12:44:05.000000000 +0200
@@ -1,0 +2,6 @@
+Wed May 2 12:43:55 CEST 2007 - tiwai(a)suse.de
+
+- updated to version 1.0.14rc4:
+ including HG fixes
+
+--------------------------------------------------------------…
[View More]-----
--- alsa-plugins/alsa-plugins.changes 2007-04-10 18:53:35.000000000 +0200
+++ /mounts/work_src_done/STABLE/alsa-plugins/alsa-plugins.changes 2007-05-02 12:43:38.000000000 +0200
@@ -1,0 +2,6 @@
+Wed May 2 12:43:27 CEST 2007 - tiwai(a)suse.de
+
+- updated to version 1.0.14rc4:
+ including HG fixes
+
+-------------------------------------------------------------------
Old:
----
alsa-plugins-1.0.14rc3.tar.bz2
alsa-plugins-hg-fixes.diff
New:
----
alsa-plugins-1.0.14rc4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ alsa-plugins-a52.spec ++++++
--- /var/tmp/diff_new_pack.A23535/_old 2007-05-04 00:25:49.000000000 +0200
+++ /var/tmp/diff_new_pack.A23535/_new 2007-05-04 00:25:49.000000000 +0200
@@ -12,16 +12,16 @@
Name: alsa-plugins-a52
BuildRequires: alsa-devel ffmpeg-devel pkg-config
-%define package_version 1.0.14rc3
+%define package_version 1.0.14rc4
URL: http://www.alsa-project.org/
Summary: A52 Encoding Plug-In for the ALSA Library
Version: 1.0.13
-Release: 21
+Release: 27
License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL)
Group: System/Libraries
Autoreqprov: on
Source: ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-%{package_version}.tar.…
-Patch1: alsa-plugins-hg-fixes.diff
+# Patch1: alsa-plugins-hg-fixes.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -35,7 +35,7 @@
%prep
%setup -n alsa-plugins-%{package_version}
-%patch1 -p1
+# %patch1 -p1
%build
%{?suse_update_config:%{suse_update_config -f}}
@@ -61,6 +61,9 @@
%{_libdir}/alsa-lib/libasound_module_rate_*.so
%changelog
+* Wed May 02 2007 - tiwai(a)suse.de
+- updated to version 1.0.14rc4:
+ including HG fixes
* Wed Mar 14 2007 - tiwai(a)suse.de
- updated to version 1.0.14rc3:
* added rate-lavc resampler plugin
++++++ alsa-plugins.spec ++++++
--- /var/tmp/diff_new_pack.A23535/_old 2007-05-04 00:25:49.000000000 +0200
+++ /var/tmp/diff_new_pack.A23535/_new 2007-05-04 00:25:49.000000000 +0200
@@ -12,16 +12,16 @@
Name: alsa-plugins
BuildRequires: alsa-devel dbus-1-devel jack-devel libsamplerate-devel pulseaudio-devel
-%define package_version 1.0.14rc3
+%define package_version 1.0.14rc4
URL: http://www.alsa-project.org/
Summary: Extra Plug-Ins for the ALSA Library
Version: 1.0.13
-Release: 21
+Release: 25
License: BSD License and BSD-like, GNU Library General Public License v. 2.0 and 2.1 (LGPL)
Group: System/Libraries
Autoreqprov: on
Source: ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-%{package_version}.tar.…
-Patch1: alsa-plugins-hg-fixes.diff
+# Patch1: alsa-plugins-hg-fixes.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -97,7 +97,7 @@
%prep
%setup -n %{name}-%{package_version}
-%patch1 -p1
+# %patch1 -p1
%build
%{?suse_update_config:%{suse_update_config -f}}
@@ -152,6 +152,9 @@
%{_libdir}/alsa-lib/libasound_module_rate_samplerate*.so
%changelog
+* Wed May 02 2007 - tiwai(a)suse.de
+- updated to version 1.0.14rc4:
+ including HG fixes
* Tue Apr 10 2007 - tiwai(a)suse.de
- split samplerate to subpackage (the sole GPL-only module).
- fixed licenses on PDB.
++++++ alsa-plugins-1.0.14rc3.tar.bz2 -> alsa-plugins-1.0.14rc4.tar.bz2 ++++++
++++ 13743 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/alsa-plugins-1.0.14rc3/configure.in new/alsa-plugins-1.0.14rc4/configure.in
--- old/alsa-plugins-1.0.14rc3/configure.in 2007-02-26 10:21:37.000000000 +0100
+++ new/alsa-plugins-1.0.14rc4/configure.in 2007-05-02 13:31:35.000000000 +0200
@@ -1,6 +1,6 @@
AC_PREREQ(2.59)
AC_INIT(oss/pcm_oss.c)
-AM_INIT_AUTOMAKE(alsa-plugins, 1.0.14rc3)
+AM_INIT_AUTOMAKE(alsa-plugins, 1.0.14rc4)
AC_PREFIX_DEFAULT(/usr)
AC_CONFIG_HEADERS(config.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/alsa-plugins-1.0.14rc3/doc/Makefile.am new/alsa-plugins-1.0.14rc4/doc/Makefile.am
--- old/alsa-plugins-1.0.14rc3/doc/Makefile.am 2007-02-26 10:21:37.000000000 +0100
+++ new/alsa-plugins-1.0.14rc4/doc/Makefile.am 2007-05-02 13:31:35.000000000 +0200
@@ -1,2 +1,3 @@
EXTRA_DIST = README-pcm-oss README-jack README-pulse README-maemo \
- upmix.txt vdownmix.txt samplerate.txt a52.txt lavcrate.txt
+ upmix.txt vdownmix.txt samplerate.txt a52.txt lavcrate.txt \
+ speexrate.txt
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/alsa-plugins-1.0.14rc3/doc/speexrate.txt new/alsa-plugins-1.0.14rc4/doc/speexrate.txt
--- old/alsa-plugins-1.0.14rc3/doc/speexrate.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/alsa-plugins-1.0.14rc4/doc/speexrate.txt 2007-05-02 13:31:35.000000000 +0200
@@ -0,0 +1,29 @@
+Rate Converter Plugin Using Speex Resampler
+===========================================
+
+The plugin in rate subdirectory is an external rate converter using
+the Speex resampler (aka Public Parrot Hack) by Jean-Marc Valin. You can
+use this rate converter plugin by defining a rate PCM with "converter"
+parameter, such as:
+
+ pcm.my_rate {
+ type rate
+ slave.pcm "hw"
+ converter "speexrate"
+ }
+
+The plug plugin has also a similar field, "rate_converter".
+
+Or, more easily, define a global variable "defaults.pcm.rate_converter",
+which is used as the default converter type by plug and rate plugins:
+
+ defaults.pcm.rate_converter "speexrate"
+
+Write the above in your ~/.asoundrc or /etc/asound.conf.
+
+The following converter types are available:
+
+ - speexrate_best Use quality 10 (equivalent to SRC_SINC_BEST_QUALITY)
+ - speexrate_medium Use quality 5 (equivalent to SRC_SINC_MEDIUM_QUALITY)
+ - speexrate Use quality 3 (equivalent to SRC_SINC_FASTEST)
+
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/alsa-plugins-1.0.14rc3/pph/arch.h new/alsa-plugins-1.0.14rc4/pph/arch.h
--- old/alsa-plugins-1.0.14rc3/pph/arch.h 1970-01-01 01:00:00.000000000 +0100
+++ new/alsa-plugins-1.0.14rc4/pph/arch.h 2007-05-02 13:31:35.000000000 +0200
@@ -0,0 +1,197 @@
+/* Copyright (C) 2003 Jean-Marc Valin */
+/**
+ @file arch.h
+ @brief Various architecture definitions Speex
+*/
+/*
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ - Neither the name of the Xiph.org Foundation nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef ARCH_H
+#define ARCH_H
+
+#ifndef OUTSIDE_SPEEX
+#include "speex/speex_types.h"
+#endif
+
+#define ABS(x) ((x) < 0 ? (-(x)) : (x)) /**< Absolute integer value. */
+#define ABS16(x) ((x) < 0 ? (-(x)) : (x)) /**< Absolute 16-bit value. */
+#define MIN16(a,b) ((a) < (b) ? (a) : (b)) /**< Maximum 16-bit value. */
+#define MAX16(a,b) ((a) > (b) ? (a) : (b)) /**< Maximum 16-bit value. */
+#define ABS32(x) ((x) < 0 ? (-(x)) : (x)) /**< Absolute 32-bit value. */
+#define MIN32(a,b) ((a) < (b) ? (a) : (b)) /**< Maximum 32-bit value. */
+#define MAX32(a,b) ((a) > (b) ? (a) : (b)) /**< Maximum 32-bit value. */
+
+#ifdef FIXED_POINT
+
+typedef spx_int16_t spx_word16_t;
+typedef spx_int32_t spx_word32_t;
+typedef spx_word32_t spx_mem_t;
+typedef spx_word16_t spx_coef_t;
+typedef spx_word16_t spx_lsp_t;
+typedef spx_word32_t spx_sig_t;
+
+#define Q15ONE 32767
+
+#define LPC_SCALING 8192
+#define SIG_SCALING 16384
+#define LSP_SCALING 8192.
+#define GAMMA_SCALING 32768.
+#define GAIN_SCALING 64
+#define GAIN_SCALING_1 0.015625
+
+#define LPC_SHIFT 13
+#define LSP_SHIFT 13
+#define SIG_SHIFT 14
+
+#define VERY_SMALL 0
+#define VERY_LARGE32 ((spx_word32_t)2147483647)
+#define VERY_LARGE16 ((spx_word16_t)32767)
+#define Q15_ONE ((spx_word16_t)32767)
+
+
+#ifdef FIXED_DEBUG
+#include "fixed_debug.h"
+#else
+
+#include "fixed_generic.h"
+
+#ifdef ARM5E_ASM
+#include "fixed_arm5e.h"
+#elif defined (ARM4_ASM)
+#include "fixed_arm4.h"
+#elif defined (ARM5E_ASM)
+#include "fixed_arm5e.h"
+#elif defined (BFIN_ASM)
+#include "fixed_bfin.h"
+#endif
+
+#endif
+
+
+#else
+
+typedef float spx_mem_t;
+typedef float spx_coef_t;
+typedef float spx_lsp_t;
+typedef float spx_sig_t;
+typedef float spx_word16_t;
+typedef float spx_word32_t;
+
+#define Q15ONE 1.0f
+#define LPC_SCALING 1.f
+#define SIG_SCALING 1.f
+#define LSP_SCALING 1.f
+#define GAMMA_SCALING 1.f
+#define GAIN_SCALING 1.f
+#define GAIN_SCALING_1 1.f
+
+#define LPC_SHIFT 0
+#define LSP_SHIFT 0
+#define SIG_SHIFT 0
+
+#define VERY_SMALL 1e-15f
+#define VERY_LARGE32 1e15f
+#define VERY_LARGE16 1e15f
+#define Q15_ONE ((spx_word16_t)1.f)
+
+#define QCONST16(x,bits) (x)
+#define QCONST32(x,bits) (x)
+
+#define NEG16(x) (-(x))
+#define NEG32(x) (-(x))
+#define EXTRACT16(x) (x)
+#define EXTEND32(x) (x)
+#define SHR16(a,shift) (a)
+#define SHL16(a,shift) (a)
+#define SHR32(a,shift) (a)
+#define SHL32(a,shift) (a)
+#define PSHR16(a,shift) (a)
+#define PSHR32(a,shift) (a)
+#define VSHR32(a,shift) (a)
+#define SATURATE16(x,a) (x)
+#define SATURATE32(x,a) (x)
+
+#define PSHR(a,shift) (a)
+#define SHR(a,shift) (a)
+#define SHL(a,shift) (a)
+#define SATURATE(x,a) (x)
+
+#define ADD16(a,b) ((a)+(b))
+#define SUB16(a,b) ((a)-(b))
+#define ADD32(a,b) ((a)+(b))
+#define SUB32(a,b) ((a)-(b))
+#define MULT16_16_16(a,b) ((a)*(b))
+#define MULT16_16(a,b) ((spx_word32_t)(a)*(spx_word32_t)(b))
+#define MAC16_16(c,a,b) ((c)+(spx_word32_t)(a)*(spx_word32_t)(b))
+
+#define MULT16_32_Q11(a,b) ((a)*(b))
+#define MULT16_32_Q13(a,b) ((a)*(b))
+#define MULT16_32_Q14(a,b) ((a)*(b))
+#define MULT16_32_Q15(a,b) ((a)*(b))
+#define MULT16_32_P15(a,b) ((a)*(b))
+
+#define MAC16_32_Q11(c,a,b) ((c)+(a)*(b))
+#define MAC16_32_Q15(c,a,b) ((c)+(a)*(b))
+
+#define MAC16_16_Q11(c,a,b) ((c)+(a)*(b))
+#define MAC16_16_Q13(c,a,b) ((c)+(a)*(b))
+#define MAC16_16_P13(c,a,b) ((c)+(a)*(b))
+#define MULT16_16_Q11_32(a,b) ((a)*(b))
+#define MULT16_16_Q13(a,b) ((a)*(b))
+#define MULT16_16_Q14(a,b) ((a)*(b))
+#define MULT16_16_Q15(a,b) ((a)*(b))
+#define MULT16_16_P15(a,b) ((a)*(b))
+#define MULT16_16_P13(a,b) ((a)*(b))
+#define MULT16_16_P14(a,b) ((a)*(b))
+
+#define DIV32_16(a,b) (((spx_word32_t)(a))/(spx_word16_t)(b))
+#define PDIV32_16(a,b) (((spx_word32_t)(a))/(spx_word16_t)(b))
+#define DIV32(a,b) (((spx_word32_t)(a))/(spx_word32_t)(b))
+#define PDIV32(a,b) (((spx_word32_t)(a))/(spx_word32_t)(b))
+
+
+#endif
+
+
+#if defined (CONFIG_TI_C54X) || defined (CONFIG_TI_C55X)
+
+/* 2 on TI C5x DSP */
+#define BYTES_PER_CHAR 2
+#define BITS_PER_CHAR 16
+#define LOG2_BITS_PER_CHAR 4
+
+#else
+
+#define BYTES_PER_CHAR 1
+#define BITS_PER_CHAR 8
+#define LOG2_BITS_PER_CHAR 3
+
+#endif
+
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/alsa-plugins-1.0.14rc3/pph/fixed_generic.h new/alsa-plugins-1.0.14rc4/pph/fixed_generic.h
--- old/alsa-plugins-1.0.14rc3/pph/fixed_generic.h 1970-01-01 01:00:00.000000000 +0100
+++ new/alsa-plugins-1.0.14rc4/pph/fixed_generic.h 2007-05-02 13:31:35.000000000 +0200
@@ -0,0 +1,106 @@
+/* Copyright (C) 2003 Jean-Marc Valin */
+/**
+ @file fixed_generic.h
+ @brief Generic fixed-point operations
+*/
+/*
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ - Neither the name of the Xiph.org Foundation nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef FIXED_GENERIC_H
+#define FIXED_GENERIC_H
+
+#define QCONST16(x,bits) ((spx_word16_t)(.5+(x)*(((spx_word32_t)1)<<(bits))))
+#define QCONST32(x,bits) ((spx_word32_t)(.5+(x)*(((spx_word32_t)1)<<(bits))))
+
+#define NEG16(x) (-(x))
+#define NEG32(x) (-(x))
+#define EXTRACT16(x) ((spx_word16_t)(x))
+#define EXTEND32(x) ((spx_word32_t)(x))
+#define SHR16(a,shift) ((a) >> (shift))
+#define SHL16(a,shift) ((a) << (shift))
+#define SHR32(a,shift) ((a) >> (shift))
+#define SHL32(a,shift) ((a) << (shift))
+#define PSHR16(a,shift) (SHR16((a)+((1<<((shift))>>1)),shift))
+#define PSHR32(a,shift) (SHR32((a)+((1<<((shift))>>1)),shift))
+#define VSHR32(a, shift) (((shift)>0) ? SHR32(a, shift) : SHL32(a, -(shift)))
+#define SATURATE16(x,a) (((x)>(a) ? (a) : (x)<-(a) ? -(a) : (x)))
+#define SATURATE32(x,a) (((x)>(a) ? (a) : (x)<-(a) ? -(a) : (x)))
+
+#define SHR(a,shift) ((a) >> (shift))
+#define SHL(a,shift) ((spx_word32_t)(a) << (shift))
+#define PSHR(a,shift) (SHR((a)+((1<<((shift))>>1)),shift))
+#define SATURATE(x,a) (((x)>(a) ? (a) : (x)<-(a) ? -(a) : (x)))
+
+
+#define ADD16(a,b) ((spx_word16_t)((spx_word16_t)(a)+(spx_word16_t)(b)))
+#define SUB16(a,b) ((spx_word16_t)(a)-(spx_word16_t)(b))
+#define ADD32(a,b) ((spx_word32_t)(a)+(spx_word32_t)(b))
+#define SUB32(a,b) ((spx_word32_t)(a)-(spx_word32_t)(b))
+
+
+/* result fits in 16 bits */
+#define MULT16_16_16(a,b) ((((spx_word16_t)(a))*((spx_word16_t)(b))))
+
+/* (spx_word32_t)(spx_word16_t) gives TI compiler a hint that it's 16x16->32 multiply */
+#define MULT16_16(a,b) (((spx_word32_t)(spx_word16_t)(a))*((spx_word32_t)(spx_word16_t)(b)))
+
+#define MAC16_16(c,a,b) (ADD32((c),MULT16_16((a),(b))))
+#define MULT16_32_Q12(a,b) ADD32(MULT16_16((a),SHR((b),12)), SHR(MULT16_16((a),((b)&0x00000fff)),12))
+#define MULT16_32_Q13(a,b) ADD32(MULT16_16((a),SHR((b),13)), SHR(MULT16_16((a),((b)&0x00001fff)),13))
+#define MULT16_32_Q14(a,b) ADD32(MULT16_16((a),SHR((b),14)), SHR(MULT16_16((a),((b)&0x00003fff)),14))
+
+#define MULT16_32_Q11(a,b) ADD32(MULT16_16((a),SHR((b),11)), SHR(MULT16_16((a),((b)&0x000007ff)),11))
+#define MAC16_32_Q11(c,a,b) ADD32(c,ADD32(MULT16_16((a),SHR((b),11)), SHR(MULT16_16((a),((b)&0x000007ff)),11)))
+
+#define MULT16_32_P15(a,b) ADD32(MULT16_16((a),SHR((b),15)), PSHR(MULT16_16((a),((b)&0x00007fff)),15))
+#define MULT16_32_Q15(a,b) ADD32(MULT16_16((a),SHR((b),15)), SHR(MULT16_16((a),((b)&0x00007fff)),15))
+#define MAC16_32_Q15(c,a,b) ADD32(c,ADD32(MULT16_16((a),SHR((b),15)), SHR(MULT16_16((a),((b)&0x00007fff)),15)))
+
+
+#define MAC16_16_Q11(c,a,b) (ADD32((c),SHR(MULT16_16((a),(b)),11)))
+#define MAC16_16_Q13(c,a,b) (ADD32((c),SHR(MULT16_16((a),(b)),13)))
+#define MAC16_16_P13(c,a,b) (ADD32((c),SHR(ADD32(4096,MULT16_16((a),(b))),13)))
+
+#define MULT16_16_Q11_32(a,b) (SHR(MULT16_16((a),(b)),11))
+#define MULT16_16_Q13(a,b) (SHR(MULT16_16((a),(b)),13))
+#define MULT16_16_Q14(a,b) (SHR(MULT16_16((a),(b)),14))
+#define MULT16_16_Q15(a,b) (SHR(MULT16_16((a),(b)),15))
+
+#define MULT16_16_P13(a,b) (SHR(ADD32(4096,MULT16_16((a),(b))),13))
+#define MULT16_16_P14(a,b) (SHR(ADD32(8192,MULT16_16((a),(b))),14))
+#define MULT16_16_P15(a,b) (SHR(ADD32(16384,MULT16_16((a),(b))),15))
+
+#define MUL_16_32_R15(a,bh,bl) ADD32(MULT16_16((a),(bh)), SHR(MULT16_16((a),(bl)),15))
+
+#define DIV32_16(a,b) ((spx_word16_t)(((spx_word32_t)(a))/((spx_word16_t)(b))))
+#define PDIV32_16(a,b) ((spx_word16_t)(((spx_word32_t)(a)+((spx_word16_t)(b)>>1))/((spx_word16_t)(b))))
+#define DIV32(a,b) (((spx_word32_t)(a))/((spx_word32_t)(b)))
+#define PDIV32(a,b) (((spx_word32_t)(a)+((spx_word16_t)(b)>>1))/((spx_word32_t)(b)))
+
+#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/alsa-plugins-1.0.14rc3/pph/Makefile.am new/alsa-plugins-1.0.14rc4/pph/Makefile.am
--- old/alsa-plugins-1.0.14rc3/pph/Makefile.am 2007-02-26 10:21:37.000000000 +0100
+++ new/alsa-plugins-1.0.14rc4/pph/Makefile.am 2007-05-02 13:31:35.000000000 +0200
@@ -2,7 +2,7 @@
asound_module_rate_speexratedir = $(libdir)/alsa-lib
-AM_CFLAGS = -DOUTSIDE_SPEEX -Wall -g @ALSA_CFLAGS@
+AM_CFLAGS = -DVAR_ARRAYS -DRANDOM_PREFIX=alsa_lib -DOUTSIDE_SPEEX -Wall -g @ALSA_CFLAGS@
AM_LDFLAGS = -module -avoid-version -export-dynamic
libasound_module_rate_speexrate_la_SOURCES = rate_speexrate.c resample.c
@@ -16,4 +16,4 @@
uninstall-hook:
rm -f $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_speexrate_*.so
-noinst_HEADERS = speex_resampler.h
+noinst_HEADERS = speex_resampler.h arch.h fixed_generic.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/alsa-plugins-1.0.14rc3/pph/rate_speexrate.c new/alsa-plugins-1.0.14rc4/pph/rate_speexrate.c
--- old/alsa-plugins-1.0.14rc3/pph/rate_speexrate.c 2007-02-26 10:21:37.000000000 +0100
+++ new/alsa-plugins-1.0.14rc4/pph/rate_speexrate.c 2007-05-02 13:31:35.000000000 +0200
@@ -42,7 +42,7 @@
static snd_pcm_uframes_t input_frames(void *obj, snd_pcm_uframes_t frames)
{
- int num, den;
+ spx_uint32_t num, den;
struct rate_src *rate = obj;
if (frames == 0)
return 0;
@@ -52,7 +52,7 @@
static snd_pcm_uframes_t output_frames(void *obj, snd_pcm_uframes_t frames)
{
- int num, den;
+ spx_uint32_t num, den;
struct rate_src *rate = obj;
if (frames == 0)
return 0;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/alsa-plugins-1.0.14rc3/pph/resample.c new/alsa-plugins-1.0.14rc4/pph/resample.c
--- old/alsa-plugins-1.0.14rc3/pph/resample.c 2007-02-26 10:21:37.000000000 +0100
+++ new/alsa-plugins-1.0.14rc4/pph/resample.c 2007-05-02 13:31:35.000000000 +0200
@@ -60,10 +60,12 @@
void *speex_realloc (void *ptr, int size) {return realloc(ptr, size);}
void speex_free (void *ptr) {free(ptr);}
#include "speex_resampler.h"
-#else
+#include "arch.h"
+#else /* OUTSIDE_SPEEX */
+
#include "speex/speex_resampler.h"
#include "misc.h"
-#endif
+#endif /* OUTSIDE_SPEEX */
#include <math.h>
@@ -84,33 +86,33 @@
#define IMAX(a,b) ((a) > (b) ? (a) : (b))
-typedef int (*resampler_basic_func)(SpeexResamplerState *, int , const spx_word16_t *, int *, spx_word16_t *, int *);
+typedef int (*resampler_basic_func)(SpeexResamplerState *, spx_uint32_t , const spx_word16_t *, spx_uint32_t *, spx_word16_t *, spx_uint32_t *);
struct SpeexResamplerState_ {
- int in_rate;
- int out_rate;
- int num_rate;
- int den_rate;
+ spx_uint32_t in_rate;
+ spx_uint32_t out_rate;
+ spx_uint32_t num_rate;
+ spx_uint32_t den_rate;
int quality;
- int nb_channels;
- int filt_len;
- int mem_alloc_size;
- int int_advance;
- int frac_advance;
+ spx_uint32_t nb_channels;
+ spx_uint32_t filt_len;
+ spx_uint32_t mem_alloc_size;
+ int int_advance;
+ int frac_advance;
float cutoff;
- int oversample;
- int initialised;
- int started;
+ spx_uint32_t oversample;
+ int initialised;
+ int started;
/* These are per-channel */
- int *last_sample;
- int *samp_frac_num;
- int *magic_samples;
+ spx_int32_t *last_sample;
+ spx_uint32_t *samp_frac_num;
+ spx_uint32_t *magic_samples;
spx_word16_t *mem;
spx_word16_t *sinc_table;
- int sinc_table_length;
+ spx_uint32_t sinc_table_length;
resampler_basic_func resampler_ptr;
int in_stride;
@@ -197,7 +199,7 @@
by the sinusoids/noise just below the Nyquist rate (guaranteed only for
up-sampling).
*/
-const struct QualityMapping quality_map[11] = {
+static const struct QualityMapping quality_map[11] = {
{ 8, 4, 0.830f, 0.860f, KAISER6 }, /* Q0 */
{ 16, 4, 0.850f, 0.880f, KAISER6 }, /* Q1 */
{ 32, 4, 0.882f, 0.910f, KAISER6 }, /* Q2 */ /* 82.3% cutoff ( ~60 dB stop) 6 */
@@ -302,15 +304,15 @@
}
#endif
-static int resampler_basic_direct_single(SpeexResamplerState *st, int channel_index, const spx_word16_t *in, int *in_len, spx_word16_t *out, int *out_len)
+static int resampler_basic_direct_single(SpeexResamplerState *st, spx_uint32_t channel_index, const spx_word16_t *in, spx_uint32_t *in_len, spx_word16_t *out, spx_uint32_t *out_len)
{
int N = st->filt_len;
int out_sample = 0;
spx_word16_t *mem;
int last_sample = st->last_sample[channel_index];
- int samp_frac_num = st->samp_frac_num[channel_index];
+ spx_uint32_t samp_frac_num = st->samp_frac_num[channel_index];
mem = st->mem + channel_index * st->mem_alloc_size;
- while (!(last_sample >= *in_len || out_sample >= *out_len))
+ while (!(last_sample >= (spx_int32_t)*in_len || out_sample >= (spx_int32_t)*out_len))
{
int j;
spx_word32_t sum=0;
@@ -350,15 +352,15 @@
#ifdef FIXED_POINT
#else
/* This is the same as the previous function, except with a double-precision accumulator */
-static int resampler_basic_direct_double(SpeexResamplerState *st, int channel_index, const spx_word16_t *in, int *in_len, spx_word16_t *out, int *out_len)
+static int resampler_basic_direct_double(SpeexResamplerState *st, spx_uint32_t channel_index, const spx_word16_t *in, spx_uint32_t *in_len, spx_word16_t *out, spx_uint32_t *out_len)
{
int N = st->filt_len;
int out_sample = 0;
spx_word16_t *mem;
int last_sample = st->last_sample[channel_index];
- int samp_frac_num = st->samp_frac_num[channel_index];
+ spx_uint32_t samp_frac_num = st->samp_frac_num[channel_index];
mem = st->mem + channel_index * st->mem_alloc_size;
- while (!(last_sample >= *in_len || out_sample >= *out_len))
+ while (!(last_sample >= (spx_int32_t)*in_len || out_sample >= (spx_int32_t)*out_len))
{
int j;
double sum=0;
@@ -396,15 +398,15 @@
}
#endif
-static int resampler_basic_interpolate_single(SpeexResamplerState *st, int channel_index, const spx_word16_t *in, int *in_len, spx_word16_t *out, int *out_len)
+static int resampler_basic_interpolate_single(SpeexResamplerState *st, spx_uint32_t channel_index, const spx_word16_t *in, spx_uint32_t *in_len, spx_word16_t *out, spx_uint32_t *out_len)
{
int N = st->filt_len;
int out_sample = 0;
spx_word16_t *mem;
int last_sample = st->last_sample[channel_index];
- int samp_frac_num = st->samp_frac_num[channel_index];
+ spx_uint32_t samp_frac_num = st->samp_frac_num[channel_index];
mem = st->mem + channel_index * st->mem_alloc_size;
- while (!(last_sample >= *in_len || out_sample >= *out_len))
+ while (!(last_sample >= (spx_int32_t)*in_len || out_sample >= (spx_int32_t)*out_len))
{
int j;
spx_word32_t sum=0;
@@ -465,15 +467,15 @@
#ifdef FIXED_POINT
#else
/* This is the same as the previous function, except with a double-precision accumulator */
-static int resampler_basic_interpolate_double(SpeexResamplerState *st, int channel_index, const spx_word16_t *in, int *in_len, spx_word16_t *out, int *out_len)
+static int resampler_basic_interpolate_double(SpeexResamplerState *st, spx_uint32_t channel_index, const spx_word16_t *in, spx_uint32_t *in_len, spx_word16_t *out, spx_uint32_t *out_len)
{
int N = st->filt_len;
int out_sample = 0;
spx_word16_t *mem;
int last_sample = st->last_sample[channel_index];
- int samp_frac_num = st->samp_frac_num[channel_index];
+ spx_uint32_t samp_frac_num = st->samp_frac_num[channel_index];
mem = st->mem + channel_index * st->mem_alloc_size;
- while (!(last_sample >= *in_len || out_sample >= *out_len))
+ while (!(last_sample >= (spx_int32_t)*in_len || out_sample >= (spx_int32_t)*out_len))
{
int j;
spx_word32_t sum=0;
@@ -529,8 +531,7 @@
static void update_filter(SpeexResamplerState *st)
{
- int i;
- int old_length;
+ spx_uint32_t old_length;
old_length = st->filt_len;
st->oversample = quality_map[st->quality].oversample;
@@ -552,6 +553,7 @@
/* Choose the resampling type that requires the least amount of memory */
if (st->den_rate <= st->oversample)
{
+ spx_uint32_t i;
if (!st->sinc_table)
st->sinc_table = (spx_word16_t *)speex_alloc(st->filt_len*st->den_rate*sizeof(spx_word16_t));
else if (st->sinc_table_length < st->filt_len*st->den_rate)
@@ -561,7 +563,7 @@
}
for (i=0;i<st->den_rate;i++)
{
- int j;
+ spx_uint32_t j;
for (j=0;j<st->filt_len;j++)
{
st->sinc_table[i*st->filt_len+j] = sinc(st->cutoff,((j-st->filt_len/2+1)-((float)i)/st->den_rate), st->filt_len, quality_map[st->quality].window_func);
@@ -577,6 +579,7 @@
#endif
/*fprintf (stderr, "resampler uses direct sinc table and normalised cutoff %f\n", cutoff);*/
} else {
+ spx_int32_t i;
if (!st->sinc_table)
st->sinc_table = (spx_word16_t *)speex_alloc((st->filt_len*st->oversample+8)*sizeof(spx_word16_t));
else if (st->sinc_table_length < st->filt_len*st->oversample+8)
@@ -584,7 +587,7 @@
st->sinc_table = (spx_word16_t *)speex_realloc(st->sinc_table,(st->filt_len*st->oversample+8)*sizeof(spx_word16_t));
st->sinc_table_length = st->filt_len*st->oversample+8;
}
- for (i=-4;i<st->oversample*st->filt_len+4;i++)
+ for (i=-4;i<(spx_int32_t)(st->oversample*st->filt_len+4);i++)
st->sinc_table[i+4] = sinc(st->cutoff,(i/(float)st->oversample - st->filt_len/2), st->filt_len, quality_map[st->quality].window_func);
#ifdef FIXED_POINT
st->resampler_ptr = resampler_basic_interpolate_single;
@@ -601,6 +604,7 @@
if (!st->mem)
{
+ spx_uint32_t i;
st->mem = (spx_word16_t*)speex_alloc(st->nb_channels*(st->filt_len-1) * sizeof(spx_word16_t));
for (i=0;i<st->nb_channels*(st->filt_len-1);i++)
st->mem[i] = 0;
@@ -608,6 +612,7 @@
/*speex_warning("init filter");*/
} else if (!st->started)
{
+ spx_uint32_t i;
st->mem = (spx_word16_t*)speex_realloc(st->mem, st->nb_channels*(st->filt_len-1) * sizeof(spx_word16_t));
for (i=0;i<st->nb_channels*(st->filt_len-1);i++)
st->mem[i] = 0;
@@ -615,6 +620,7 @@
/*speex_warning("reinit filter");*/
} else if (st->filt_len > old_length)
{
+ spx_uint32_t i;
/* Increase the filter length */
/*speex_warning("increase filter size");*/
int old_alloc_size = st->mem_alloc_size;
@@ -625,7 +631,7 @@
}
for (i=0;i<st->nb_channels;i++)
{
- int j;
+ spx_uint32_t j;
/* Copy data going backward */
for (j=0;j<old_length-1;j++)
st->mem[i*st->mem_alloc_size+(st->filt_len-2-j)] = st->mem[i*old_alloc_size+(old_length-2-j)];
@@ -637,13 +643,14 @@
}
} else if (st->filt_len < old_length)
{
+ spx_uint32_t i;
/* Reduce filter length, this a bit tricky */
/*speex_warning("decrease filter size (unimplemented)");*/
/* Adjust last_sample (which will likely end up negative) */
/*st->last_sample += (st->filt_len - old_length)/2;*/
for (i=0;i<st->nb_channels;i++)
{
- int j;
+ spx_uint32_t j;
st->magic_samples[i] = (old_length - st->filt_len)/2;
/* Copy data going backward */
for (j=0;j<st->filt_len-1+st->magic_samples[i];j++)
@@ -653,14 +660,14 @@
}
-SpeexResamplerState *speex_resampler_init(int nb_channels, int in_rate, int out_rate, int quality)
+SpeexResamplerState *speex_resampler_init(spx_uint32_t nb_channels, spx_uint32_t in_rate, spx_uint32_t out_rate, int quality)
{
return speex_resampler_init_frac(nb_channels, in_rate, out_rate, in_rate, out_rate, quality);
}
-SpeexResamplerState *speex_resampler_init_frac(int nb_channels, int ratio_num, int ratio_den, int in_rate, int out_rate, int quality)
+SpeexResamplerState *speex_resampler_init_frac(spx_uint32_t nb_channels, spx_uint32_t ratio_num, spx_uint32_t ratio_den, spx_uint32_t in_rate, spx_uint32_t out_rate, int quality)
{
- int i;
+ spx_uint32_t i;
SpeexResamplerState *st = (SpeexResamplerState *)speex_alloc(sizeof(SpeexResamplerState));
st->initialised = 0;
st->started = 0;
@@ -681,9 +688,9 @@
st->out_stride = 1;
/* Per channel data */
- st->last_sample = (int*)speex_alloc(nb_channels*sizeof(int));
- st->magic_samples = (int*)speex_alloc(nb_channels*sizeof(int));
- st->samp_frac_num = (int*)speex_alloc(nb_channels*sizeof(int));
+ st->last_sample = (spx_int32_t*)speex_alloc(nb_channels*sizeof(int));
+ st->magic_samples = (spx_uint32_t*)speex_alloc(nb_channels*sizeof(int));
+ st->samp_frac_num = (spx_uint32_t*)speex_alloc(nb_channels*sizeof(int));
for (i=0;i<nb_channels;i++)
{
st->last_sample[i] = 0;
@@ -713,21 +720,21 @@
-static void speex_resampler_process_native(SpeexResamplerState *st, int channel_index, const spx_word16_t *in, int *in_len, spx_word16_t *out, int *out_len)
+static void speex_resampler_process_native(SpeexResamplerState *st, spx_uint32_t channel_index, const spx_word16_t *in, spx_uint32_t *in_len, spx_word16_t *out, spx_uint32_t *out_len)
{
int j=0;
int N = st->filt_len;
int out_sample = 0;
spx_word16_t *mem;
- int tmp_out_len = 0;
+ spx_uint32_t tmp_out_len = 0;
mem = st->mem + channel_index * st->mem_alloc_size;
st->started = 1;
/* Handle the case where we have samples left from a reduction in filter length */
if (st->magic_samples[channel_index])
{
- int tmp_in_len;
- int tmp_magic;
+ spx_uint32_t tmp_in_len;
+ spx_uint32_t tmp_magic;
tmp_in_len = st->magic_samples[channel_index];
tmp_out_len = *out_len;
/* FIXME: Need to handle the case where the out array is too small */
@@ -739,7 +746,7 @@
/* If we couldn't process all "magic" input samples, save the rest for next time */
if (tmp_in_len < tmp_magic)
{
- int i;
+ spx_uint32_t i;
st->magic_samples[channel_index] = tmp_magic-tmp_in_len;
for (i=0;i<st->magic_samples[channel_index];i++)
mem[N-1+i]=mem[N-1+i+tmp_in_len];
@@ -750,25 +757,32 @@
/* Call the right resampler through the function ptr */
out_sample = st->resampler_ptr(st, channel_index, in, in_len, out, out_len);
- if (st->last_sample[channel_index] < *in_len)
+ if (st->last_sample[channel_index] < (spx_int32_t)*in_len)
*in_len = st->last_sample[channel_index];
*out_len = out_sample+tmp_out_len;
st->last_sample[channel_index] -= *in_len;
- for (j=0;j<N-1-*in_len;j++)
+ for (j=0;j<N-1-(spx_int32_t)*in_len;j++)
mem[j] = mem[j+*in_len];
for (;j<N-1;j++)
mem[j] = in[st->in_stride*(j+*in_len-N+1)];
}
+#define FIXED_STACK_ALLOC 1024
+
#ifdef FIXED_POINT
-void speex_resampler_process_float(SpeexResamplerState *st, int channel_index, const float *in, int *in_len, float *out, int *out_len)
+void speex_resampler_process_float(SpeexResamplerState *st, spx_uint32_t channel_index, const float *in, spx_uint32_t *in_len, float *out, spx_uint32_t *out_len)
{
- int i;
+ spx_uint32_t i;
int istride_save, ostride_save;
+#ifdef VAR_ARRAYS
spx_word16_t x[*in_len];
spx_word16_t y[*out_len];
+ /*VARDECL(spx_word16_t *x);
+ VARDECL(spx_word16_t *y);
+ ALLOC(x, *in_len, spx_word16_t);
+ ALLOC(y, *out_len, spx_word16_t);*/
istride_save = st->in_stride;
ostride_save = st->out_stride;
for (i=0;i<*in_len;i++)
@@ -779,22 +793,58 @@
st->out_stride = ostride_save;
for (i=0;i<*out_len;i++)
out[i*st->out_stride] = y[i];
+#else
+ spx_word16_t x[FIXED_STACK_ALLOC];
+ spx_word16_t y[FIXED_STACK_ALLOC];
+ spx_uint32_t ilen=*in_len, olen=*out_len;
+ istride_save = st->in_stride;
+ ostride_save = st->out_stride;
+ while (ilen && olen)
+ {
+ spx_uint32_t ichunk, ochunk;
+ ichunk = ilen;
+ ochunk = olen;
+ if (ichunk>FIXED_STACK_ALLOC)
+ ichunk=FIXED_STACK_ALLOC;
+ if (ochunk>FIXED_STACK_ALLOC)
+ ochunk=FIXED_STACK_ALLOC;
+ for (i=0;i<ichunk;i++)
+ x[i] = WORD2INT(in[i*st->in_stride]);
+ st->in_stride = st->out_stride = 1;
+ speex_resampler_process_native(st, channel_index, x, &ichunk, y, &ochunk);
+ st->in_stride = istride_save;
+ st->out_stride = ostride_save;
+ for (i=0;i<ochunk;i++)
+ out[i*st->out_stride] = y[i];
+ out += ochunk;
+ in += ichunk;
+ ilen -= ichunk;
+ olen -= ochunk;
+ }
+ *in_len -= ilen;
+ *out_len -= olen;
+#endif
}
-void speex_resampler_process_int(SpeexResamplerState *st, int channel_index, const spx_int16_t *in, int *in_len, spx_int16_t *out, int *out_len)
+void speex_resampler_process_int(SpeexResamplerState *st, spx_uint32_t channel_index, const spx_int16_t *in, spx_uint32_t *in_len, spx_int16_t *out, spx_uint32_t *out_len)
{
speex_resampler_process_native(st, channel_index, in, in_len, out, out_len);
}
#else
-void speex_resampler_process_float(SpeexResamplerState *st, int channel_index, const float *in, int *in_len, float *out, int *out_len)
+void speex_resampler_process_float(SpeexResamplerState *st, spx_uint32_t channel_index, const float *in, spx_uint32_t *in_len, float *out, spx_uint32_t *out_len)
{
speex_resampler_process_native(st, channel_index, in, in_len, out, out_len);
}
-void speex_resampler_process_int(SpeexResamplerState *st, int channel_index, const spx_int16_t *in, int *in_len, spx_int16_t *out, int *out_len)
+void speex_resampler_process_int(SpeexResamplerState *st, spx_uint32_t channel_index, const spx_int16_t *in, spx_uint32_t *in_len, spx_int16_t *out, spx_uint32_t *out_len)
{
- int i;
+ spx_uint32_t i;
int istride_save, ostride_save;
+#ifdef VAR_ARRAYS
spx_word16_t x[*in_len];
spx_word16_t y[*out_len];
+ /*VARDECL(spx_word16_t *x);
+ VARDECL(spx_word16_t *y);
+ ALLOC(x, *in_len, spx_word16_t);
+ ALLOC(y, *out_len, spx_word16_t);*/
istride_save = st->in_stride;
ostride_save = st->out_stride;
for (i=0;i<*in_len;i++)
@@ -805,12 +855,43 @@
st->out_stride = ostride_save;
for (i=0;i<*out_len;i++)
out[i*st->out_stride] = WORD2INT(y[i]);
+#else
+ spx_word16_t x[FIXED_STACK_ALLOC];
+ spx_word16_t y[FIXED_STACK_ALLOC];
+ spx_uint32_t ilen=*in_len, olen=*out_len;
+ istride_save = st->in_stride;
+ ostride_save = st->out_stride;
+ while (ilen && olen)
+ {
+ spx_uint32_t ichunk, ochunk;
+ ichunk = ilen;
+ ochunk = olen;
+ if (ichunk>FIXED_STACK_ALLOC)
+ ichunk=FIXED_STACK_ALLOC;
+ if (ochunk>FIXED_STACK_ALLOC)
+ ochunk=FIXED_STACK_ALLOC;
+ for (i=0;i<ichunk;i++)
+ x[i] = in[i*st->in_stride];
+ st->in_stride = st->out_stride = 1;
+ speex_resampler_process_native(st, channel_index, x, &ichunk, y, &ochunk);
+ st->in_stride = istride_save;
+ st->out_stride = ostride_save;
+ for (i=0;i<ochunk;i++)
+ out[i*st->out_stride] = WORD2INT(y[i]);
+ out += ochunk;
+ in += ichunk;
+ ilen -= ichunk;
+ olen -= ochunk;
+ }
+ *in_len -= ilen;
+ *out_len -= olen;
+#endif
}
#endif
-void speex_resampler_process_interleaved_float(SpeexResamplerState *st, const float *in, int *in_len, float *out, int *out_len)
+void speex_resampler_process_interleaved_float(SpeexResamplerState *st, const float *in, spx_uint32_t *in_len, float *out, spx_uint32_t *out_len)
{
- int i;
+ spx_uint32_t i;
int istride_save, ostride_save;
istride_save = st->in_stride;
ostride_save = st->out_stride;
@@ -823,9 +904,9 @@
st->out_stride = ostride_save;
}
-void speex_resampler_process_interleaved_int(SpeexResamplerState *st, const spx_int16_t *in, int *in_len, spx_int16_t *out, int *out_len)
+void speex_resampler_process_interleaved_int(SpeexResamplerState *st, const spx_int16_t *in, spx_uint32_t *in_len, spx_int16_t *out, spx_uint32_t *out_len)
{
- int i;
+ spx_uint32_t i;
int istride_save, ostride_save;
istride_save = st->in_stride;
ostride_save = st->out_stride;
@@ -838,18 +919,18 @@
st->out_stride = ostride_save;
}
-void speex_resampler_set_rate(SpeexResamplerState *st, int in_rate, int out_rate)
+void speex_resampler_set_rate(SpeexResamplerState *st, spx_uint32_t in_rate, spx_uint32_t out_rate)
{
speex_resampler_set_rate_frac(st, in_rate, out_rate, in_rate, out_rate);
}
-void speex_resampler_get_rate(SpeexResamplerState *st, int *in_rate, int *out_rate)
+void speex_resampler_get_rate(SpeexResamplerState *st, spx_uint32_t *in_rate, spx_uint32_t *out_rate)
{
*in_rate = st->in_rate;
*out_rate = st->out_rate;
}
-void speex_resampler_set_rate_frac(SpeexResamplerState *st, int ratio_num, int ratio_den, int in_rate, int out_rate)
+void speex_resampler_set_rate_frac(SpeexResamplerState *st, spx_uint32_t ratio_num, spx_uint32_t ratio_den, spx_uint32_t in_rate, spx_uint32_t out_rate)
{
int fact;
if (st->in_rate == in_rate && st->out_rate == out_rate && st->num_rate == ratio_num && st->den_rate == ratio_den)
@@ -873,7 +954,7 @@
update_filter(st);
}
-void speex_resampler_get_ratio(SpeexResamplerState *st, int *ratio_num, int *ratio_den)
+void speex_resampler_get_ratio(SpeexResamplerState *st, spx_uint32_t *ratio_num, spx_uint32_t *ratio_den)
{
*ratio_num = st->num_rate;
*ratio_den = st->den_rate;
@@ -897,36 +978,36 @@
*quality = st->quality;
}
-void speex_resampler_set_input_stride(SpeexResamplerState *st, int stride)
+void speex_resampler_set_input_stride(SpeexResamplerState *st, spx_uint32_t stride)
{
st->in_stride = stride;
}
-void speex_resampler_get_input_stride(SpeexResamplerState *st, int *stride)
+void speex_resampler_get_input_stride(SpeexResamplerState *st, spx_uint32_t *stride)
{
*stride = st->in_stride;
}
-void speex_resampler_set_output_stride(SpeexResamplerState *st, int stride)
+void speex_resampler_set_output_stride(SpeexResamplerState *st, spx_uint32_t stride)
{
st->out_stride = stride;
}
-void speex_resampler_get_output_stride(SpeexResamplerState *st, int *stride)
+void speex_resampler_get_output_stride(SpeexResamplerState *st, spx_uint32_t *stride)
{
*stride = st->out_stride;
}
void speex_resampler_skip_zeros(SpeexResamplerState *st)
{
- int i;
+ spx_uint32_t i;
for (i=0;i<st->nb_channels;i++)
st->last_sample[i] = st->filt_len/2;
}
void speex_resampler_reset_mem(SpeexResamplerState *st)
{
- int i;
+ spx_uint32_t i;
for (i=0;i<st->nb_channels*(st->filt_len-1);i++)
st->mem[i] = 0;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/alsa-plugins-1.0.14rc3/pph/speex_resampler.h new/alsa-plugins-1.0.14rc4/pph/speex_resampler.h
--- old/alsa-plugins-1.0.14rc3/pph/speex_resampler.h 2007-02-26 10:21:37.000000000 +0100
+++ new/alsa-plugins-1.0.14rc4/pph/speex_resampler.h 2007-05-02 13:31:35.000000000 +0200
@@ -46,7 +46,7 @@
/* If the resampler is defined outside of Speex, we change the symbol names so that
there won't be any clash if linking with Speex later on. */
-#define RANDOM_PREFIX ALSA_PUBLIC_PARROT_HACK_PLUGIN
+/* #define RANDOM_PREFIX your software name here */
#ifndef RANDOM_PREFIX
#error "Please define RANDOM_PREFIX (above) to something specific to your project to prevent symbol name clashes"
#endif
@@ -75,10 +75,15 @@
#define speex_resampler_reset_mem CAT_PREFIX(RANDOM_PREFIX,_resampler_reset_mem)
#define spx_int16_t short
+#define spx_int32_t int
+#define spx_uint16_t unsigned short
+#define spx_uint32_t unsigned int
+#if 0
#ifdef FIXED_POINT
-#define spx_word16_t short
-#define spx_word32_t int
+/*#define spx_word16_t spx_int16_t
+#define spx_word32_t spx_int32_t*/
+#include "arch.h"
#else /* FIXED_POINT */
@@ -88,7 +93,8 @@
#define MULT16_32_Q15(a,b) ((a)*(b))
#define PSHR32(a,b) (a)
#endif /* FIXED_POINT */
-
+#endif
+
#else /* OUTSIDE_SPEEX */
#include "speex/speex_types.h"
@@ -117,9 +123,9 @@
* @return Newly created resampler state
* @retval NULL Error: not enough memory
*/
-SpeexResamplerState *speex_resampler_init(int nb_channels,
- int in_rate,
- int out_rate,
+SpeexResamplerState *speex_resampler_init(spx_uint32_t nb_channels,
+ spx_uint32_t in_rate,
+ spx_uint32_t out_rate,
int quality);
/** Create a new resampler with fractional input/output rates. The sampling
@@ -135,11 +141,11 @@
* @return Newly created resampler state
* @retval NULL Error: not enough memory
*/
-SpeexResamplerState *speex_resampler_init_frac(int nb_channels,
- int ratio_num,
- int ratio_den,
- int in_rate,
- int out_rate,
+SpeexResamplerState *speex_resampler_init_frac(spx_uint32_t nb_channels,
+ spx_uint32_t ratio_num,
+ spx_uint32_t ratio_den,
+ spx_uint32_t in_rate,
+ spx_uint32_t out_rate,
int quality);
/** Destroy a resampler state.
@@ -158,11 +164,11 @@
* @param out_len Size of the output buffer. Returns the number of samples written
*/
void speex_resampler_process_float(SpeexResamplerState *st,
- int channel_index,
+ spx_uint32_t channel_index,
const float *in,
- int *in_len,
+ spx_uint32_t *in_len,
float *out,
- int *out_len);
+ spx_uint32_t *out_len);
/** Resample an int array. The input and output buffers must *not* overlap.
* @param st Resampler state
@@ -175,11 +181,11 @@
* @param out_len Size of the output buffer. Returns the number of samples written
*/
void speex_resampler_process_int(SpeexResamplerState *st,
- int channel_index,
+ spx_uint32_t channel_index,
const spx_int16_t *in,
- int *in_len,
+ spx_uint32_t *in_len,
spx_int16_t *out,
- int *out_len);
+ spx_uint32_t *out_len);
/** Resample an interleaved float array. The input and output buffers must *not* overlap.
* @param st Resampler state
@@ -192,9 +198,9 @@
*/
void speex_resampler_process_interleaved_float(SpeexResamplerState *st,
const float *in,
- int *in_len,
+ spx_uint32_t *in_len,
float *out,
- int *out_len);
+ spx_uint32_t *out_len);
/** Resample an interleaved int array. The input and output buffers must *not* overlap.
* @param st Resampler state
@@ -207,9 +213,9 @@
*/
void speex_resampler_process_interleaved_int(SpeexResamplerState *st,
const spx_int16_t *in,
- int *in_len,
+ spx_uint32_t *in_len,
spx_int16_t *out,
- int *out_len);
+ spx_uint32_t *out_len);
/** Set (change) the input/output sampling rates (integer value).
* @param st Resampler state
@@ -217,8 +223,8 @@
* @param out_rate Output sampling rate (integer number of Hz).
*/
void speex_resampler_set_rate(SpeexResamplerState *st,
- int in_rate,
- int out_rate);
+ spx_uint32_t in_rate,
+ spx_uint32_t out_rate);
/** Get the current input/output sampling rates (integer value).
* @param st Resampler state
@@ -226,8 +232,8 @@
* @param out_rate Output sampling rate (integer number of Hz) copied.
*/
void speex_resampler_get_rate(SpeexResamplerState *st,
- int *in_rate,
- int *out_rate);
+ spx_uint32_t *in_rate,
+ spx_uint32_t *out_rate);
/** Set (change) the input/output sampling rates and resampling ratio
* (fractional values in Hz supported).
@@ -238,10 +244,10 @@
* @param out_rate Output sampling rate rounded to the nearest integer (in Hz).
*/
void speex_resampler_set_rate_frac(SpeexResamplerState *st,
- int ratio_num,
- int ratio_den,
- int in_rate,
- int out_rate);
+ spx_uint32_t ratio_num,
+ spx_uint32_t ratio_den,
+ spx_uint32_t in_rate,
+ spx_uint32_t out_rate);
/** Get the current resampling ratio. This will be reduced to the least
* common denominator.
@@ -250,8 +256,8 @@
* @param ratio_den Denominator of the sampling rate ratio copied
*/
void speex_resampler_get_ratio(SpeexResamplerState *st,
- int *ratio_num,
- int *ratio_den);
+ spx_uint32_t *ratio_num,
+ spx_uint32_t *ratio_den);
/** Set (change) the conversion quality.
* @param st Resampler state
@@ -274,28 +280,28 @@
* @param stride Input stride
*/
void speex_resampler_set_input_stride(SpeexResamplerState *st,
- int stride);
+ spx_uint32_t stride);
/** Get the input stride.
* @param st Resampler state
* @param stride Input stride copied
*/
void speex_resampler_get_input_stride(SpeexResamplerState *st,
- int *stride);
+ spx_uint32_t *stride);
/** Set (change) the output stride.
* @param st Resampler state
* @param stride Output stride
*/
void speex_resample_set_output_stride(SpeexResamplerState *st,
- int stride);
+ spx_uint32_t stride);
/** Get the output stride.
* @param st Resampler state copied
* @param stride Output stride
*/
void speex_resample_get_output_stride(SpeexResamplerState *st,
- int *stride);
+ spx_uint32_t *stride);
/** Make sure that the first samples to go out of the resamplers don't have
* leading zeros. This is only useful before starting to use a newly created
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/alsa-plugins-1.0.14rc3/pulse/pcm_pulse.c new/alsa-plugins-1.0.14rc4/pulse/pcm_pulse.c
--- old/alsa-plugins-1.0.14rc3/pulse/pcm_pulse.c 2007-02-26 10:21:37.000000000 +0100
+++ new/alsa-plugins-1.0.14rc4/pulse/pcm_pulse.c 2007-05-02 13:31:35.000000000 +0200
@@ -643,23 +643,8 @@
if (err < 0)
return err;
- err = snd_pcm_ioplug_set_param_minmax(io, SND_PCM_IOPLUG_HW_RATE,
- 8000, 48000);
- if (err < 0)
- return err;
-
- err = snd_pcm_ioplug_set_param_minmax(io, SND_PCM_IOPLUG_HW_PERIOD_BYTES,
- 1, 4294967295U);
- if (err < 0)
- return err;
-
- err = snd_pcm_ioplug_set_param_minmax(io, SND_PCM_IOPLUG_HW_PERIODS,
- 2, 4294967295U);
- if (err < 0)
- return err;
-
err = snd_pcm_ioplug_set_param_minmax(io, SND_PCM_IOPLUG_HW_BUFFER_BYTES,
- 1, 4294967295U);
+ 1, 4 * 1024 * 1024);
if (err < 0)
return err;
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/alsa-plugins-1.0.14rc3/rate-lavc/gcd.h new/alsa-plugins-1.0.14rc4/rate-lavc/gcd.h
--- old/alsa-plugins-1.0.14rc3/rate-lavc/gcd.h 1970-01-01 01:00:00.000000000 +0100
+++ new/alsa-plugins-1.0.14rc4/rate-lavc/gcd.h 2007-05-02 13:31:35.000000000 +0200
@@ -0,0 +1,56 @@
+/*
+ * Fast implementation of greatest common divisor using the binary algorithm.
+ * Copyright (c) 2007 Nicholas Kain
+ *
+ * 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.
+ */
+
+/* computes gcd using binary algorithm */
+static int gcd(int a, int b)
+{
+ int s,d;
+
+ if (!a || !b)
+ return a | b;
+
+ for (s=0; ((a|b)&1) == 0; ++s) {
+ a >>= 1;
+ b >>= 1;
+ }
+
+ while ((a&1) == 0)
+ a >>= 1;
+
+ do {
+ while ((b&1) == 0) {
+ b >>= 1;
+ }
+ if (a<b) {
+ b -= a;
+ } else {
+ d = a-b;
+ a = b;
+ b = d;
+ }
+ b >>= 1;
+ } while (b);
+
+ return a << s;
+}
+
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/alsa-plugins-1.0.14rc3/rate-lavc/Makefile.am new/alsa-plugins-1.0.14rc4/rate-lavc/Makefile.am
--- old/alsa-plugins-1.0.14rc3/rate-lavc/Makefile.am 2007-02-26 10:21:37.000000000 +0100
+++ new/alsa-plugins-1.0.14rc4/rate-lavc/Makefile.am 2007-05-02 13:31:35.000000000 +0200
@@ -8,6 +8,8 @@
libasound_module_rate_lavcrate_la_SOURCES = rate_lavcrate.c
libasound_module_rate_lavcrate_la_LIBADD = @ALSA_LIBS@ @AVCODEC_LIBS@
+noinst_HEADERS = gcd.h
+
install-exec-hook:
rm -f $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_lavcrate_*.so
$(LN_S) libasound_module_rate_lavcrate.so $(DESTDIR)$(libdir)/alsa-lib/libasound_module_rate_lavcrate_higher.so
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/alsa-plugins-1.0.14rc3/version new/alsa-plugins-1.0.14rc4/version
--- old/alsa-plugins-1.0.14rc3/version 2007-02-26 10:23:17.000000000 +0100
+++ new/alsa-plugins-1.0.14rc4/version 2007-05-02 13:31:53.000000000 +0200
@@ -1 +1 @@
-1.0.14rc3
+1.0.14rc4
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
[View Less]
1
0