April 2010 - openSUSE Commits - openSUSE Mailing Lists

drop psx-plugins from openSUSE:Factory
by root＠hilbert.suse.de 22 Apr '10

22 Apr '10

Hello community, FYI: Package psx-plugins was dropped from openSUSE:Factory at Fri Apr 23 01:43:23 CEST 2010. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=ps… 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

1 0

drop pcsx from openSUSE:Factory
by root＠hilbert.suse.de 22 Apr '10

22 Apr '10

Hello community, FYI: Package pcsx was dropped from openSUSE:Factory at Fri Apr 23 01:42:31 CEST 2010. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=pc… 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

1 0

commit kdevelop4-plugins for openSUSE:Factory
by root＠hilbert.suse.de 22 Apr '10

22 Apr '10

Hello community, here is the log from the commit of package kdevelop4-plugins for openSUSE:Factory checked in at Fri Apr 23 01:42:17 CEST 2010. -------- New Changes file: --- /dev/null 2010-04-12 17:03:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdevelop4-plugins/kdevelop4-plugins.changes 2010-03-10 14:47:39.000000000 +0100 @@ -0,0 +1,23 @@ +------------------------------------------------------------------- +Wed Mar 10 13:19:49 UTC 2010 - tittiatcoke(a)gmail.com + +- update to svn1100920 + PHP: + * Beta 4 + * don't try to access the core in the dtor of the language plugin, + it might be gone already sinc alnguage plugins are never unloaded + while kdevelop is running + UPLOAD: + * Don't show configure button in module selection. + +------------------------------------------------------------------- +Fri Feb 12 21:41:36 UTC 2010 - tittiatcoke(a)gmail.com + +- update to svn1089146 + * added upload plugin + +------------------------------------------------------------------- +Sat Jan 9 10:34:41 UTC 2010 - tittiatcoke(a)gmail.com + +- initial package + calling whatdependson for head-i586 New: ---- kdevelop-plugins-svn1112681.tar.bz2 kdevelop4-plugins.changes kdevelop4-plugins.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdevelop4-plugins.spec ++++++ # # spec file for package kdevelop4-plugins (Version 3.10.0svn1112681) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: kdevelop4-plugins BuildRequires: kdebase4-workspace-devel kdesdk4 kdevelop4-devel libkde4-devel libkdevplatform-devel License: GPLv2+ Group: Development/Tools/IDE Summary: Additional plugins for Kdevelop4 Integrated Development Environment Url: http://www.kdevelop.org %define rversion svn1112681 %define KDev4 3.10.0 Version: %{KDev4}%{rversion} Release: 1 Source0: kdevelop-plugins-%{rversion}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires %description Additional plugins for Kdevelop4 Integrated Development Environment * PHP Language support, documentation, debugging (xdebug) %prep %setup -q -n kdevelop-plugins-%{rversion} %build %cmake_kde4 -d build %make_jobs %install cd build %makeinstall %kde_post_install cd .. %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT %package php License: GPLv2+ Group: Development/Tools/IDE Summary: PHP Plugin for Kdevelop4 Integrated Development Environment Requires: kdevelop4 = %{KDev4} %kde4_runtime_requires %description php PHP Plugin for Kdevelop4 Integrated Development Environment This plugin enables support for the following features for developing web applications in PHP using Kdevelope4. * PHP built-in functions, classes, constants, superglobals * user-defined functions, classes, constants, superglobals, variables, etc. * proper code completion for objects which respects access modifiers (private, public, protected) and differentiates between static/non-static members and methods * code completion for overridable and implementable functions inside classes * hints in the argument list of function- and method class * sane code completion after keywords such as “extends, implements, catch(), new, throw” and some more I think %package php-doc License: GPLv2+ Group: Development/Tools/IDE Summary: PHP Documentation for Kdevelop4 Integrated Development Environment Requires: kdevelop4-plugins-php = %{version} %kde4_runtime_requires %description php-doc PHP Plugin documentation for Kdevelop4 Integrated Development Environment %package upload License: GPLv2+ Group: Development/Tools/IDE Summary: Upload Plugin for Kdevelop4 Integrated Development Environment Requires: kdevelop4 = %{KDev4} %kde4_runtime_requires %description upload Upload Plugin for Kdevelop4 Integrated Development Environment %files php %defattr(-,root,root) %dir %_kde_share_dir/apps/kdevphpsupport %_libdir/kde4/kdevphplanguagesupport.so %_libdir/libkdev4phpcompletion.so %_libdir/libkdev4phpduchain.so %_libdir/libkdev4phpparser.so %_kde_share_dir/apps/kdevappwizard/templates/simple_phpapp.tar.bz2 %_kde_share_dir/services/kdevphpsupport.desktop %_kde_share_dir/apps/kdevphpsupport/phpfunctions.php.gz %files php-doc %defattr(-,root,root) %_libdir/kde4/kdevphpdocs.so %_libdir/kde4/kdevphpdocs_config.so %_kde_share_dir/config.kcfg/phpdocssettings.kcfg %_kde_share_dir/services/kdevphpdocs.desktop %_kde_share_dir/services/kdevphpdocs_config.desktop %files upload %defattr(-,root,root) %dir %_kde_share_dir/apps/kdevupload %_libdir/kde4/kcm_kdev_upload.so %_libdir/kde4/libkdevupload.so %_kde_share_dir/apps/kdevupload/kdevupload.rc %_kde_share_dir/services/kcm_kdev_upload.desktop %_kde_share_dir/services/kdevupload.desktop %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

1 0

drop speechd from openSUSE:Factory
by root＠hilbert.suse.de 22 Apr '10

22 Apr '10

Hello community, FYI: Package speechd was dropped from openSUSE:Factory at Fri Apr 23 01:41:14 CEST 2010. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=sp… 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

1 0

commit libcap-ng for openSUSE:Factory
by root＠hilbert.suse.de 22 Apr '10

22 Apr '10

Hello community, here is the log from the commit of package libcap-ng for openSUSE:Factory checked in at Fri Apr 23 01:41:05 CEST 2010. -------- New Changes file: --- /dev/null 2010-04-12 17:03:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/libcap-ng/libcap-ng.changes 2010-03-12 11:02:52.000000000 +0100 @@ -0,0 +1,21 @@ +------------------------------------------------------------------- +Fri Mar 12 10:01:51 UTC 2010 - pascal.bleser(a)opensuse.org + +- update to 0.6.3: + * in netcap and pscap use the effective uid + * in capng_change_id, only retain setpcap if clearing the bounding set + +- add rpmlintrc to disable false positive warnings + +- symlink license files on openSUSE + +------------------------------------------------------------------- +Wed Mar 10 16:02:51 UTC 2010 - prusnak(a)suse.cz + +- fixed Requires of python subpackage + +------------------------------------------------------------------- +Fri Feb 26 12:14:04 UTC 2010 - prusnak(a)suse.cz + +- imported package from Fedora (version 0.6.2) + calling whatdependson for head-i586 New: ---- libcap-ng-0.6.3.tar.bz2 libcap-ng.changes libcap-ng.rpmlintrc libcap-ng.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcap-ng.spec ++++++ # # spec file for package libcap-ng (Version 0.6.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} Summary: An alternate POSIX capabilities library Name: libcap-ng Version: 0.6.3 Release: 1 %define soname 0 License: LGPLv2+ Group: System Environment/Libraries Url: http://people.redhat.com/sgrubb/libcap-ng # http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-%{version}.tar.gz Source0: libcap-ng-%{version}.tar.bz2 Source99: libcap-ng.rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: kernel-headers >= 2.6.11 BuildRequires: libattr-devel %if 0%{?suse_version} >= 1030 BuildRequires: licenses Requires: licenses %endif %description Libcap-ng is a library that makes using posix capabilities easier %package -n %{name}%{soname} Summary: An alternate POSIX capabilities library License: LGPLv2+ Group: System Environment/Libraries %description -n %{name}%{soname} Libcap-ng is a library that makes using posix capabilities easier %package devel Summary: Header files for libcap-ng library License: LGPLv2+ Group: Development/Libraries Requires: kernel-headers >= 2.6.11 Requires: %{name}%{soname} = %{version} Requires: pkgconfig %description devel The libcap-ng-devel package contains the files needed for developing applications that need to use the libcap-ng library. %package -n python-capng Summary: Python bindings for libcap-ng library License: LGPLv2+ Group: Development/Libraries BuildRequires: python-devel swig Requires: %{name}%{soname} = %{version} %description -n python-capng The libcap-ng-python package contains the bindings so that libcap-ng and can be used by python applications. %package utils Summary: Utilities for analysing and setting file capabilities License: GPLv2+ Group: Development/Libraries %description utils The libcap-ng-utils package contains applications to analyse the posix capabilities of all the program running on a system. It also lets you set the file system based capabilities. %prep %setup -q %build %configure --libdir=/%{_lib} %__make %{?_smp_mflags} %{?jobs:-j%{jobs}} %install %__make DESTDIR="${RPM_BUILD_ROOT}" install # Move the symlink rm -f $RPM_BUILD_ROOT/%{_lib}/%{name}.so mkdir -p $RPM_BUILD_ROOT%{_libdir} VLIBNAME=$(ls $RPM_BUILD_ROOT/%{_lib}/%{name}.so.*.*.*) LIBNAME=$(basename $VLIBNAME) ln -s ../../%{_lib}/$LIBNAME $RPM_BUILD_ROOT%{_libdir}/%{name}.so # Move the pkgconfig file mv $RPM_BUILD_ROOT/%{_lib}/pkgconfig $RPM_BUILD_ROOT%{_libdir} # Remove a couple things so they don't get picked up rm -f $RPM_BUILD_ROOT/%{_lib}/libcap-ng.{a,la} rm -f $RPM_BUILD_ROOT%{python_sitearch}/_capng.{a,la} for f in COPYING COPYING.LIB; do h=/usr/share/doc/licenses/md5/$(md5sum "$f"|cut -f1 -d" ") test -e "$h" && %__ln_s -f "$h" . done %clean rm -rf $RPM_BUILD_ROOT %post -n %{name}%{soname} -p /sbin/ldconfig %postun -n %{name}%{soname} -p /sbin/ldconfig %files -n %{name}%{soname} %defattr(-,root,root,-) %doc COPYING.LIB %attr(0755,root,root) /%{_lib}/libcap-ng.so.%{soname} %attr(0755,root,root) /%{_lib}/libcap-ng.so.%{soname}.* %files devel %defattr(-,root,root,-) %attr(0644,root,root) %{_mandir}/man3/*.3%{ext_man} %attr(0644,root,root) %{_includedir}/cap-ng.h %attr(0755,root,root) %{_libdir}/libcap-ng.so %attr(0644,root,root) %{_datadir}/aclocal/cap-ng.m4 %{_libdir}/pkgconfig/libcap-ng.pc %files -n python-capng %defattr(-,root,root,-) %attr(755,root,root) %{python_sitearch}/_capng.so %{python_sitearch}/capng.py* %files utils %defattr(-,root,root,-) %doc COPYING %attr(0755,root,root) %{_bindir}/captest %attr(0755,root,root) %{_bindir}/filecap %attr(0755,root,root) %{_bindir}/netcap %attr(0755,root,root) %{_bindir}/pscap %attr(0644,root,root) %{_mandir}/man8/*.8%{ext_man} %changelog ++++++ libcap-ng.rpmlintrc ++++++ addFilter("libcap-ng-utils.*: W: shlib-policy-missing-lib") addFilter("libcap-ng-utils.*: W: shlib-policy-nonversioned-dir .*") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

1 0

commit speech-dispatcher for openSUSE:Factory
by root＠hilbert.suse.de 22 Apr '10

22 Apr '10

Hello community, here is the log from the commit of package speech-dispatcher for openSUSE:Factory checked in at Fri Apr 23 01:40:27 CEST 2010. -------- New Changes file: --- /dev/null 2010-04-12 17:03:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/speech-dispatcher/speech-dispatcher.changes 2010-04-08 17:57:57.000000000 +0200 @@ -0,0 +1,97 @@ +------------------------------------------------------------------- +Wed Apr 7 16:14:39 CEST 2010 - vuntz(a)opensuse.org + +- Completely rework the package, based on the Fedora and Debian + packages. +- Rename the source package to speech-dispatcher, to follow + upstream name. + +------------------------------------------------------------------- +Sun Jan 31 10:24:11 CET 2010 - lnussel(a)suse.de + +- don't enable daemon by default + +------------------------------------------------------------------- +Tue Sep 1 09:30:16 CEST 2009 - coolo(a)novell.com + +- again: use new python macros + +-------------------------------------------------------------------- +Wed Aug 19 20:30:03 CEST 2009 - marco(a)suse.de + +- speechd.spec: using py_sitedir instead of python_sitelib + +-------------------------------------------------------------------- +Tue Aug 18 23:49:17 CEST 2009 - marco(a)suse.de + +- added build options for espeak support +- --with-pulse --with-espeak +- buildrequirements espeak-devel and pulseaudio-devel + +------------------------------------------------------------------- +Sun Aug 9 08:40:43 CEST 2009 - coolo(a)novell.com + +- use new python macros + +------------------------------------------------------------------- +Mon Jun 8 00:10:50 CEST 2009 - ro(a)suse.de + +- adapt getline definition to glibc + +------------------------------------------------------------------- +Thu Mar 26 13:11:21 CET 2009 - crrodriguez(a)suse.de + +- remove static libraries and "la" files + +------------------------------------------------------------------- +Mon Sep 29 12:19:52 CEST 2008 - marco(a)suse.de + +- fixed start-script (bug#430563) + +------------------------------------------------------------------- +Tue Sep 16 23:40:08 CEST 2008 - dmueller(a)suse.de + +- move python requires to python subpackage +- fix requires + +------------------------------------------------------------------- +Mon Sep 15 16:08:29 CEST 2008 - dmueller(a)suse.de + +- fix filelist + +-------------------------------------------------------------------- +Sun Sep 14 03:39:23 CEST 2008 - marco(a)suse.de + +- added devel section to spec-file +- added suse_python patch to insert start-script + and to use DESTDIR in the python-bindings makefile + +-------------------------------------------------------------------- +Thu Sep 11 02:50:06 CEST 2008 - marco(a)suse.de + +- updated to 0.6.7 +-------------------------------------------------------------------- +Fri Feb 22 13:28:38 CET 2008 - marco(a)suse.de + +- modified the default config to work with espeak by default + +-------------------------------------------------------------------- +Fri Feb 22 13:27:04 CET 2008 - marco(a)suse.de + +- added section in spec file for speechd-python +- modified makefile for python-bindings (added DESTDIR) + +-------------------------------------------------------------------- +Fri Feb 15 15:27:58 CET 2008 - marco(a)suse.de + +- updated to version 0.6.6 +- added a suse init-script /etc/init.d/speechd +- added the link /usr/sbin/rcspeechd + +------------------------------------------------------------------- +Wed Oct 31 01:54:38 CET 2007 - ro(a)suse.de + +- include assert for alsa source + + + calling whatdependson for head-i586 New: ---- speech-dispatcher-0.6.7.tar.bz2 speech-dispatcher.changes speech-dispatcher.init speech-dispatcher.logrotate speech-dispatcher.spec speech-dispatcher_extlink.patch speech-dispatcher_getline.patch speech-dispatcher_libspeechd.patch speech-dispatcher_paths+files.patch speech-dispatcher_python-makefile.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ speech-dispatcher.spec ++++++ # # spec file for package speech-dispatcher (Version 0.6.7) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: speech-dispatcher Version: 0.6.7 Release: 1 # FIXME missing backends: festival lite, ibmeci (ibm tts), dumbtts/ivona, nas # Almost all files are under GPLv2+, however src/c/clients/spdsend/spdsend.h is # licensed under GPLv2, which makes %%{_bindir}/spdsend GPLv2. License: GPLv2+ Summary: Device independent layer for speech synthesis Group: System/Daemons Url: http://www.freebsoft.org/pub/projects/speechd/ Source0: %{name}-%{version}.tar.bz2 # Init file Source1: speech-dispatcher.init # Logrotate file taken from Debian Source2: speech-dispatcher.logrotate # PATCH-FIX-UPSTREAM speech-dispatcher_python-makefile.patch vuntz(a)opensuse.org -- Taken from Debian, fix installation of python files Patch0: speech-dispatcher_python-makefile.patch # PATCH-FIX-UPSTREAM speech-dispatcher_paths+files.patch vuntz(a)opensuse.org -- Taken from Debian, use `speech-dispatcher' instead of `speechd' in paths Patch1: speech-dispatcher_paths+files.patch # PATCH-FIX-UPSTREAM speech-dispatcher_getline.patch vuntz(a)opensuse.org -- Taken from Debian, fix conflict with glibc Patch2: speech-dispatcher_getline.patch # PATCH-FIX-UPSTREAM speech-dispatcher_libspeechd.patch vuntz(a)opensuse.org -- Taken from Debian, plug socket leak Patch3: speech-dispatcher_libspeechd.patch # PATCH-FIX-UPSTREAM speech-dispatcher_extlink.patch vuntz(a)opensuse.org -- Taken from Debian, link to pthread Patch4: speech-dispatcher_extlink.patch BuildRequires: alsa-devel BuildRequires: dotconf-devel BuildRequires: espeak-devel BuildRequires: glib2-devel BuildRequires: libpulse-devel BuildRequires: libsndfile-devel BuildRequires: python-setuptools BuildRequires: texinfo PreReq: %install_info_prereq Recommends: espeak Suggests: festival Suggests: logrotate Provides: speechd = %{version} Obsoletes: speechd < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The goal of Speech Dispatcher project is to provide a high-level device independent layer for speech synthesis through a simple, stable and well documented interface. What is a very high level GUI library to graphics, Speech Dispatcher is to speech synthesis. The application neither needs to talk to the devices directly nor to handle concurrent access, sound output and other tricky aspects of the speech subsystem. %package configure License: GPLv2+ Summary: Configuration tool for Speech Dispatcher Group: System/Daemons Requires: %{name} = %{version} Enhances: %{name} # spd-conf is in python %py_requires %description configure The goal of Speech Dispatcher project is to provide a high-level device independent layer for speech synthesis through a simple, stable and well documented interface. What is a very high level GUI library to graphics, Speech Dispatcher is to speech synthesis. The application neither needs to talk to the devices directly nor to handle concurrent access, sound output and other tricky aspects of the speech subsystem. This package contains spd-conf, a configuration tool for Speech Dispatcher. %package module-espeak License: GPLv2+ Summary: ESpeak module for Speech Dispatcher Group: System/Daemons Requires: %{name} = %{version} Supplements: packageand(%{name}:espeak) %description module-espeak The goal of Speech Dispatcher project is to provide a high-level device independent layer for speech synthesis through a simple, stable and well documented interface. What is a very high level GUI library to graphics, Speech Dispatcher is to speech synthesis. The application neither needs to talk to the devices directly nor to handle concurrent access, sound output and other tricky aspects of the speech subsystem. This package contains the espeak module. %package -n libspeechd2 License: GPLv2+ Summary: Device independent layer for speech synthesis - Client library Group: System/Libraries Recommends: %{name} %description -n libspeechd2 The goal of Speech Dispatcher project is to provide a high-level device independent layer for speech synthesis through a simple, stable and well documented interface. What is a very high level GUI library to graphics, Speech Dispatcher is to speech synthesis. The application neither needs to talk to the devices directly nor to handle concurrent access, sound output and other tricky aspects of the speech subsystem. %package -n libspeechd-devel License: GPLv2+ Summary: Device independent layer for speech synthesis - Development files Group: Development/Languages/C and C++ Requires: libspeechd2 = %{version} Provides: %{name}-devel = %{version} Provides: speechd-devel = %{version} Obsoletes: speechd-devel < %{version} %description -n libspeechd-devel The goal of Speech Dispatcher project is to provide a high-level device independent layer for speech synthesis through a simple, stable and well documented interface. What is a very high level GUI library to graphics, Speech Dispatcher is to speech synthesis. The application neither needs to talk to the devices directly nor to handle concurrent access, sound output and other tricky aspects of the speech subsystem. %package -n python-speechd License: GPLv2+ Summary: Device independent layer for speech synthesis - Python Bindings Group: Development/Libraries/Python Recommends: %{name} Provides: speechd-python = %{version} Obsoletes: speechd-python < %{version} %py_requires %description -n python-speechd The goal of Speech Dispatcher project is to provide a high-level device independent layer for speech synthesis through a simple, stable and well documented interface. What is a very high level GUI library to graphics, Speech Dispatcher is to speech synthesis. The application neither needs to talk to the devices directly nor to handle concurrent access, sound output and other tricky aspects of the speech subsystem. %prep %setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %build %configure --disable-static \ --with-alsa \ --with-pulse \ --without-flite \ --sysconfdir=%{_sysconfdir} make %{?jobs:-j%jobs} %install %makeinstall find %{buildroot} -type f -name "*.la" -delete -print # Create init.d files install -D -m 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/speech-dispatcher install -d -m 0755 %{buildroot}%{_sbindir} ln -s %{_sysconfdir}/init.d/speech-dispatcher %{buildroot}%{_sbindir}/rcspeech-dispatcher # Create log dir. 0700 since the logs can contain user information. install -d -m 0700 %{buildroot}%{_localstatedir}/log/speech-dispatcher/ # Install logrotate script install -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/speech-dispatcher # Rename certain generically named binaries mv %{buildroot}%{_bindir}/long_message %{buildroot}%{_bindir}/spd_long_message mv %{buildroot}%{_bindir}/run_test %{buildroot}%{_bindir}/spd_run_test # Remove config files for modules we don't support %{__rm} %{buildroot}%{_sysconfdir}/speech-dispatcher/modules/flite.conf %{__rm} %{buildroot}%{_sysconfdir}/speech-dispatcher/modules/ibmtts.conf %{__rm} %{buildroot}%{_sysconfdir}/speech-dispatcher/modules/ivona.conf # Remove config files that we don't need a second time %{__rm} -r %{buildroot}%{_datadir}/speech-dispatcher/conf/ # Remove %{_infodir}/dir file and the one translation of the doc %{__rm} %{buildroot}%{_infodir}/dir %{__rm} %{buildroot}%{_infodir}/%{name}-cs.info %clean rm -rf %{buildroot} %post %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %install_info --info-dir=%{_infodir} %{_infodir}/spd-say.info.gz %install_info --info-dir=%{_infodir} %{_infodir}/ssip.info.gz %preun %stop_on_removal speech-dispatcher %postun %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/spd-say.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/ssip.info.gz %restart_on_update speech-dispatcher %insserv_cleanup %post -n libspeechd2 -p /sbin/ldconfig %postun -n libspeechd2 -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog NEWS README TODO COPYING %dir %{_sysconfdir}/speech-dispatcher/ %dir %{_sysconfdir}/speech-dispatcher/clients %dir %{_sysconfdir}/speech-dispatcher/modules %config(noreplace) %{_sysconfdir}/speech-dispatcher/speechd.conf %config(noreplace) %{_sysconfdir}/speech-dispatcher/clients/*.conf %config(noreplace) %{_sysconfdir}/speech-dispatcher/modules/*.conf %exclude %{_sysconfdir}/speech-dispatcher/modules/espeak.conf %{_bindir}/* %exclude %{_bindir}/spd-conf %{_datadir}/sounds/speech-dispatcher/ %dir %{_libdir}/speech-dispatcher %{_libdir}/speech-dispatcher/libsdaudio.so* # When adding a module, also strop removing its config file in %install %dir %{_libdir}/speech-dispatcher-modules %{_libdir}/speech-dispatcher-modules/sd_cicero %{_libdir}/speech-dispatcher-modules/sd_dummy %{_libdir}/speech-dispatcher-modules/sd_festival %{_libdir}/speech-dispatcher-modules/sd_generic %doc %{_infodir}/%{name}.info.gz %doc %{_infodir}/spd-say.info.gz %doc %{_infodir}/ssip.info.gz # logs %dir %attr(0700, root, root) %{_localstatedir}/log/speech-dispatcher/ %config(noreplace) %{_sysconfdir}/logrotate.d/speech-dispatcher # init.d files %config %{_sysconfdir}/init.d/speech-dispatcher %{_sbindir}/rcspeech-dispatcher %files configure %defattr(-,root,root,-) %{_bindir}/spd-conf %{python_sitelib}/speechd_config/ %{python_sitelib}/speechd_config-*.egg-info %files module-espeak %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/speech-dispatcher/modules/espeak.conf %{_libdir}/speech-dispatcher-modules/sd_espeak %files -n libspeechd2 %defattr(-,root,root,-) %{_libdir}/libspeechd.so.* %files -n libspeechd-devel %defattr(-,root,root,-) %{_includedir}/libspeechd.h %{_libdir}/*.so %files -n python-speechd %defattr(-,root,root,-) %{python_sitelib}/speechd/ %{python_sitelib}/speechd-*.egg-info %changelog ++++++ speech-dispatcher.init ++++++ #! /bin/sh ### BEGIN INIT INFO # Provides: speech-dispatcher # Required-Start: $remote_fs # Should-Start: festival # Required-Stop: $remote_fs # Should-Stop: festival # Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Description: Common interface to speech synthesizers # Short-Description: Speech Dispatcher ### END INIT INFO # Note on runlevels: # 0 - halt/poweroff 6 - reboot # 1 - single user 2 - multiuser without network exported # 3 - multiuser w/ network (text mode) 5 - multiuser w/ network and X11 (xdm) # # Note on script names: # http://www.linuxbase.org/spec/refspecs/LSB_1.2.0/gLSB/scrptnames.html # A registry has been set up to manage the init script namespace. # http://www.lanana.org/ # Please use the names already registered or register one or use a # vendor prefix. # Check for missing binaries (stale symlinks should not happen) SPEECH_DISPATCHER_BIN=/usr/bin/speech-dispatcher test -x $SPEECH_DISPATCHER_BIN || exit 5 # Source LSB init functions # providing start_daemon, killproc, pidofproc, # log_success_msg, log_failure_msg and log_warning_msg. # This is currently not used by UnitedLinux based distributions and # not needed for init scripts for UnitedLinux only. If it is used, # the functions from rc.status should not be sourced or used. #. /lib/lsb/init-functions # Shell functions sourced from /etc/rc.status: # rc_check check and set local and overall rc status # rc_status check and set local and overall rc status # rc_status -v be verbose in local rc status and clear it afterwards # rc_status -v -r ditto and clear both the local and overall rc status # rc_status -s display "skipped" and exit with status 3 # rc_status -u display "unused" and exit with status 3 # rc_failed set local and overall rc status to failed # rc_failed <num> set local and overall rc status to <num> # rc_reset clear both the local and overall rc status # rc_exit exit appropriate to overall rc status # rc_active checks whether a service is activated by symlinks # rc_splash arg sets the boot splash screen to arg (if active) . /etc/rc.status # Reset status of this service rc_reset # Return values acc. to LSB for all commands but status: # 0 - success # 1 - generic or unspecified error # 2 - invalid or excess argument(s) # 3 - unimplemented feature (e.g. "reload") # 4 - user had insufficient privileges # 5 - program is not installed # 6 - program is not configured # 7 - program is not running # 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl) # # Note that starting an already running service, stopping # or restarting a not-running service as well as the restart # with force-reload (in case signaling is not supported) are # considered a success. case "$1" in start) echo -n "Starting speech dispatcher " ## Start daemon with startproc(8). If this fails ## the return value is set appropriately by startproc. startproc -q -e $SPEECH_DISPATCHER_BIN # Remember status and be verbose rc_status -v ;; stop) echo -n "Shutting down speech dispatcher " ## Stop daemon with killproc(8) and if this fails ## killproc sets the return value according to LSB. killproc -TERM $SPEECH_DISPATCHER_BIN # Remember status and be verbose rc_status -v ;; try-restart) ## Do a restart only if the service was active before. ## Note: try-restart is not (yet) part of LSB (as of 1.2) $0 status >/dev/null && $0 restart # Remember status and be quiet rc_status ;; restart) ## Stop the service and regardless of whether it was ## running or not, start it again. $0 stop $0 start # Remember status and be quiet rc_status ;; reload|force-reload) echo -n "Reload speech dispatcher " $0 stop && $0 start #rc_status ;; status) echo -n "Checking for speech dispatcher " ## Check status with checkproc(8), if process is running ## checkproc will return with exit status 0. # Return value is slightly different for the status command: # 0 - service up and running # 1 - service dead, but /var/run/ pid file exists # 2 - service dead, but /var/lock/ lock file exists # 3 - service not running (unused) # 4 - service status unknown :-( # 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.) # NOTE: checkproc returns LSB compliant status values. checkproc $SPEECH_DISPATCHER_BIN # NOTE: rc_status knows that we called this init script with # "status" option and adapts its messages accordingly. rc_status -v ;; *) echo "Usage: $0 {start|stop|status|try-restart|restart|relaod|force-reload}" exit 1 ;; esac rc_exit ++++++ speech-dispatcher.logrotate ++++++ daily compress missingok sharedscripts /var/log/speech-dispatcher/speech-dispatcher.log /var/log/speech-dispatcher/speech-dispatcher-protocol.log { rotate 7 postrotate /etc/init.d/speech-dispatcher reload >/dev/null endscript } /var/log/speech-dispatcher/debug-epos-generic /var/log/speech-dispatcher/debug-festival /var/log/speech-dispatcher/debug-flite { rotate 2 postrotate /etc/init.d/speech-dispatcher reload >/dev/null endscript } ++++++ speech-dispatcher_extlink.patch ++++++ #! /bin/sh /usr/share/dpatch/dpatch-run ## 06_extlink.dpatch by Milan Zamazal <pdm(a)debian.org> ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Make binutils-gold happy. @DPATCH@ diff -urNad speech-dispatcher~/src/c/clients/say/Makefile.am speech-dispatcher/src/c/clients/say/Makefile.am --- speech-dispatcher~/src/c/clients/say/Makefile.am 2009-11-23 13:28:39.000000000 +0100 +++ speech-dispatcher/src/c/clients/say/Makefile.am 2010-01-04 14:58:23.000000000 +0100 @@ -7,4 +7,4 @@ bin_PROGRAMS = spd-say spd_say_SOURCES = say.c options.c options.h $(c_api)/libspeechd.h -spd_say_LDADD = $(c_api)/libspeechd.la +spd_say_LDADD = $(c_api)/libspeechd.la -lpthread diff -urNad speech-dispatcher~/src/tests/Makefile.am speech-dispatcher/src/tests/Makefile.am --- speech-dispatcher~/src/tests/Makefile.am 2008-04-09 13:39:39.000000000 +0200 +++ speech-dispatcher/src/tests/Makefile.am 2010-01-04 14:59:44.000000000 +0100 @@ -8,18 +8,18 @@ bin_PROGRAMS = long_message clibrary clibrary2 run_test connection_recovery long_message_SOURCES = long_message.c $(c_api)/libspeechd.h -long_message_LDADD = $(c_api)/libspeechd.la +long_message_LDADD = $(c_api)/libspeechd.la -lpthread clibrary_SOURCES = clibrary.c $(c_api)/libspeechd.h -clibrary_LDADD = $(c_api)/libspeechd.la +clibrary_LDADD = $(c_api)/libspeechd.la -lpthread clibrary2_SOURCES = clibrary2.c $(c_api)/libspeechd.h -clibrary2_LDADD = $(c_api)/libspeechd.la +clibrary2_LDADD = $(c_api)/libspeechd.la -lpthread connection_recovery_SOURCES = connection-recovery.c $(c_api)/libspeechd.h -connection_recovery_LDADD = $(c_api)/libspeechd.la +connection_recovery_LDADD = $(c_api)/libspeechd.la -lpthread run_test_SOURCES = run_test.c $(c_api)/libspeechd.h -run_test_LDADD = $(c_api)/libspeechd.la +run_test_LDADD = $(c_api)/libspeechd.la -lpthread EXTRA_DIST= *.test *.wav ++++++ speech-dispatcher_getline.patch ++++++ #! /bin/sh /usr/share/dpatch/dpatch-run ## 04_getline.dpatch by Milan Zamazal <pdm(a)debian.org> ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Prevent FTBS with eglibc >= 2.10. ## DP: Patch from Luke Yelavich's unofficial Speech Dispatcher repository (http://git.themuso.com) @DPATCH@ diff -urNad speech-dispatcher~/src/modules/Makefile.am speech-dispatcher/src/modules/Makefile.am --- speech-dispatcher~/src/modules/Makefile.am 2009-11-02 10:17:27.000000000 +0100 +++ speech-dispatcher/src/modules/Makefile.am 2009-11-02 10:19:27.000000000 +0100 @@ -7,7 +7,7 @@ EXTRA_DIST = module_main.c module_utils_addvoice.c festival_client.c festival_client.h ivona_client.c dummy.c dummy-message.wav -AM_CFLAGS = -Wall -DLOCALEDIR=\"$(localedir)\" -DDATADIR=\"$(snddatadir)\" -I/usr/include/ $(inc_local) @glib_include@ -L$(top_srcdir)/src/audio -I$(top_srcdir)/src/audio -I../../intl/ $(ibmtts_include) @SNDFILE_CFLAGS@ -Wl,--rpath -Wl,$(spdlibdir) +AM_CFLAGS = -Wall -DLOCALEDIR=\"$(localedir)\" -DDATADIR=\"$(snddatadir)\" -I/usr/include/ $(inc_local) @glib_include@ -L$(top_srcdir)/src/audio -I$(top_srcdir)/src/audio -I../../intl/ $(ibmtts_include) @SNDFILE_CFLAGS@ -Wl,--rpath -Wl,$(spdlibdir) -D_GNU_SOURCE modulebin_PROGRAMS = sd_dummy sd_generic sd_festival sd_cicero diff -urNad speech-dispatcher~/src/modules/module_main.c speech-dispatcher/src/modules/module_main.c --- speech-dispatcher~/src/modules/module_main.c 2009-11-02 10:17:27.000000000 +0100 +++ speech-dispatcher/src/modules/module_main.c 2009-11-02 10:19:27.000000000 +0100 @@ -21,9 +21,6 @@ * $Id: module_main.c,v 1.16 2008-06-27 12:29:26 hanke Exp $ */ -/* So that gcc doesn't comply */ -int getline(char**, size_t*, FILE*); - #define PROCESS_CMD(command, function) \ if (!strcmp(cmd_buf, #command"\n")){ \ char *msg; \ diff -urNad speech-dispatcher~/src/modules/module_utils.h speech-dispatcher/src/modules/module_utils.h --- speech-dispatcher~/src/modules/module_utils.h 2009-11-02 10:17:27.000000000 +0100 +++ speech-dispatcher/src/modules/module_utils.h 2009-11-02 10:19:27.000000000 +0100 @@ -420,9 +420,6 @@ -/* So that gcc doesn't complain */ -int getline(char**, size_t*, FILE*); - pthread_mutex_t module_stdout_mutex; int module_utils_init(void); ++++++ speech-dispatcher_libspeechd.patch ++++++ #! /bin/sh /usr/share/dpatch/dpatch-run ## 05_libspeechd.dpatch by <pdm(a)debian.org> ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: No description. @DPATCH@ diff -urNad speech-dispatcher~/src/c/api/libspeechd.c speech-dispatcher/src/c/api/libspeechd.c --- speech-dispatcher~/src/c/api/libspeechd.c 2009-11-02 14:10:09.000000000 +0100 +++ speech-dispatcher/src/c/api/libspeechd.c 2009-11-02 14:11:20.000000000 +0100 @@ -134,6 +134,7 @@ ret = connect(connection->socket, (struct sockaddr *)&address, sizeof(address)); if (ret == -1){ SPD_DBG("Error: Can't connect to server: %s", strerror(errno)); + close(connection->socket); return NULL; } ++++++ speech-dispatcher_paths+files.patch ++++++ #! /bin/sh /usr/share/dpatch/dpatch-run ## 03_paths+files.dpatch by <pdm(a)debian.org> ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Use `speech-dispatcher' instead of `speechd' in paths. @DPATCH@ diff -urNad speech-dispatcher~/config/speechd.conf.in speech-dispatcher/config/speechd.conf.in --- speech-dispatcher~/config/speechd.conf.in 2008-08-05 09:34:20.000000000 +0200 +++ speech-dispatcher/config/speechd.conf.in 2008-10-24 19:48:19.000000000 +0200 @@ -43,7 +43,7 @@ # The CustomLogFile allows logging all messages of the given kind, # regardless their priority, to the given destination. -#CustomLogFile "protocol" "/var/log/speech-dispatcher/speechd-protocol.log" +#CustomLogFile "protocol" "/var/log/speech-dispatcher/speech-dispatcher-protocol.log" # ----- VOICE PARAMETERS ----- @@ -69,7 +69,7 @@ # default. Voice types are symbolic names which map to particular # voices provided by the synthesizer according to the output module # configuratuion. Please see the synthesizer-specific configuration -# in etc/speechd/modules/ to see which voices are assigned to +# in etc/speech-dispatcher/modules/ to see which voices are assigned to # different symbolic names. The following symbolic names are # currently supported: MALE1, MALE2, MALE3, FEMALE1, FEMALE2, FEMALE3, # CHILD_MALE, CHILD_FEMALE @@ -203,7 +203,7 @@ # - binary is the path to the binary executable of this module, # either relative (to lib/speech-dispatcher-modules/) or absolute # - configuration is the path to the config file of this module, -# either relative (to etc/speechd/modules/) or absolute +# either relative (to etc/speech-dispatcher/modules/) or absolute AddModule "espeak" "sd_espeak" "espeak.conf" AddModule "festival" "sd_festival" "festival.conf" diff -urNad speech-dispatcher~/doc/speech-dispatcher.texi speech-dispatcher/doc/speech-dispatcher.texi --- speech-dispatcher~/doc/speech-dispatcher.texi 2008-08-04 21:26:29.000000000 +0200 +++ speech-dispatcher/doc/speech-dispatcher.texi 2008-10-24 19:50:05.000000000 +0200 @@ -807,8 +807,8 @@ @item Check the appropriate logfile in -(a)file{~/.speech-dispatcher/logs/speechd.log} for user Speech -Dispatcher or in @file{/var/log/speech-dispatcher/speechd.log}. Look +(a)file{~/.speech-dispatcher/logs/speech-dispatcher.log} for user Speech +Dispatcher or in @file{/var/log/speech-dispatcher/speech-dispatcher.log}. Look for lines containing the string 'ERROR' and their surrounding contents. If you hear no speech, restart Speech Dispatcher and look near the end of the log file -- before any attempts for synthesis of diff -urNad speech-dispatcher~/src/server/options.c speech-dispatcher/src/server/options.c --- speech-dispatcher~/src/server/options.c 2008-07-10 17:35:56.000000000 +0200 +++ speech-dispatcher/src/server/options.c 2008-10-24 19:50:16.000000000 +0200 @@ -139,7 +139,7 @@ exit(1); } - debug_logfile_path = g_strdup_printf("%s/speechd.log", + debug_logfile_path = g_strdup_printf("%s/speech-dispatcher.log", SpeechdOptions.debug_destination); /* Open logfile for writing */ debug_logfile = fopen(debug_logfile_path, "wx"); diff -urNad speech-dispatcher~/src/server/set.c speech-dispatcher/src/server/set.c --- speech-dispatcher~/src/server/set.c 2008-07-01 11:00:32.000000000 +0200 +++ speech-dispatcher/src/server/set.c 2008-10-24 19:50:03.000000000 +0200 @@ -380,7 +380,7 @@ if (!SpeechdOptions.debug && !debug) return 1; if (debug){ - debug_logfile_path = g_strdup_printf("%s/speechd.log", SpeechdOptions.debug_destination); + debug_logfile_path = g_strdup_printf("%s/speech-dispatcher.log", SpeechdOptions.debug_destination); debug_logfile = fopen(debug_logfile_path, "w"); if (debug_logfile == NULL){ diff -urNad speech-dispatcher~/src/server/speechd.c speech-dispatcher/src/server/speechd.c --- speech-dispatcher~/src/server/speechd.c 2008-07-10 17:36:49.000000000 +0200 +++ speech-dispatcher/src/server/speechd.c 2008-10-24 19:49:59.000000000 +0200 @@ -714,7 +714,7 @@ void logging_init(void) { - char *file_name = g_strdup_printf("%s/speechd.log", SpeechdOptions.log_dir); + char *file_name = g_strdup_printf("%s/speech-dispatcher.log", SpeechdOptions.log_dir); assert(file_name != NULL); if (!strncmp(file_name,"stdout",6)){ logfile = stdout; ++++++ speech-dispatcher_python-makefile.patch ++++++ #! /bin/sh /usr/share/dpatch/dpatch-run ## 02_python-makefile.dpatch by <pdm(a)debian.org> ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Don't compile Python files. Fix path settings. @DPATCH@ diff -urNad speech-dispatcher~/src/python/Makefile.in speech-dispatcher/src/python/Makefile.in --- speech-dispatcher~/src/python/Makefile.in 2009-11-02 14:02:46.000000000 +0100 +++ speech-dispatcher/src/python/Makefile.in 2009-11-02 14:03:26.000000000 +0100 @@ -13,14 +13,14 @@ install: if test -x /usr/bin/python; then \ - ./setup.py install --prefix=${prefix}; \ + ./setup.py install --no-compile --prefix=${DESTDIR}${prefix}; \ else \ echo "Python not found, not installing speechd module nor spd-conf"; \ fi - cp speechd_config/test.wav @snddatadir@ + cp speechd_config/test.wav ${DESTDIR}@snddatadir@ uninstall: - rm -f @snddatadir@/test.wav + rm -f ${DESTDIR}@snddatadir@/test.wav clean: rm -f *.pyc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

1 0

commit alsa-firmware for openSUSE:Factory
by root＠hilbert.suse.de 22 Apr '10

22 Apr '10

Hello community, here is the log from the commit of package alsa-firmware for openSUSE:Factory checked in at Fri Apr 23 01:38:58 CEST 2010. -------- --- alsa-firmware/alsa-firmware.changes 2010-02-24 21:18:40.000000000 +0100 +++ /mounts/work_src_done/STABLE/alsa-firmware/alsa-firmware.changes 2010-04-19 11:02:58.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 19 11:00:52 CEST 2010 - tiwai(a)suse.de + +- updated to version 1.0.23: + * update asihpi firmware version 40304 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- alsa-firmware-1.0.20.tar.bz2 New: ---- alsa-firmware-1.0.23.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-firmware.spec ++++++ --- /var/tmp/diff_new_pack.tHxzf0/_old 2010-04-23 01:38:41.000000000 +0200 +++ /var/tmp/diff_new_pack.tHxzf0/_new 2010-04-23 01:38:41.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package alsa-firmware (Version 1.0.20) +# spec file for package alsa-firmware (Version 1.0.23) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: alsa-firmware -%define package_version 1.0.20 +%define package_version 1.0.23 Url: http://www.alsa-project.org/ Summary: Firmware Data Files for ALSA -Version: 1.0.20 -Release: 3 +Version: 1.0.23 +Release: 1 License: GPLv2+ Group: Hardware/Other AutoReqProv: on ++++++ alsa-firmware-1.0.20.tar.bz2 -> alsa-firmware-1.0.23.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-firmware-1.0.20/asihpi/Makefile.am new/alsa-firmware-1.0.23/asihpi/Makefile.am --- old/alsa-firmware-1.0.20/asihpi/Makefile.am 2009-05-06 09:13:03.000000000 +0200 +++ new/alsa-firmware-1.0.23/asihpi/Makefile.am 2010-04-16 13:11:07.000000000 +0200 @@ -2,7 +2,6 @@ dsp_files = \ dsp2400.bin\ - dsp4300.bin\ dsp5000.bin\ dsp6200.bin\ dsp6205.bin\ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-firmware-1.0.20/asihpi/Makefile.in new/alsa-firmware-1.0.23/asihpi/Makefile.in --- old/alsa-firmware-1.0.20/asihpi/Makefile.in 2009-05-06 09:19:09.000000000 +0200 +++ new/alsa-firmware-1.0.23/asihpi/Makefile.in 2010-04-16 13:21:20.000000000 +0200 @@ -145,7 +145,6 @@ MYNAME = asihpi dsp_files = \ dsp2400.bin\ - dsp4300.bin\ dsp5000.bin\ dsp6200.bin\ dsp6205.bin\ Files old/alsa-firmware-1.0.20/asihpi/dsp2400.bin and new/alsa-firmware-1.0.23/asihpi/dsp2400.bin differ Files old/alsa-firmware-1.0.20/asihpi/dsp4300.bin and new/alsa-firmware-1.0.23/asihpi/dsp4300.bin differ Files old/alsa-firmware-1.0.20/asihpi/dsp5000.bin and new/alsa-firmware-1.0.23/asihpi/dsp5000.bin differ Files old/alsa-firmware-1.0.20/asihpi/dsp6200.bin and new/alsa-firmware-1.0.23/asihpi/dsp6200.bin differ Files old/alsa-firmware-1.0.20/asihpi/dsp6205.bin and new/alsa-firmware-1.0.23/asihpi/dsp6205.bin differ Files old/alsa-firmware-1.0.20/asihpi/dsp6400.bin and new/alsa-firmware-1.0.23/asihpi/dsp6400.bin differ Files old/alsa-firmware-1.0.20/asihpi/dsp6600.bin and new/alsa-firmware-1.0.23/asihpi/dsp6600.bin differ Files old/alsa-firmware-1.0.20/asihpi/dsp8700.bin and new/alsa-firmware-1.0.23/asihpi/dsp8700.bin differ Files old/alsa-firmware-1.0.20/asihpi/dsp8900.bin and new/alsa-firmware-1.0.23/asihpi/dsp8900.bin differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-firmware-1.0.20/configure new/alsa-firmware-1.0.23/configure --- old/alsa-firmware-1.0.20/configure 2009-05-06 09:19:10.000000000 +0200 +++ new/alsa-firmware-1.0.23/configure 2010-04-16 13:21:21.000000000 +0200 @@ -1992,7 +1992,7 @@ # Define the identity of the package. PACKAGE=alsa-firmware - VERSION=1.0.20 + VERSION=1.0.23 cat >>confdefs.h <<_ACEOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alsa-firmware-1.0.20/configure.in new/alsa-firmware-1.0.23/configure.in --- old/alsa-firmware-1.0.20/configure.in 2009-05-06 09:13:03.000000000 +0200 +++ new/alsa-firmware-1.0.23/configure.in 2010-04-16 13:11:07.000000000 +0200 @@ -1,6 +1,6 @@ AC_PREREQ(2.53) AC_INIT(hdsploader/tobin.c) -AM_INIT_AUTOMAKE(alsa-firmware, 1.0.20) +AM_INIT_AUTOMAKE(alsa-firmware, 1.0.23) AC_PROG_CC AC_PROG_INSTALL AC_PROG_LN_S ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

1 0

commit alsa-tools for openSUSE:Factory
by root＠hilbert.suse.de 22 Apr '10

22 Apr '10

Hello community, here is the log from the commit of package alsa-tools for openSUSE:Factory checked in at Fri Apr 23 01:38:29 CEST 2010. -------- --- alsa-tools/alsa-tools.changes 2009-12-18 17:37:22.000000000 +0100 +++ /mounts/work_src_done/STABLE/alsa-tools/alsa-tools.changes 2010-04-19 11:15:15.000000000 +0200 @@ -1,0 +2,11 @@ +Mon Apr 19 11:11:23 CEST 2010 - tiwai(a)suse.de + +- enabled hwmixvolme, using pyalsa and python-gtk + +------------------------------------------------------------------- +Mon Apr 19 10:43:14 CEST 2010 - tiwai(a)suse.de + +- updated to version 1.0.23: + * added hwmixvolume + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- alsa-tools-1.0.22.tar.bz2 New: ---- alsa-tools-1.0.23.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-tools.spec ++++++ --- /var/tmp/diff_new_pack.YgKJgb/_old 2010-04-23 01:38:22.000000000 +0200 +++ /var/tmp/diff_new_pack.YgKJgb/_new 2010-04-23 01:38:22.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package alsa-tools (Version 1.0.22) +# spec file for package alsa-tools (Version 1.0.23) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,10 +20,10 @@ Name: alsa-tools BuildRequires: alsa-devel fdupes fltk-devel gcc-c++ gtk2-devel update-desktop-files -%define package_version 1.0.22 +%define package_version 1.0.23 Url: http://www.alsa-project.org/ Summary: Various ALSA Tools -Version: 1.0.22 +Version: 1.0.23 Release: 1 License: GPLv2+ Group: Productivity/Multimedia/Sound/Utilities @@ -55,6 +55,7 @@ Summary: Various ALSA Tools with GUI Group: Productivity/Multimedia/Sound/Utilities License: GPLv2+ +Requires: pyalsa, python-gtk %description gui Various tools for ALSA with GUI for controlling the configuration and @@ -98,7 +99,7 @@ for d in envy24control rmedigicontrol echomixer; do cp $d/configure.in-gtk2 $d/configure.in done -ALL_PACKS="envy24control seq/sbiload sscape_ctl hdspconf hdsploader hdspmixer rmedigicontrol echomixer usx2yloader us428control as10k1 ld10k1" +ALL_PACKS="envy24control seq/sbiload sscape_ctl hdspconf hdsploader hdspmixer rmedigicontrol echomixer usx2yloader us428control as10k1 ld10k1 hwmixvolume" %ifnarch ppc ppc64 ALL_PACKS="$ALL_PACKS sb16_csp" %endif @@ -116,7 +117,7 @@ make -C as10k1/examples dsp %install -ALL_PACKS="envy24control seq/sbiload sscape_ctl hdspconf hdsploader hdspmixer rmedigicontrol echomixer usx2yloader us428control as10k1 ld10k1" +ALL_PACKS="envy24control seq/sbiload sscape_ctl hdspconf hdsploader hdspmixer rmedigicontrol echomixer usx2yloader us428control as10k1 ld10k1 hwmixvolume" %ifnarch ppc ppc64 ALL_PACKS="$ALL_PACKS sb16_csp" %endif @@ -201,6 +202,7 @@ %{_bindir}/hdspconf %{_bindir}/hdspmixer %{_bindir}/echomixer +%{_bindir}/hwmixvolume %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/* ++++++ alsa-tools-1.0.22.tar.bz2 -> alsa-tools-1.0.23.tar.bz2 ++++++ ++++ 5414 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-tools-1.0.22/Makefile new/alsa-tools-1.0.23/Makefile --- old/alsa-tools-1.0.22/Makefile 2009-12-16 16:30:46.000000000 +0100 +++ new/alsa-tools-1.0.23/Makefile 2010-04-16 13:21:16.000000000 +0200 @@ -1,8 +1,9 @@ -VERSION = 1.0.22 +VERSION = 1.0.23 TOP = . SUBDIRS = ac3dec as10k1 envy24control hdsploader hdspconf hdspmixer \ mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \ - us428control usx2yloader vxloader echomixer ld10k1 qlo10k1 + us428control usx2yloader vxloader echomixer ld10k1 qlo10k1 \ + hwmixvolume all: @for i in $(SUBDIRS); do \ 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-tools-1.0.22/hwmixvolume/Makefile.am new/alsa-tools-1.0.23/hwmixvolume/Makefile.am --- old/alsa-tools-1.0.22/hwmixvolume/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-tools-1.0.23/hwmixvolume/Makefile.am 2010-04-16 13:11:09.000000000 +0200 @@ -0,0 +1,11 @@ +# # Process this file with automake to procude Makefile.in. +bin_SCRIPTS = hwmixvolume +#man_MANS = +EXTRA_DIST = gitcompile hwmixvolume +AUTOMAKE_OPTIONS = foreign + +alsa-dist: distdir + @rm -rf ../distdir/hwmixvolume + @mkdir -p ../distdir/hwmixvolume + @cp -RLpv $(distdir)/* ../distdir/hwmixvolume + @rm -rf $(distdir) 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-tools-1.0.22/hwmixvolume/README new/alsa-tools-1.0.23/hwmixvolume/README --- old/alsa-tools-1.0.22/hwmixvolume/README 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-tools-1.0.23/hwmixvolume/README 2010-04-16 13:11:09.000000000 +0200 @@ -0,0 +1,17 @@ +hwmixvolume +=========== + +This tool allows you to control the volume of individual streams on sound cards +that use hardware mixing, i.e., those based on the following chips: +* Creative Emu10k1 (SoundBlaster Live!) (driver: snd-emu10k1) +* VIA VT823x southbridge (driver: snd-via82xx) +* Yamaha DS-1 (YMF-724/740/744/754) (driver: snd-ymfpci) + + +This tool requires Python, pygtk, and alsa-pyton 1.0.22 or later. + +It is recommended to use at least Linux kernel 2.6.32 or alsa-driver 1.0.22; +otherwise, the name of the program that is using a stream cannot be shown. + + +Author: Clemens Ladisch <clemens(a)ladisch.de> 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-tools-1.0.22/hwmixvolume/configure.ac new/alsa-tools-1.0.23/hwmixvolume/configure.ac --- old/alsa-tools-1.0.22/hwmixvolume/configure.ac 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-tools-1.0.23/hwmixvolume/configure.ac 2010-04-16 13:11:09.000000000 +0200 @@ -0,0 +1,6 @@ +dnl Process this file with autoconf to produce a configure script. +AC_INIT([hwmixvolume], [0.9]) +AM_INIT_AUTOMAKE +AC_CONFIG_SRCDIR([hwmixvolume]) +AC_PROG_INSTALL +AC_OUTPUT([Makefile]) 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-tools-1.0.22/hwmixvolume/gitcompile new/alsa-tools-1.0.23/hwmixvolume/gitcompile --- old/alsa-tools-1.0.22/hwmixvolume/gitcompile 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-tools-1.0.23/hwmixvolume/gitcompile 2010-04-16 13:11:09.000000000 +0200 @@ -0,0 +1,26 @@ +#!/bin/bash + +if test -z "$AUTOMAKE_DIR" ; then + if test -d /usr/local/share/automake; then + AUTOMAKE_DIR=/usr/local/share/automake + fi + if test -d /usr/share/automake; then + AUTOMAKE_DIR="/usr/share/automake" + fi + if test -z "$AUTOMAKE_DIR" ; then + AUTOMAKE_DIR=/usr/share/`ls /usr/share | grep automake | tail -n 1` + fi +fi + +for f in install-sh mkinstalldirs missing; do + cp -av $AUTOMAKE_DIR/$f . || exit 1 +done + +aclocal $ACLOCAL_FLAGS || exit 1 +automake --foreign --add-missing || exit 1 +autoconf || exit 1 +echo "./configure $@" +./configure $@ || exit 1 +if [ -z "$GITCOMPILE_NO_MAKE" ]; then + make || exit 1 +fi 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-tools-1.0.22/hwmixvolume/hwmixvolume new/alsa-tools-1.0.23/hwmixvolume/hwmixvolume --- old/alsa-tools-1.0.22/hwmixvolume/hwmixvolume 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-tools-1.0.23/hwmixvolume/hwmixvolume 2010-04-16 13:11:09.000000000 +0200 @@ -0,0 +1,310 @@ +#!/usr/bin/env python + +# hwmixvolume - ALSA hardware mixer volume control applet +# Copyright (c) 2009-2010 Clemens Ladisch +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, +# 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. + +import gobject, gtk +from pyalsa import alsacard, alsahcontrol + +INTF_PCM = alsahcontrol.interface_id['PCM'] +INTF_MIXER = alsahcontrol.interface_id['MIXER'] +TYPE_INTEGER = alsahcontrol.element_type['INTEGER'] +EVENT_VALUE = alsahcontrol.event_mask['VALUE'] +EVENT_INFO = alsahcontrol.event_mask['INFO'] +EVENT_REMOVE = alsahcontrol.event_mask_remove + +class Stream: + def __init__(self, element, parent): + self.element = element + self.element.set_callback(self) + self.parent = parent + self.label = None + self.scales = [] + self.adjustments = [] + self.callback(self.element, EVENT_INFO) + + def destroy(self): + self.deactivate() + + def callback(self, e, mask): + if mask == EVENT_REMOVE: + self.deactivate() + elif (mask & EVENT_INFO) != 0: + info = alsahcontrol.Info(self.element) + if info.is_inactive: + self.deactivate() + else: + self.activate() + elif (mask & EVENT_VALUE) != 0: + self.update_scales_from_ctl() + + def activate(self): + if self.label: + return + info = alsahcontrol.Info(self.element) + value = alsahcontrol.Value(self.element) + value.read() + values = value.get_tuple(TYPE_INTEGER, info.count) + self.label = gtk.Label(self.get_label(info)) + self.label.set_single_line_mode(True) + self.parent.scales_vbox.pack_start(self.label, expand=False) + for i in range(info.count): + adj = gtk.Adjustment(value=values[i], + lower=info.min, upper=info.max, + step_incr=1, + page_incr=(info.max-info.min+1)/8) + adj.connect('value-changed', self.update_ctl_from_scale, i) + scale = gtk.HScale(adj) + scale.set_draw_value(False) + self.parent.scales_vbox.pack_start(scale, expand=False) + self.scales.append(scale) + self.adjustments.append(adj) + self.parent.scales_vbox.show_all() + self.parent.update_msg_label() + + def deactivate(self): + if not self.label: + return + self.label.destroy() + for s in self.scales: + s.destroy() + self.label = None + self.scales = [] + self.adjustments = [] + self.parent.update_msg_label() + + def update_scales_from_ctl(self): + if not self.label: + return + count = len(self.adjustments) + value = alsahcontrol.Value(self.element) + value.read() + values = value.get_tuple(TYPE_INTEGER, count) + for i in range(count): + self.adjustments[i].set_value(values[i]) + + def update_ctl_from_scale(self, adj, index): + scale_value = adj.get_value() + value_to_set = int(round(adj.get_value())) + count = len(self.adjustments) + value = alsahcontrol.Value(self.element) + if self.parent.lock_check.get_active(): + values = [value_to_set for i in range(count)] + else: + value.read() + values = value.get_array(TYPE_INTEGER, count) + values[index] = value_to_set + value.set_array(TYPE_INTEGER, values) + value.write() + if value_to_set != scale_value: + adj.set_value(value_to_set) + + def get_label(self, info): + pid = self.get_pid(info) + if pid: + cmdline = self.get_pid_cmdline(pid) + if cmdline: + return cmdline + else: + return "PID %d" % pid + else: + name = info.name + if name[-7:] == " Volume": + name = name[:-7] + if name[-9:] == " Playback": + name = name[:-9] + return name + + def get_pid(self, info): + card = self.parent.current_card + device = info.device + subdevice = info.subdevice + if subdevice == 0: + subdevice = info.index + filename = "/proc/asound/card%d/pcm%dp/sub%d/status" % (card, device, subdevice) + try: + f = open(filename, "r") + except IOError: + return None + try: + for line in f.readlines(): + if line[:9] == "owner_pid": + return int(line.split(':')[1].strip()) + finally: + f.close() + return None + + def get_pid_cmdline(self, pid): + try: + f = open("/proc/%d/cmdline" % pid, "r") + except IOError: + return None + try: + cmdline = f.read() + finally: + f.close() + return cmdline.replace('\x00', ' ').strip() + +class MixerWindow(gtk.Window): + card_numbers = alsacard.card_list() + current_card = -1 + hcontrol = None + scales_vbox = None + msg_label = None + streams = [] + hctl_sources = [] + + def __init__(self): + gtk.Window.__init__(self) + self.connect('destroy', lambda w: gtk.main_quit()) + self.set_title("Hardware Mixer Volumes") + + vbox = gtk.VBox() + self.add(vbox) + + hbox = gtk.HBox() + vbox.pack_start(hbox, expand=False) + + label = gtk.Label("_Sound Card: ") + label.set_use_underline(True) + hbox.pack_start(label, expand=False) + + combo = gtk.combo_box_new_text() + for i in self.card_numbers: + str = "%d: %s" % (i, alsacard.card_get_name(i)) + combo.append_text(str) + if len(self.card_numbers) > 0: + combo.set_active(0) + combo.connect('changed', lambda c: self.change_card(self.card_numbers[combo.get_active()])) + hbox.pack_start(combo) + label.set_mnemonic_widget(combo) + + self.lock_check = gtk.CheckButton(label="_Lock Channels") + self.lock_check.set_active(True) + vbox.pack_start(self.lock_check, expand=False) + + scrollwin = gtk.ScrolledWindow() + scrollwin.set_policy(hscrollbar_policy=gtk.POLICY_NEVER, vscrollbar_policy=gtk.POLICY_AUTOMATIC) + scrollwin.set_shadow_type(gtk.SHADOW_NONE) + vbox.pack_start(scrollwin) + + self.scales_vbox = gtk.VBox() + scrollwin.add_with_viewport(self.scales_vbox) + + label = gtk.Label() + label.set_single_line_mode(True) + line_height = label.size_request()[1] + label.destroy() + scale = gtk.HScale() + scale.set_draw_value(False) + line_height += scale.size_request()[1] + scale.destroy() + # always have space for at least four sliders + scrollwin.set_size_request(width=-1, height=line_height*4+4) + + # TODO: select the default card or the first card with stream controls + if len(self.card_numbers) > 0: + self.change_card(self.card_numbers[0]) + self.update_msg_label() + + self.show_all() + + def change_card(self, cardnum): + for s in self.hctl_sources: + gobject.source_remove(s) + self.hctl_sources = [] + + self.hcontrol = self.open_hcontrol_for_card(cardnum) + + for s in self.streams: + s.destroy() + self.streams = [] + + self.current_card = cardnum + + if not self.hcontrol: + self.update_msg_label() + return + + for id in self.hcontrol.list(): + if not self.is_stream_elem(id): + continue + elem = alsahcontrol.Element(self.hcontrol, id[0]) + info = alsahcontrol.Info(elem) + if not self.is_stream_info(info): + continue + stream = Stream(elem, self) + self.streams.append(stream) + + for fd,condition in self.hcontrol.poll_fds: + self.hctl_sources.append(gobject.io_add_watch(fd, condition, self.hctl_io_callback)) + + self.update_msg_label() + + self.scales_vbox.show_all() + + def update_msg_label(self): + needs_msg = len(self.scales_vbox.get_children()) < 2 + has_msg = self.msg_label + if has_msg and not needs_msg: + self.msg_label.destroy() + self.msg_label = None + elif needs_msg: + if len(self.streams) > 0: + msg = "There are no open streams." + else: + msg = "This card does not have stream controls." + if not has_msg: + self.msg_label = gtk.Label(msg) + self.scales_vbox.pack_start(self.msg_label) + self.scales_vbox.show_all() + elif self.msg_label.get_text() != msg: + self.msg_label.set_text(msg) + + def open_hcontrol_for_card(self, cardnum): + devname = "hw:CARD=" + str(cardnum) + try: + hc = alsahcontrol.HControl(name=devname, + mode=alsahcontrol.open_mode['NONBLOCK']) + except: + # TODO: alsa error msg + dlg = gtk.MessageDialog(self, + gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, + gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, + "Cannot open sound card control device.") + dlg.run() + dlg.destroy() + return None + return hc + + def is_stream_elem(self, id): + return ((id[1] == INTF_PCM and + id[4] in ("PCM Playback Volume", "EMU10K1 PCM Volume")) or + (id[1] == INTF_MIXER and + id[4] == "VIA DXS Playback Volume")) + + def is_stream_info(self, info): + return info.is_readable and info.is_writable and info.type == TYPE_INTEGER + + def hctl_io_callback(self, source, condition): + self.hcontrol.handle_events() + return True + +def main(): + MixerWindow() + gtk.main() + +main() + 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-tools-1.0.22/hwmixvolume/missing new/alsa-tools-1.0.23/hwmixvolume/missing --- old/alsa-tools-1.0.22/hwmixvolume/missing 1970-01-01 01:00:00.000000000 +0100 +++ new/alsa-tools-1.0.23/hwmixvolume/missing 2006-11-25 12:29:49.000000000 +0100 @@ -0,0 +1,360 @@ +#! /bin/sh +# Common stub for a few missing GNU programs while installing. + +scriptversion=2005-06-08.21 + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +if test $# -eq 0; then + echo 1>&2 "Try \`$0 --help' for more information" + exit 1 +fi + +run=: + +# In the cases where this matters, `missing' is being run in the +# srcdir already. +if test -f configure.ac; then + configure_ac=configure.ac +else + configure_ac=configure.in +fi + +msg="missing on your system" + +case "$1" in +--run) + # Try to run requested program, and just exit if it succeeds. + run= + shift + "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi + ;; + + -h|--h|--he|--hel|--help) + echo "\ +$0 [OPTION]... PROGRAM [ARGUMENT]... + +Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an +error status if there is no known handling for PROGRAM. + +Options: + -h, --help display this help and exit + -v, --version output version information and exit + --run try to run the given command, and emulate it if it fails + +Supported PROGRAM values: + aclocal touch file \`aclocal.m4' + autoconf touch file \`configure' + autoheader touch file \`config.h.in' + automake touch all \`Makefile.in' files + bison create \`y.tab.[ch]', if possible, from existing .[ch] + flex create \`lex.yy.c', if possible, from existing .c + help2man touch the output file + lex create \`lex.yy.c', if possible, from existing .c + makeinfo touch the output file + tar try tar, gnutar, gtar, then tar without non-portable flags + yacc create \`y.tab.[ch]', if possible, from existing .[ch] + +Send bug reports to <bug-automake(a)gnu.org>." + exit $? + ;; + + -v|--v|--ve|--ver|--vers|--versi|--versio|--version) + echo "missing $scriptversion (GNU Automake)" + exit $? + ;; + + -*) + echo 1>&2 "$0: Unknown \`$1' option" + echo 1>&2 "Try \`$0 --help' for more information" + exit 1 + ;; + +esac + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). +case "$1" in + lex|yacc) + # Not GNU programs, they don't have --version. + ;; + + tar) + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 + fi + ;; +esac + +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case "$1" in + aclocal*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`acinclude.m4' or \`${configure_ac}'. You might want + to install the \`Automake' and \`Perl' packages. Grab them from + any GNU archive site." + touch aclocal.m4 + ;; + + autoconf) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`${configure_ac}'. You might want to install the + \`Autoconf' and \`GNU m4' packages. Grab them from any GNU + archive site." + touch configure + ;; + + autoheader) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`acconfig.h' or \`${configure_ac}'. You might want + to install the \`Autoconf' and \`GNU m4' packages. Grab them + from any GNU archive site." + files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER($[^)]*$).*/\1/p' ${configure_ac}` + test -z "$files" && files="config.h" + touch_files= + for f in $files; do + case "$f" in + *:*) touch_files="$touch_files "`echo "$f" | + sed -e 's/^[^:]*://' -e 's/:.*//'`;; + *) touch_files="$touch_files $f.in";; + esac + done + touch $touch_files + ;; + + automake*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. + You might want to install the \`Automake' and \`Perl' packages. + Grab them from any GNU archive site." + find . -type f -name Makefile.am -print | + sed 's/\.am$/.in/' | + while read f; do touch "$f"; done + ;; + + autom4te) + echo 1>&2 "\ +WARNING: \`$1' is needed, but is $msg. + You might have modified some files without having the + proper tools for further handling them. + You can get \`$1' as part of \`Autoconf' from any GNU + archive site." + + file=`echo "$*" | sed -n 's/.*--output[ =]*$[^ ]*$.*/\1/p'` + test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*$[^ ]*$.*/\1/p'` + if test -f "$file"; then + touch $file + else + test -z "$file" || exec >$file + echo "#! /bin/sh" + echo "# Created by GNU Automake missing as a replacement of" + echo "# $ $@" + echo "exit 0" + chmod +x $file + exit 1 + fi + ;; + + bison|yacc) + echo 1>&2 "\ +WARNING: \`$1' $msg. You should only need it if + you modified a \`.y' file. You may need the \`Bison' package + in order for those modifications to take effect. You can get + \`Bison' from any GNU archive site." + rm -f y.tab.c y.tab.h + if [ $# -ne 1 ]; then + eval LASTARG="\${$#}" + case "$LASTARG" in + *.y) + SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` + if [ -f "$SRCFILE" ]; then + cp "$SRCFILE" y.tab.c + fi + SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` + if [ -f "$SRCFILE" ]; then + cp "$SRCFILE" y.tab.h + fi + ;; + esac + fi + if [ ! -f y.tab.h ]; then + echo >y.tab.h + fi + if [ ! -f y.tab.c ]; then + echo 'main() { return 0; }' >y.tab.c + fi + ;; + + lex|flex) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified a \`.l' file. You may need the \`Flex' package + in order for those modifications to take effect. You can get + \`Flex' from any GNU archive site." + rm -f lex.yy.c + if [ $# -ne 1 ]; then + eval LASTARG="\${$#}" + case "$LASTARG" in + *.l) + SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` + if [ -f "$SRCFILE" ]; then + cp "$SRCFILE" lex.yy.c + fi + ;; + esac + fi + if [ ! -f lex.yy.c ]; then + echo 'main() { return 0; }' >lex.yy.c + fi + ;; + + help2man) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified a dependency of a manual page. You may need the + \`Help2man' package in order for those modifications to take + effect. You can get \`Help2man' from any GNU archive site." + + file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` + if test -z "$file"; then + file=`echo "$*" | sed -n 's/.*--output=$[^ ]*$.*/\1/p'` + fi + if [ -f "$file" ]; then + touch $file + else + test -z "$file" || exec >$file + echo ".ab help2man is required to generate this page" + exit 1 + fi + ;; + + makeinfo) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified a \`.texi' or \`.texinfo' file, or any other file + indirectly affecting the aspect of the manual. The spurious + call might also be the consequence of using a buggy \`make' (AIX, + DU, IRIX). You might want to install the \`Texinfo' package or + the \`GNU make' package. Grab either from any GNU archive site." + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` + if test -z "$file"; then + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` + file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 + touch $file + ;; + + tar) + shift + + # We have already tried tar in the generic part. + # Look for gnutar/gtar before invocation to avoid ugly error + # messages. + if (gnutar --version > /dev/null 2>&1); then + gnutar "$@" && exit 0 + fi + if (gtar --version > /dev/null 2>&1); then + gtar "$@" && exit 0 + fi + firstarg="$1" + if shift; then + case "$firstarg" in + *o*) + firstarg=`echo "$firstarg" | sed s/o//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + case "$firstarg" in + *h*) + firstarg=`echo "$firstarg" | sed s/h//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + fi + + echo 1>&2 "\ +WARNING: I can't seem to be able to run \`tar' with the given arguments. + You may want to install GNU tar or Free paxutils, or check the + command line arguments." + exit 1 + ;; + + *) + echo 1>&2 "\ +WARNING: \`$1' is needed, and is $msg. + You might have modified some files without having the + proper tools for further handling them. Check the \`README' file, + it often tells you about the needed prerequisites for installing + this package. You may also peek at any GNU archive site, in case + some other package would contain this missing \`$1' program." + exit 1 + ;; +esac + +exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

1 0

commit libvdpau for openSUSE:Factory
by root＠hilbert.suse.de 22 Apr '10

22 Apr '10

Hello community, here is the log from the commit of package libvdpau for openSUSE:Factory checked in at Fri Apr 23 01:37:08 CEST 2010. -------- --- libvdpau/libvdpau.changes 2010-04-22 02:34:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/libvdpau/libvdpau.changes 2010-04-23 00:34:56.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Apr 22 22:34:09 UTC 2010 - herbert(a)graeber-clan.de + +- put libvdpau_trace into it's own package + +------------------------------------------------------------------- +Thu Apr 22 18:11:59 UTC 2010 - herbert(a)graeber-clan.de + +- follow Shared Library Packaging Policy +- obsolete packman vdpau packages for proper update + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvdpau.spec ++++++ --- /var/tmp/diff_new_pack.avIBOO/_old 2010-04-23 01:36:25.000000000 +0200 +++ /var/tmp/diff_new_pack.avIBOO/_new 2010-04-23 01:36:25.000000000 +0200 @@ -19,9 +19,9 @@ Name: libvdpau Version: 0.4 -Release: 1 +Release: 2 License: MIT License (or similar) -Summary: libvdpau wrapper and libvdpau_trace debugging library +Summary: VDPAU wrapper and trace libraries Url: http://people.freedesktop.org/~aplattner Group: System/Libraries Source: %{name}-%{version}.tar.gz @@ -37,14 +37,43 @@ implementation library. Currently, this is always libvdpau_nvidia. You can override the driver name by setting the VDPAU_DRIVER environment variable. +%package -n libvdpau1 +License: MIT License (or similar) +Summary: VDPAU wrapper library +Group: System/Libraries +Provides: libvdpau = %{version}-%{release} +Obsoletes: libvdpau < %{version}-%{release} + +%description -n libvdpau1 +This package contains the libvdpau wrapper library and the libvdpau_trace +debugging library, along with the header files needed to build VDPAU +applications. To actually use a VDPAU device, you need a vendor-specific +implementation library. Currently, this is always libvdpau_nvidia. You can +override the driver name by setting the VDPAU_DRIVER environment variable. + %package -n libvdpau-devel License: MIT License (or similar) -Summary: libvdpau wrapper and libvdpau_trace debugging library - development files +Summary: VDPAU wrapper development files Group: Development/Libraries/X11 -Requires: libvdpau = %{version} +Requires: libvdpau1 = %{version} %description -n libvdpau-devel -Development files for libvdpau wrapper and libvdpau_trace debugging library. +Note that this package only contains the VDPAU headers that are required to +build applications. At runtime, the shared libraries are needed too and may +be installed using the proprietary nVidia driver packages. + +%package -n libvdpau_trace1 +License: MIT License (or similar) +Summary: VDPAU trace library +Group: Development/Libraries/X11 +Requires: libvdpau1 = %{version} +Provides: libvdpau_trace = %{version}-%{release} +Obsoletes: libvdpau_trace < %{version}-%{release} + +%description -n libvdpau_trace1 +This package provides a fallback, fake VDPAU implementation for runtime, which +is used when no proper VDPAU implementation library is available (such as +libvdpau_nvidia.so) %prep %setup -q @@ -58,16 +87,16 @@ rm %{buildroot}%{_libdir}/libvdpau.la rm %{buildroot}%{_libdir}/vdpau/libvdpau_trace.la /sbin/ldconfig -n $RPM_BUILD_ROOT/%{_libdir}/vdpau +rm %{buildroot}%{_libdir}/vdpau/libvdpau_trace.so -%post -n libvdpau -p /sbin/ldconfig +%post -n libvdpau1 -p /sbin/ldconfig -%postun -n libvdpau -p /sbin/ldconfig +%postun -n libvdpau1 -p /sbin/ldconfig -%files -n libvdpau +%files -n libvdpau1 %defattr(-,root,root) %dir %{_libdir}/vdpau %{_libdir}/libvdpau.so.* -%{_libdir}/vdpau/*.so.* %files -n libvdpau-devel %defattr(-,root,root) @@ -75,7 +104,10 @@ %dir %{_libdir}/vdpau %{_includedir}/vdpau %{_libdir}/libvdpau.so -%{_libdir}/vdpau/*.so %{_libdir}/pkgconfig/vdpau.pc +%files -n libvdpau_trace1 +%defattr(-,root,root) +%{_libdir}/vdpau/libvdpau_trace.so.* + %changelog ++++++ rpmlintrc ++++++ # dir isn't version, but it's contents is addFilter("shlib-policy-nonversioned-dir") addFilter("no-dependency-on") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

1 0

commit pound for openSUSE:Factory
by root＠hilbert.suse.de 22 Apr '10

22 Apr '10

Hello community, here is the log from the commit of package pound for openSUSE:Factory checked in at Fri Apr 23 01:36:01 CEST 2010. -------- --- pound/pound.changes 2009-08-06 11:49:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/pound/pound.changes 2010-04-22 17:41:20.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 22 17:40:20 CEST 2010 - meissner(a)suse.de + +- fixed openssl 1.0 build with patch from redhat. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- pound-2.5-openssl.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pound.spec ++++++ --- /var/tmp/diff_new_pack.WJNdIq/_old 2010-04-23 01:35:54.000000000 +0200 +++ /var/tmp/diff_new_pack.WJNdIq/_new 2010-04-23 01:35:54.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package pound (Version 2.4.5) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,16 +20,17 @@ Name: pound BuildRequires: openssl-devel -License: GPL v3 or later ; Other uncritical OpenSource License ; MIT License (or similar) +License: GPLv3+ ; Other uncritical OpenSource License ; MIT License (or similar) Group: Productivity/Networking/Web/Proxy Summary: Reverse-Proxy and Load-Balancer Url: http://www.apsis.ch/pound/ Version: 2.4.5 -Release: 1 +Release: 2 Source0: Pound-%version.tar.bz2 Source1: pound.cfg Source2: init.pound Patch: pound.diff +Patch1: pound-2.5-openssl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: pwdutils %insserv_prereq @@ -46,7 +47,7 @@ Robert Segall <roseg(a)apsis.ch> %package doc -License: GPL v2 or later ; Other uncritical OpenSource License ; MIT License (or similar) +License: GPLv2+ ; Other uncritical OpenSource License ; MIT License (or similar) Summary: Doumentation for pound Group: Documentation/Other @@ -67,6 +68,7 @@ %prep %setup -q -n Pound-%version %patch +%patch1 -p1 %build %configure \ ++++++ pound-2.5-openssl.patch ++++++ Index: Pound-2.4.5/config.c =================================================================== --- Pound-2.4.5.orig/config.c +++ Pound-2.4.5/config.c @@ -379,14 +379,22 @@ t_hash(const TABNODE *e) res = (res ^ *k++) * 16777619; return res; } +#if OPENSSL_VERSION_NUMBER >= 0x10000000L +static IMPLEMENT_LHASH_HASH_FN(t, TABNODE) +#else static IMPLEMENT_LHASH_HASH_FN(t_hash, const TABNODE *) +#endif static int t_cmp(const TABNODE *d1, const TABNODE *d2) { return strcmp(d1->key, d2->key); } +#if OPENSSL_VERSION_NUMBER >= 0x10000000L +static IMPLEMENT_LHASH_COMP_FN(t, TABNODE) +#else static IMPLEMENT_LHASH_COMP_FN(t_cmp, const TABNODE *) +#endif /* * parse a service @@ -409,7 +417,11 @@ parse_service(FILE *const f_conf, const pthread_mutex_init(&res->mut, NULL); if(svc_name) strncpy(res->name, svc_name, KEY_SIZE); +#if OPENSSL_VERSION_NUMBER >= 0x10000000L + if((res->sessions = LHM_lh_new(TABNODE, t)) == NULL) { +#else if((res->sessions = lh_new(LHASH_HASH_FN(t_hash), LHASH_COMP_FN(t_cmp))) == NULL) { +#endif logmsg(LOG_ERR, "line %d: lh_new failed - aborted", n_lin); exit(1); } Index: Pound-2.4.5/pound.h =================================================================== --- Pound-2.4.5.orig/pound.h +++ Pound-2.4.5/pound.h @@ -317,6 +317,10 @@ typedef struct _tn { /* maximal session key size */ #define KEY_SIZE 127 +#if OPENSSL_VERSION_NUMBER >= 0x10000000L +DECLARE_LHASH_OF(TABNODE); +#endif + /* service definition */ typedef struct _service { char name[KEY_SIZE + 1]; /* symbolic name */ @@ -332,7 +336,7 @@ typedef struct _service { int sess_ttl; /* session time-to-live */ regex_t sess_pat; /* pattern to match the session data */ char *sess_parm; /* session cookie or parameter */ - LHASH *sessions; /* currently active sessions */ + LHASH_OF(TABNODE) *sessions; /* currently active sessions */ int dynscale; /* true if the back-ends should be dynamically rescaled */ int disabled; /* true if the service is disabled */ struct _service *next; Index: Pound-2.4.5/svc.c =================================================================== --- Pound-2.4.5.orig/svc.c +++ Pound-2.4.5/svc.c @@ -28,12 +28,17 @@ #include "pound.h" +#ifndef LHASH_OF +#define LHASH_OF(x) LHASH +#define CHECKED_LHASH_OF(type, h) h +#endif + /* * Add a new key/content pair to a hash table * the table should be already locked */ static void -t_add(LHASH *const tab, const char *key, const void *content, const size_t cont_len) +t_add(LHASH_OF(TABNODE) *const tab, const char *key, const void *content, const size_t cont_len) { TABNODE *t, *old; @@ -54,7 +59,11 @@ t_add(LHASH *const tab, const char *key, } memcpy(t->content, content, cont_len); t->last_acc = time(NULL); +#if OPENSSL_VERSION_NUMBER >= 0x10000000L + if((old = LHM_lh_insert(TABNODE, tab, t)) != NULL) { +#else if((old = (TABNODE *)lh_insert(tab, t)) != NULL) { +#endif free(old->key); free(old->content); free(old); @@ -69,12 +78,16 @@ t_add(LHASH *const tab, const char *key, * side-effect: update the time of last access */ static void * -t_find(LHASH *const tab, char *const key) +t_find(LHASH_OF(TABNODE) *const tab, char *const key) { TABNODE t, *res; t.key = key; +#if OPENSSL_VERSION_NUMBER >= 0x10000000L + if((res = LHM_lh_retrieve(TABNODE, tab, &t)) != NULL) { +#else if((res = (TABNODE *)lh_retrieve(tab, &t)) != NULL) { +#endif res->last_acc = time(NULL); return res->content; } @@ -85,12 +98,16 @@ t_find(LHASH *const tab, char *const key * Delete a key */ static void -t_remove(LHASH *const tab, char *const key) +t_remove(LHASH_OF(TABNODE) *const tab, char *const key) { TABNODE t, *res; t.key = key; +#if OPENSSL_VERSION_NUMBER >= 0x10000000L + if((res = LHM_lh_delete(TABNODE, tab, &t)) != NULL) { +#else if((res = (TABNODE *)lh_delete(tab, &t)) != NULL) { +#endif free(res->key); free(res->content); free(res); @@ -99,59 +116,75 @@ t_remove(LHASH *const tab, char *const k } typedef struct { - LHASH *tab; + LHASH_OF(TABNODE) *tab; time_t lim; void *content; int cont_len; } ALL_ARG; static void -t_old(TABNODE *t, void *arg) +t_old_doall_arg(TABNODE *t, ALL_ARG *a) { - ALL_ARG *a; - - a = (ALL_ARG *)arg; if(t->last_acc < a->lim) +#if OPENSSL_VERSION_NUMBER >= 0x10000000L + LHM_lh_delete(TABNODE, a->tab, t); +#else lh_delete(a->tab, t); +#endif return; } -IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE *, void *) +#if OPENSSL_VERSION_NUMBER >= 0x10000000L +IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE, ALL_ARG) +#else +#define t_old t_old_doall_arg +IMPLEMENT_LHASH_DOALL_ARG_FN(t_old, TABNODE *, ALL_ARG *) +#endif /* * Expire all old nodes */ static void -t_expire(LHASH *const tab, const time_t lim) +t_expire(LHASH_OF(TABNODE) *const tab, const time_t lim) { ALL_ARG a; int down_load; a.tab = tab; a.lim = lim; - down_load = tab->down_load; - tab->down_load = 0; + down_load = CHECKED_LHASH_OF(TABNODE, tab)->down_load; + CHECKED_LHASH_OF(TABNODE, tab)->down_load = 0; +#if OPENSSL_VERSION_NUMBER >= 0x10000000L + LHM_lh_doall_arg(TABNODE, tab, LHASH_DOALL_ARG_FN(t_old), ALL_ARG, &a); +#else lh_doall_arg(tab, LHASH_DOALL_ARG_FN(t_old), &a); - tab->down_load = down_load; +#endif + CHECKED_LHASH_OF(TABNODE, tab)->down_load = down_load; return; } static void -t_cont(TABNODE *t, void *arg) +t_cont_doall_arg(TABNODE *t, ALL_ARG *a) { - ALL_ARG *a; - - a = (ALL_ARG *)arg; if(memcmp(t->content, a->content, a->cont_len) == 0) +#if OPENSSL_VERSION_NUMBER >= 0x10000000L + LHM_lh_delete(TABNODE, a->tab, t); +#else lh_delete(a->tab, t); +#endif return; } -IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE *, void *) +#if OPENSSL_VERSION_NUMBER >= 0x10000000L +IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE, ALL_ARG) +#else +#define t_cont t_cont_doall_arg +IMPLEMENT_LHASH_DOALL_ARG_FN(t_cont, TABNODE *, ALL_ARG *) +#endif /* * Remove all nodes with the given content */ static void -t_clean(LHASH *const tab, void *const content, const size_t cont_len) +t_clean(LHASH_OF(TABNODE) *const tab, void *const content, const size_t cont_len) { ALL_ARG a; int down_load; @@ -159,10 +192,14 @@ t_clean(LHASH *const tab, void *const co a.tab = tab; a.content = content; a.cont_len = cont_len; - down_load = tab->down_load; - tab->down_load = 0; + down_load = CHECKED_LHASH_OF(TABNODE, tab)->down_load; + CHECKED_LHASH_OF(TABNODE, tab)->down_load = 0; +#if OPENSSL_VERSION_NUMBER >= 0x10000000L + LHM_lh_doall_arg(TABNODE, tab, LHASH_DOALL_ARG_FN(t_cont), ALL_ARG, &a); +#else lh_doall_arg(tab, LHASH_DOALL_ARG_FN(t_cont), &a); - tab->down_load = down_load; +#endif + CHECKED_LHASH_OF(TABNODE, tab)->down_load = down_load; return; } @@ -1385,13 +1422,11 @@ typedef struct { } DUMP_ARG; static void -t_dump(TABNODE *t, void *arg) +t_dump_doall_arg(TABNODE *t, DUMP_ARG *a) { - DUMP_ARG *a; BACKEND *be, *bep; int n_be, sz; - a = (DUMP_ARG *)arg; memcpy(&bep, t->content, sizeof(bep)); for(n_be = 0, be = a->backends; be; be = be->next, n_be++) if(be == bep) @@ -1407,19 +1442,28 @@ t_dump(TABNODE *t, void *arg) return; } -IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE *, void *) +#if OPENSSL_VERSION_NUMBER >= 0x10000000L +IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE, DUMP_ARG) +#else +#define t_dump t_dump_doall_arg +IMPLEMENT_LHASH_DOALL_ARG_FN(t_dump, TABNODE *, DUMP_ARG *) +#endif /* * write sessions to the control socket */ static void -dump_sess(const int control_sock, LHASH *const sess, BACKEND *const backends) +dump_sess(const int control_sock, LHASH_OF(TABNODE) *const sess, BACKEND *const backends) { DUMP_ARG a; a.control_sock = control_sock; a.backends = backends; +#if OPENSSL_VERSION_NUMBER >= 0x10000000L + LHM_lh_doall_arg(TABNODE, sess, LHASH_DOALL_ARG_FN(t_dump), DUMP_ARG, &a); +#else lh_doall_arg(sess, LHASH_DOALL_ARG_FN(t_dump), &a); +#endif return; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

1 0