April 2010 - openSUSE Commits - openSUSE Mailing Lists

commit wine for openSUSE:Factory
by root＠Hilbert.suse.de 02 Apr '10

02 Apr '10

Hello community, here is the log from the commit of package wine for openSUSE:Factory checked in at Sat Apr 3 00:21:20 CEST 2010. -------- --- wine/wine.changes 2010-03-17 13:48:12.000000000 +0100 +++ /mounts/work_src_done/STABLE/wine/wine.changes 2010-04-02 21:13:26.000000000 +0200 @@ -1,0 +2,26 @@ +Fri Apr 2 20:52:05 CEST 2010 - meissner(a)suse.de + +- Updated to 1.1.42 + - Support for shared 32/64-bit setups. + - Dwarf debug info support for better backtraces. + - More standard actions supported in MSI. + - Support for TIFF image format in WinCodecs. + - A number of Direct3D improvements. + - Shell fixes for better Internet Explorer support. + - Various bug fixes. + +------------------------------------------------------------------- +Fri Mar 19 20:31:31 CET 2010 - meissner(a)suse.de + +- Updated to 1.1.41 + - A wide range of Direct3D improvements. + - Support for SHA-256, SHA-384, and SHA-512 algorithms. + - A number of MSHTML fixes. + - Support for mp3 decoding on Mac OS X. + - Various widl improvements. + - More typelib fixes. + - OLE storage improvements. + - Various bug fixes. +- Updated winetricks + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- wine-1.1.40.tar.bz2 New: ---- wine-1.1.42.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine.spec ++++++ --- /var/tmp/diff_new_pack.AOXtSa/_old 2010-04-03 00:21:12.000000000 +0200 +++ /var/tmp/diff_new_pack.AOXtSa/_new 2010-04-03 00:21:12.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package wine (Version 1.1.40) +# spec file for package wine (Version 1.1.42) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,12 +18,12 @@ Name: wine -BuildRequires: alsa-devel bison capi4linux-devel cups-devel desktop-file-utils fdupes flex freeglut-devel freetype2-devel giflib-devel gnutls-devel hal-devel libgphoto2-devel libgsm-devel libjpeg-devel liblcms-devel libpng-devel libxslt-devel ncurses-devel openldap2-devel prelink sane-backends update-desktop-files +BuildRequires: alsa-devel bison capi4linux-devel cups-devel desktop-file-utils fdupes flex freeglut-devel freetype2-devel giflib-devel gnutls-devel hal-devel libgphoto2-devel libgsm-devel libjpeg-devel liblcms-devel libpng-devel libtiff-devel libxslt-devel ncurses-devel openldap2-devel prelink sane-backends update-desktop-files License: LGPLv2.1+ Group: System/Emulators/PC AutoReqProv: on -Version: 1.1.40 -Release: 2 +Version: 1.1.42 +Release: 1 Summary: An MS Windows Emulator Url: http://www.winehq.com Source0: wine-%version.tar.bz2 ++++++ wine-1.1.40.tar.bz2 -> wine-1.1.42.tar.bz2 ++++++ wine/wine-1.1.40.tar.bz2 /mounts/work_src_done/STABLE/wine/wine-1.1.42.tar.bz2 differ: char 11, line 1 ++++++ winetricks ++++++ --- /var/tmp/diff_new_pack.AOXtSa/_old 2010-04-03 00:21:12.000000000 +0200 +++ /var/tmp/diff_new_pack.AOXtSa/_new 2010-04-03 00:21:12.000000000 +0200 @@ -19,7 +19,7 @@ #---- Constants ------------------------------------------------- # Name of this version of winetricks (YYYYMMDD) -VERSION=20100316 +VERSION=20100317 early_wine() { @@ -241,7 +241,7 @@ echo " riched30 MS riched30" echo " richtx32 MS Rich TextBox Control 6.0" echo " shockwave Adobe Shockwave Player" - echo " steam Valve's Steam Client App" + echo " steam Steam Client App from Valve" echo " tahoma MS Tahoma font (not part of corefonts)" echo " urlmon MS urlmon.dll" echo " usp10 MS usp10.dll (Uniscribe)" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 vm-install for openSUSE:Factory
by root＠Hilbert.suse.de 02 Apr '10

02 Apr '10

Hello community, here is the log from the commit of package vm-install for openSUSE:Factory checked in at Sat Apr 3 00:21:15 CEST 2010. -------- --- vm-install/vm-install.changes 2010-03-19 17:18:10.000000000 +0100 +++ /mounts/work_src_done/STABLE/vm-install/vm-install.changes 2010-04-02 18:15:40.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Mar 26 12:42:39 MDT 2010 - carnold(a)novell.com + +- bnc#438078 - python-gtk missing for vm-install in fvwm + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- vm-install-0.4.23.tar.bz2 New: ---- vm-install-0.4.24.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vm-install.spec ++++++ --- /var/tmp/diff_new_pack.vjnlmj/_old 2010-04-03 00:21:10.000000000 +0200 +++ /var/tmp/diff_new_pack.vjnlmj/_new 2010-04-03 00:21:10.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package vm-install (Version 0.4.23) +# spec file for package vm-install (Version 0.4.24) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,14 +26,15 @@ License: GPLv2+ Group: System/Emulators/PC AutoReqProv: yes -Version: 0.4.23 +Version: 0.4.24 Release: 1 Summary: Tool to Define a Virtual Machine and Install Its Operating System -Source0: %{name}-0.4.23.tar.bz2 +Source0: %{name}-0.4.24.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 Requires: libvirt python-urlgrabber libxml2-python libvirt-python virt-utils udhcp tftp %define pysite %(python -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib()") +Recommends: python-gtk %description vm-install can define a Xen virtual machine, and cause an operating ++++++ vm-install-0.4.23.tar.bz2 -> vm-install-0.4.24.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.4.23/Makefile new/vm-install-0.4.24/Makefile --- old/vm-install-0.4.23/Makefile 2010-03-15 23:19:24.000000000 +0100 +++ new/vm-install-0.4.24/Makefile 2010-03-30 01:02:12.000000000 +0200 @@ -1,5 +1,5 @@ PACKAGE = vm-install -VER = 0.4.23 +VER = 0.4.24 default: @echo "Run 'make install DESTDIR=$destdir' to install." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.4.23/bin/vm-install new/vm-install-0.4.24/bin/vm-install --- old/vm-install-0.4.23/bin/vm-install 2010-02-25 00:30:59.000000000 +0100 +++ new/vm-install-0.4.24/bin/vm-install 2010-03-30 01:02:10.000000000 +0200 @@ -200,6 +200,12 @@ # # The basic flow is the same, regardless of CLI vs. GUI. + # vm-install doesn't work for non-root users currently + # (see bnc#574603) + # + if os.getuid() != 0: + print >> sys.stderr, '%s: %s' % (vminstall.msg.error, vminstall.msg.must_be_root) + sys.exit(-1) # # Hypervisor Check # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.4.23/po/ar.po new/vm-install-0.4.24/po/ar.po --- old/vm-install-0.4.23/po/ar.po 2010-03-15 23:19:24.000000000 +0100 +++ new/vm-install-0.4.24/po/ar.po 2010-03-30 01:02:12.000000000 +0200 @@ -6,7 +6,7 @@ "Project-Id-Version: xen-vm-install\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-02-10 13:01-0700\n" -"PO-Revision-Date: 2010-03-11 15:33\n" +"PO-Revision-Date: 2010-03-16 10:37\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -654,7 +654,7 @@ #: src/vminstall/msg.py:223 msgid "Setting the maximum memory greater than the initial memory requires the VM operating system to have a memory balloon driver." -msgstr "" +msgstr "يتطلب تعيين الحد الأقصى للذاكرة ليصبح أكبر من الذاكرة الأولية احتواء نظام تشغيل VM على برنامج تشغيل بالون الذاكرة." #: src/vminstall/msg.py:226 msgid "Specify the amount of memory and number of processors to allocate for the VM." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.4.23/po/cs.po new/vm-install-0.4.24/po/cs.po --- old/vm-install-0.4.23/po/cs.po 2010-03-15 23:19:24.000000000 +0100 +++ new/vm-install-0.4.24/po/cs.po 2010-03-30 01:02:12.000000000 +0200 @@ -6,7 +6,7 @@ "Project-Id-Version: xen-vm-install\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-02-10 13:01-0700\n" -"PO-Revision-Date: 2010-03-11 15:45\n" +"PO-Revision-Date: 2010-03-25 07:18\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -654,7 +654,7 @@ #: src/vminstall/msg.py:223 msgid "Setting the maximum memory greater than the initial memory requires the VM operating system to have a memory balloon driver." -msgstr "Chcete-li nastavit maximální paměť na hodnotu větší než výchozí, je třeba, aby měl operační systém virtuálního počítače ovladač paměti balloon driver." +msgstr "Chcete-li nastavit maximální paměť na hodnotu větší než výchozí, je třeba, aby měl operační systém virtuálního počítače ovladač paměti balloon." #: src/vminstall/msg.py:226 msgid "Specify the amount of memory and number of processors to allocate for the VM." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.4.23/po/es.po new/vm-install-0.4.24/po/es.po --- old/vm-install-0.4.23/po/es.po 2010-03-15 23:19:24.000000000 +0100 +++ new/vm-install-0.4.24/po/es.po 2010-03-30 01:02:12.000000000 +0200 @@ -6,7 +6,7 @@ "Project-Id-Version: xen-vm-install\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-02-10 13:01-0700\n" -"PO-Revision-Date: 2010-03-11 14:06\n" +"PO-Revision-Date: 2010-03-24 12:28\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -654,7 +654,7 @@ #: src/vminstall/msg.py:223 msgid "Setting the maximum memory greater than the initial memory requires the VM operating system to have a memory balloon driver." -msgstr "Definir el máximo de memoria en un valor superior al de la memoria inicial requiere que el sistema operativo de la VM tenga una unidad de balón de memoria." +msgstr "Definir el máximo de memoria en un valor superior al de la memoria inicial requiere que el sistema operativo de la VM tenga un 'balloon-driver' de memoria." #: src/vminstall/msg.py:226 msgid "Specify the amount of memory and number of processors to allocate for the VM." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.4.23/po/ru.po new/vm-install-0.4.24/po/ru.po --- old/vm-install-0.4.23/po/ru.po 2010-03-15 23:19:24.000000000 +0100 +++ new/vm-install-0.4.24/po/ru.po 2010-03-30 01:02:12.000000000 +0200 @@ -6,7 +6,7 @@ "Project-Id-Version: xen-vm-install\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-02-10 13:01-0700\n" -"PO-Revision-Date: 2010-03-12 12:36\n" +"PO-Revision-Date: 2010-03-25 08:23\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -654,7 +654,7 @@ #: src/vminstall/msg.py:223 msgid "Setting the maximum memory greater than the initial memory requires the VM operating system to have a memory balloon driver." -msgstr "" +msgstr "Для задания максимальной памяти, превышающей начальную память, требуется, чтобы операционная система имела драйвер динамического перераспределения памяти." #: src/vminstall/msg.py:226 msgid "Specify the amount of memory and number of processors to allocate for the VM." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.4.23/po/xen-vm-install.pot new/vm-install-0.4.24/po/xen-vm-install.pot --- old/vm-install-0.4.23/po/xen-vm-install.pot 2010-02-25 00:31:00.000000000 +0100 +++ new/vm-install-0.4.24/po/xen-vm-install.pot 2010-03-30 01:02:12.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-10 13:01-0700\n" +"POT-Creation-Date: 2010-03-26 12:46-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -60,581 +60,585 @@ msgid "No media is present in the drive." msgstr "" -#: src/vminstall/msg.py:36 -msgid "Please correct the error and try again." +#: src/vminstall/msg.py:34 +msgid "Must be the 'root' user to run vm-install" msgstr "" #: src/vminstall/msg.py:37 +msgid "Please correct the error and try again." +msgstr "" + +#: src/vminstall/msg.py:38 msgid "Please type a number." msgstr "" #. TRANSLATORS Do not translate %(val)s -#: src/vminstall/msg.py:39 +#: src/vminstall/msg.py:40 #, python-format msgid "The minimum acceptable value is %(val)s." msgstr "" #. TRANSLATORS Do not translate %(val)s -#: src/vminstall/msg.py:41 +#: src/vminstall/msg.py:42 #, python-format msgid "The maximum acceptable value is %(val)s." msgstr "" -#: src/vminstall/msg.py:44 +#: src/vminstall/msg.py:45 msgid "The VM's name must contain only alphanumeric and _ - . : + characters." msgstr "" -#: src/vminstall/msg.py:45 +#: src/vminstall/msg.py:46 msgid "The VM's name must contain from 1 to 255 characters." msgstr "" -#: src/vminstall/msg.py:46 +#: src/vminstall/msg.py:47 msgid "The VM's name cannot start with a digit." msgstr "" -#: src/vminstall/msg.py:49 +#: src/vminstall/msg.py:50 #, python-format msgid "" "Failed to display the VM's console because DISPLAY is not set. Please " "connect a VNC viewer to %s:%d." msgstr "" -#: src/vminstall/msg.py:50 +#: src/vminstall/msg.py:51 msgid "Failed to display the VM's console. Please connect a viewer manually." msgstr "" -#: src/vminstall/msg.py:54 +#: src/vminstall/msg.py:55 msgid "An error occurred in Xen." msgstr "" -#: src/vminstall/msg.py:55 +#: src/vminstall/msg.py:56 msgid "The hypervisor is not running." msgstr "" -#: src/vminstall/msg.py:56 +#: src/vminstall/msg.py:57 msgid "An incompatible version of the hypervisor is running." msgstr "" -#: src/vminstall/msg.py:57 +#: src/vminstall/msg.py:58 msgid "Unable to connect to the Xen daemon." msgstr "" -#: src/vminstall/msg.py:58 +#: src/vminstall/msg.py:59 msgid "Must be the 'root' user to manage Xen." msgstr "" -#: src/vminstall/msg.py:61 +#: src/vminstall/msg.py:62 msgid "Failed to start the VM." msgstr "" -#: src/vminstall/msg.py:62 +#: src/vminstall/msg.py:63 msgid "The VM has crashed." msgstr "" -#: src/vminstall/msg.py:63 +#: src/vminstall/msg.py:64 msgid "A VM by that name is already running." msgstr "" -#: src/vminstall/msg.py:64 +#: src/vminstall/msg.py:65 msgid "A VM configuration already exists with that name." msgstr "" -#: src/vminstall/msg.py:65 +#: src/vminstall/msg.py:66 msgid "A valid boot sector was not found. The installation may have failed." msgstr "" -#: src/vminstall/msg.py:66 +#: src/vminstall/msg.py:67 msgid "No kernel was found. The installation may have failed." msgstr "" -#: src/vminstall/msg.py:67 +#: src/vminstall/msg.py:68 msgid "You must shutdown the VM before upgrading." msgstr "" -#: src/vminstall/msg.py:70 +#: src/vminstall/msg.py:71 msgid "The installation source is using an unsupported protocol." msgstr "" -#: src/vminstall/msg.py:71 +#: src/vminstall/msg.py:72 msgid "An error occurred while reading from the installation source." msgstr "" -#: src/vminstall/msg.py:72 +#: src/vminstall/msg.py:73 msgid "The installation source was not found." msgstr "" -#: src/vminstall/msg.py:73 +#: src/vminstall/msg.py:74 msgid "The installation source is unusable." msgstr "" -#: src/vminstall/msg.py:74 +#: src/vminstall/msg.py:75 msgid "No installation source was defined." msgstr "" -#: src/vminstall/msg.py:75 +#: src/vminstall/msg.py:76 msgid "A CD-ROM or DVD must be specified from which to boot." msgstr "" -#: src/vminstall/msg.py:76 +#: src/vminstall/msg.py:77 msgid "An error occurred while reading the configuration file." msgstr "" -#: src/vminstall/msg.py:79 +#: src/vminstall/msg.py:80 msgid "" "The operating system is incompatible with the processor architecture of this " "machine." msgstr "" -#: src/vminstall/msg.py:80 +#: src/vminstall/msg.py:81 msgid "The processor(s) in this machine do not support full virtualization." msgstr "" -#: src/vminstall/msg.py:81 +#: src/vminstall/msg.py:82 msgid "" "The processor(s) in this machine support full virtualization, but it is " "disabled in the BIOS." msgstr "" -#: src/vminstall/msg.py:84 +#: src/vminstall/msg.py:85 msgid "Not enough memory." msgstr "" -#: src/vminstall/msg.py:87 +#: src/vminstall/msg.py:88 msgid "The disk does not exist." msgstr "" -#: src/vminstall/msg.py:88 +#: src/vminstall/msg.py:89 msgid "The disk is read-only." msgstr "" -#: src/vminstall/msg.py:89 +#: src/vminstall/msg.py:90 msgid "Permission was denied while attempting to access the disk." msgstr "" -#: src/vminstall/msg.py:90 +#: src/vminstall/msg.py:91 msgid "" "Two of the virtual disks have conflicting virtual names or physical devices." msgstr "" -#: src/vminstall/msg.py:91 +#: src/vminstall/msg.py:92 msgid "Not enough space on device for disk image." msgstr "" -#: src/vminstall/msg.py:92 +#: src/vminstall/msg.py:93 msgid "Create disk image failed." msgstr "" -#: src/vminstall/msg.py:93 +#: src/vminstall/msg.py:94 msgid "" "You are overcommitting the amount of disk space available on this device. " "Continue anyways?" msgstr "" -#: src/vminstall/msg.py:96 +#: src/vminstall/msg.py:97 msgid "The job was canceled." msgstr "" -#: src/vminstall/msg.py:97 +#: src/vminstall/msg.py:98 msgid "The job was not found." msgstr "" -#: src/vminstall/msg.py:98 +#: src/vminstall/msg.py:99 msgid "The job is in the wrong state to perform that action." msgstr "" -#: src/vminstall/msg.py:101 +#: src/vminstall/msg.py:102 msgid "A parameter is invalid or missing." msgstr "" -#: src/vminstall/msg.py:102 +#: src/vminstall/msg.py:103 msgid "The operating system does not support paravirtualization." msgstr "" -#: src/vminstall/msg.py:103 +#: src/vminstall/msg.py:104 msgid "The operating system does not support automated installations." msgstr "" -#: src/vminstall/msg.py:104 +#: src/vminstall/msg.py:105 msgid "The operating system does not support full virtualization." msgstr "" -#: src/vminstall/msg.py:105 +#: src/vminstall/msg.py:106 msgid "The operating system cannot be upgraded from this tool." msgstr "" -#: src/vminstall/msg.py:108 +#: src/vminstall/msg.py:109 msgid "NetWare" msgstr "" -#: src/vminstall/msg.py:109 +#: src/vminstall/msg.py:110 msgid "RedHat" msgstr "" -#: src/vminstall/msg.py:110 +#: src/vminstall/msg.py:111 msgid "SUSE" msgstr "" -#: src/vminstall/msg.py:111 +#: src/vminstall/msg.py:112 msgid "Windows" msgstr "" -#: src/vminstall/msg.py:112 +#: src/vminstall/msg.py:113 msgid "Solaris" msgstr "" -#: src/vminstall/msg.py:113 +#: src/vminstall/msg.py:114 msgid "Other" msgstr "" -#: src/vminstall/msg.py:116 +#: src/vminstall/msg.py:117 msgid "Novell NetWare 6.5 SP6 and older" msgstr "" -#: src/vminstall/msg.py:117 +#: src/vminstall/msg.py:118 msgid "Novell Open Enterprise Server 2 (Linux)" msgstr "" -#: src/vminstall/msg.py:118 +#: src/vminstall/msg.py:119 msgid "Novell Open Enterprise Server 2 (NetWare)" msgstr "" -#: src/vminstall/msg.py:119 +#: src/vminstall/msg.py:120 msgid "openSUSE" msgstr "" -#: src/vminstall/msg.py:120 +#: src/vminstall/msg.py:121 msgid "openSUSE 11" msgstr "" -#: src/vminstall/msg.py:121 +#: src/vminstall/msg.py:122 msgid "Other operating system" msgstr "" -#: src/vminstall/msg.py:122 +#: src/vminstall/msg.py:123 msgid "RedHat (other)" msgstr "" -#: src/vminstall/msg.py:123 +#: src/vminstall/msg.py:124 msgid "RedHat Enterprise Linux 3" msgstr "" -#: src/vminstall/msg.py:124 +#: src/vminstall/msg.py:125 msgid "RedHat Enterprise Linux 4" msgstr "" -#: src/vminstall/msg.py:125 +#: src/vminstall/msg.py:126 msgid "RedHat Enterprise Linux 5" msgstr "" -#: src/vminstall/msg.py:126 +#: src/vminstall/msg.py:127 msgid "SUSE Linux Enterprise Desktop 10" msgstr "" -#: src/vminstall/msg.py:127 +#: src/vminstall/msg.py:128 msgid "SUSE Linux Enterprise Desktop 11" msgstr "" -#: src/vminstall/msg.py:128 +#: src/vminstall/msg.py:129 msgid "SUSE Linux Enterprise Server 10" msgstr "" -#: src/vminstall/msg.py:129 +#: src/vminstall/msg.py:130 msgid "SUSE Linux Enterprise Server 11" msgstr "" -#: src/vminstall/msg.py:130 +#: src/vminstall/msg.py:131 msgid "SUSE Linux Enterprise Server 8" msgstr "" -#: src/vminstall/msg.py:131 +#: src/vminstall/msg.py:132 msgid "SUSE Linux Enterprise Server 9" msgstr "" -#: src/vminstall/msg.py:132 +#: src/vminstall/msg.py:133 msgid "Solaris 10" msgstr "" -#: src/vminstall/msg.py:133 +#: src/vminstall/msg.py:134 msgid "Solaris 9 and older" msgstr "" -#: src/vminstall/msg.py:134 +#: src/vminstall/msg.py:135 msgid "SUSE (other)" msgstr "" -#: src/vminstall/msg.py:135 +#: src/vminstall/msg.py:136 msgid "Windows (other)" msgstr "" -#: src/vminstall/msg.py:136 +#: src/vminstall/msg.py:137 msgid "Windows (other, x64)" msgstr "" -#: src/vminstall/msg.py:137 +#: src/vminstall/msg.py:138 msgid "Windows NT" msgstr "" -#: src/vminstall/msg.py:138 +#: src/vminstall/msg.py:139 msgid "Windows Vista, Windows 7" msgstr "" -#: src/vminstall/msg.py:139 +#: src/vminstall/msg.py:140 msgid "Windows Vista, Windows 7 (x64)" msgstr "" -#: src/vminstall/msg.py:140 +#: src/vminstall/msg.py:141 msgid "Windows Server 2008" msgstr "" -#: src/vminstall/msg.py:141 +#: src/vminstall/msg.py:142 msgid "Windows Server 2008 (x64)" msgstr "" -#: src/vminstall/msg.py:142 +#: src/vminstall/msg.py:143 msgid "Windows XP, 2000, 2003" msgstr "" -#: src/vminstall/msg.py:143 +#: src/vminstall/msg.py:144 msgid "Windows XP, 2003 (x64)" msgstr "" -#: src/vminstall/msg.py:146 +#: src/vminstall/msg.py:147 msgid "Gathering settings..." msgstr "" -#: src/vminstall/msg.py:147 +#: src/vminstall/msg.py:148 msgid "Preparing to start the installation..." msgstr "" -#: src/vminstall/msg.py:148 +#: src/vminstall/msg.py:149 msgid "Installing..." msgstr "" -#: src/vminstall/msg.py:149 +#: src/vminstall/msg.py:150 msgid "Please wait..." msgstr "" -#: src/vminstall/msg.py:150 +#: src/vminstall/msg.py:151 msgid "Waiting for the VM to stop before continuing..." msgstr "" -#: src/vminstall/msg.py:151 +#: src/vminstall/msg.py:152 msgid "Performing post-installation checks..." msgstr "" -#: src/vminstall/msg.py:152 +#: src/vminstall/msg.py:153 msgid "Creating the run-time configuration..." msgstr "" -#: src/vminstall/msg.py:153 +#: src/vminstall/msg.py:154 msgid "The configuration file has been written." msgstr "" -#: src/vminstall/msg.py:154 +#: src/vminstall/msg.py:155 msgid "Finishing the installation..." msgstr "" -#: src/vminstall/msg.py:155 +#: src/vminstall/msg.py:156 msgid "Finished." msgstr "" -#: src/vminstall/msg.py:158 +#: src/vminstall/msg.py:159 msgid "Paravirtualized" msgstr "" -#: src/vminstall/msg.py:159 +#: src/vminstall/msg.py:160 msgid "Fully virtualized" msgstr "" -#: src/vminstall/msg.py:160 +#: src/vminstall/msg.py:161 msgid "Paravirtualization" msgstr "" -#: src/vminstall/msg.py:161 +#: src/vminstall/msg.py:162 msgid "Full virtualization" msgstr "" -#: src/vminstall/msg.py:162 +#: src/vminstall/msg.py:163 msgid "Name" msgstr "" -#: src/vminstall/msg.py:163 +#: src/vminstall/msg.py:164 msgid "Type" msgstr "" -#: src/vminstall/msg.py:164 +#: src/vminstall/msg.py:165 msgid "Source" msgstr "" -#: src/vminstall/msg.py:165 +#: src/vminstall/msg.py:166 msgid "Browse" msgstr "" -#: src/vminstall/msg.py:166 +#: src/vminstall/msg.py:167 msgid "Upgrade" msgstr "" -#: src/vminstall/msg.py:167 +#: src/vminstall/msg.py:168 msgid "Protocol" msgstr "" -#: src/vminstall/msg.py:168 +#: src/vminstall/msg.py:169 msgid "Keymap" msgstr "" -#: src/vminstall/msg.py:169 +#: src/vminstall/msg.py:170 msgid "None" msgstr "" -#: src/vminstall/msg.py:170 +#: src/vminstall/msg.py:171 msgid "Username:" msgstr "" -#: src/vminstall/msg.py:171 +#: src/vminstall/msg.py:172 msgid "Password:" msgstr "" -#: src/vminstall/msg.py:172 +#: src/vminstall/msg.py:173 msgid "Description" msgstr "" -#: src/vminstall/msg.py:173 +#: src/vminstall/msg.py:174 msgid "Enabled" msgstr "" -#: src/vminstall/msg.py:174 +#: src/vminstall/msg.py:175 msgid "Option" msgstr "" -#: src/vminstall/msg.py:177 +#: src/vminstall/msg.py:178 msgid "Create a Virtual Machine" msgstr "" -#: src/vminstall/msg.py:178 +#: src/vminstall/msg.py:179 msgid "Install an Operating System?" msgstr "" -#: src/vminstall/msg.py:179 +#: src/vminstall/msg.py:180 msgid "Type of Operating System" msgstr "" -#: src/vminstall/msg.py:180 +#: src/vminstall/msg.py:181 msgid "Summary" msgstr "" -#: src/vminstall/msg.py:181 +#: src/vminstall/msg.py:182 msgid "Virtualization Method" msgstr "" -#: src/vminstall/msg.py:182 +#: src/vminstall/msg.py:183 msgid "Name of Virtual Machine" msgstr "" -#: src/vminstall/msg.py:183 +#: src/vminstall/msg.py:184 msgid "Hardware" msgstr "" -#: src/vminstall/msg.py:184 +#: src/vminstall/msg.py:185 msgid "Graphics and Keyboard" msgstr "" -#: src/vminstall/msg.py:185 +#: src/vminstall/msg.py:186 msgid "Disks" msgstr "" -#: src/vminstall/msg.py:186 src/vminstall/msg.py:241 +#: src/vminstall/msg.py:187 src/vminstall/msg.py:242 msgid "Virtual Disk" msgstr "" -#: src/vminstall/msg.py:187 +#: src/vminstall/msg.py:188 msgid "Network Adapters" msgstr "" -#: src/vminstall/msg.py:188 +#: src/vminstall/msg.py:189 msgid "Virtual Network Adapter" msgstr "" -#: src/vminstall/msg.py:189 +#: src/vminstall/msg.py:190 msgid "Operating System Installation" msgstr "" -#: src/vminstall/msg.py:190 +#: src/vminstall/msg.py:191 msgid "Operating System Settings" msgstr "" -#: src/vminstall/msg.py:191 +#: src/vminstall/msg.py:192 msgid "Operating System Upgrade" msgstr "" -#: src/vminstall/msg.py:192 +#: src/vminstall/msg.py:193 msgid "Advanced Settings" msgstr "" -#: src/vminstall/msg.py:195 +#: src/vminstall/msg.py:196 msgid "" "This assistant will guide you through creating a new virtual machine (VM). " "You will be asked for some information about the VM you'd like to create, " "such as:" msgstr "" -#: src/vminstall/msg.py:196 +#: src/vminstall/msg.py:197 msgid "The <b>type of operating system</b> that will run in the new VM" msgstr "" -#: src/vminstall/msg.py:197 +#: src/vminstall/msg.py:198 msgid "" "Whether the VM will be <b>fully virtualized</b> or <b>paravirtualized</b>" msgstr "" -#: src/vminstall/msg.py:198 +#: src/vminstall/msg.py:199 msgid "" "The <b>location</b> of the files necessary to install an operating system on " "the VM, or a <b>disk</b> that already has an operating system" msgstr "" -#: src/vminstall/msg.py:199 +#: src/vminstall/msg.py:200 msgid "" "Other characteristics of the VM, such as <b>memory</b>, <b>processors</b>, " "and <b>network adapters</b>." msgstr "" #. TRANSLATORS Do not translate %(url)s -#: src/vminstall/msg.py:201 +#: src/vminstall/msg.py:202 #, python-format msgid "" "For the most current information on Novell VM server technology, see %(url)s" msgstr "" -#: src/vminstall/msg.py:202 +#: src/vminstall/msg.py:203 msgid "" "If you are creating this VM from scratch, you will need to install an " "operating system. When migrating a physical machine to a virtual machine, " "the disk with the existing operating system can often be reused for the VM." msgstr "" -#: src/vminstall/msg.py:203 +#: src/vminstall/msg.py:204 msgid "I need to install an operating system." msgstr "" -#: src/vminstall/msg.py:204 +#: src/vminstall/msg.py:205 msgid "I have a disk or disk image with an installed operating system." msgstr "" -#: src/vminstall/msg.py:205 +#: src/vminstall/msg.py:206 msgid "I need to upgrade an existing operating system." msgstr "" -#: src/vminstall/msg.py:206 +#: src/vminstall/msg.py:207 msgid "Please choose a name for the virtual machine." msgstr "" -#: src/vminstall/msg.py:207 +#: src/vminstall/msg.py:208 msgid "" "Click any headline to make changes. When the settings are correct, click " "<b>OK</b> to create the VM." msgstr "" -#: src/vminstall/msg.py:208 +#: src/vminstall/msg.py:209 msgid "" "Virtual machines can use paravirtualization or full virtualization. " "Paravirtualization is faster but requires operating system support. Full " @@ -642,54 +646,54 @@ "hardware support. Which do you prefer?" msgstr "" -#: src/vminstall/msg.py:209 +#: src/vminstall/msg.py:210 msgid "" "Please specify the type of operating system that will run within the virtual " "machine. This defines many defaults, and helps decide how to start " "paravirtualized operating systems." msgstr "" -#: src/vminstall/msg.py:210 +#: src/vminstall/msg.py:211 msgid "" "Some operating systems support automating the installation by specifying a " "URL or file(s). Select a directory to include multiple files." msgstr "" -#: src/vminstall/msg.py:211 +#: src/vminstall/msg.py:212 msgid "" "Some operating systems accept additional arguments, used to customize the " "installation or boot process." msgstr "" -#: src/vminstall/msg.py:212 +#: src/vminstall/msg.py:213 msgid "" "Select the behavior when the operating system exits with power off, reboot " "or crash. Settings take effect after installation is complete." msgstr "" -#: src/vminstall/msg.py:215 +#: src/vminstall/msg.py:216 msgid "" "Specify the bootable virtual disk (often labeled as Disk 1) or the network " "installation source URL. Each CD, DVD, or ISO image required for " "installation must be added as a virtual disk." msgstr "" -#: src/vminstall/msg.py:218 +#: src/vminstall/msg.py:219 msgid "" "Create a virtual disk based on a device (CD or other block device), an " "existing image file (ISO), or a new file. Specify a device by its device " "node, such as /dev/cdrom, not its mount point." msgstr "" -#: src/vminstall/msg.py:219 +#: src/vminstall/msg.py:220 msgid "Please specify the settings for the virtual network adapter." msgstr "" -#: src/vminstall/msg.py:220 +#: src/vminstall/msg.py:221 msgid "Press 'q' or the Escape key to exit." msgstr "" -#: src/vminstall/msg.py:221 +#: src/vminstall/msg.py:222 msgid "" "Warning: Vm-install automatically manages these configuration settings " "depending on the operating system to be installed. It is expected that you " @@ -697,293 +701,293 @@ "setting." msgstr "" -#: src/vminstall/msg.py:222 +#: src/vminstall/msg.py:223 msgid "Reset to Defaults" msgstr "" -#: src/vminstall/msg.py:223 +#: src/vminstall/msg.py:224 msgid "" "Setting the maximum memory greater than the initial memory requires the VM " "operating system to have a memory balloon driver." msgstr "" -#: src/vminstall/msg.py:226 +#: src/vminstall/msg.py:227 msgid "" "Specify the amount of memory and number of processors to allocate for the VM." msgstr "" -#: src/vminstall/msg.py:227 +#: src/vminstall/msg.py:228 msgid "" "For best performance, the number of virtual processors should be less than " "or equal to the number of physical processors." msgstr "" -#: src/vminstall/msg.py:230 +#: src/vminstall/msg.py:231 msgid "" "Paravirtualized graphics require that an appropriate driver is installed in " "the operating system." msgstr "" -#: src/vminstall/msg.py:231 +#: src/vminstall/msg.py:232 msgid "" "The VM will operate like a server without a monitor. You may still access " "the operating system via the virtualized serial port, or through any " "operating system supported services such as ssh or VNC." msgstr "" -#: src/vminstall/msg.py:232 +#: src/vminstall/msg.py:233 msgid "Please specify the type of virtualized graphics hardware." msgstr "" -#: src/vminstall/msg.py:233 +#: src/vminstall/msg.py:234 msgid "Paravirtualized Graphics Adapter" msgstr "" -#: src/vminstall/msg.py:234 +#: src/vminstall/msg.py:235 msgid "VESA VGA" msgstr "" -#: src/vminstall/msg.py:235 +#: src/vminstall/msg.py:236 msgid "Cirrus Logic GD5446 VGA" msgstr "" -#: src/vminstall/msg.py:236 +#: src/vminstall/msg.py:237 msgid "No Graphics Support" msgstr "" -#: src/vminstall/msg.py:238 +#: src/vminstall/msg.py:239 msgid "Please specify the keyboard translation map file." msgstr "" -#: src/vminstall/msg.py:242 +#: src/vminstall/msg.py:243 msgid "Virtual Disks" msgstr "" -#: src/vminstall/msg.py:243 +#: src/vminstall/msg.py:244 msgid "PXE Boot" msgstr "" -#: src/vminstall/msg.py:244 +#: src/vminstall/msg.py:245 msgid "Size (GB)" msgstr "" -#: src/vminstall/msg.py:245 +#: src/vminstall/msg.py:246 msgid "Create Sparse Image File" msgstr "" -#: src/vminstall/msg.py:246 +#: src/vminstall/msg.py:247 msgid "Read-Only Access" msgstr "" -#: src/vminstall/msg.py:247 +#: src/vminstall/msg.py:248 msgid "Hard Disk" msgstr "" -#: src/vminstall/msg.py:248 +#: src/vminstall/msg.py:249 msgid "CD-ROM or DVD" msgstr "" -#: src/vminstall/msg.py:249 +#: src/vminstall/msg.py:250 msgid "Floppy Disk" msgstr "" -#: src/vminstall/msg.py:250 +#: src/vminstall/msg.py:251 msgid "PXE" msgstr "" -#: src/vminstall/msg.py:253 +#: src/vminstall/msg.py:254 msgid "" "Can't reach the pxe server. Possible reasons are an improperly configured " "network or firewall restrictions." msgstr "" -#: src/vminstall/msg.py:254 +#: src/vminstall/msg.py:255 msgid "Can't get the pxelinux.cfg/default file from the pxe server." msgstr "" -#: src/vminstall/msg.py:255 +#: src/vminstall/msg.py:256 msgid "Can't download the kernel and initrd from the server." msgstr "" -#: src/vminstall/msg.py:256 +#: src/vminstall/msg.py:257 msgid "" "This kernel image may not be a paravirtualized xen kernel required for " "installation, Continue?" msgstr "" -#: src/vminstall/msg.py:259 +#: src/vminstall/msg.py:260 msgid "Fully Virtualized Intel e100" msgstr "" -#: src/vminstall/msg.py:260 +#: src/vminstall/msg.py:261 msgid "Fully Virtualized Intel e1000" msgstr "" -#: src/vminstall/msg.py:261 +#: src/vminstall/msg.py:262 msgid "Fully Virtualized AMD PCnet 32" msgstr "" -#: src/vminstall/msg.py:262 +#: src/vminstall/msg.py:263 msgid "Fully Virtualized NE2000 (ISA Bus)" msgstr "" -#: src/vminstall/msg.py:263 +#: src/vminstall/msg.py:264 msgid "Fully Virtualized NE2000 (PCI Bus)" msgstr "" -#: src/vminstall/msg.py:264 +#: src/vminstall/msg.py:265 msgid "Fully Virtualized Realtek 8139" msgstr "" -#: src/vminstall/msg.py:265 +#: src/vminstall/msg.py:266 msgid "MAC Address" msgstr "" -#: src/vminstall/msg.py:266 +#: src/vminstall/msg.py:267 msgid "Randomly generated MAC address" msgstr "" -#: src/vminstall/msg.py:267 +#: src/vminstall/msg.py:268 msgid "Specified MAC address" msgstr "" -#: src/vminstall/msg.py:270 +#: src/vminstall/msg.py:271 msgid "Additional Arguments" msgstr "" -#: src/vminstall/msg.py:271 +#: src/vminstall/msg.py:272 msgid "Network URL" msgstr "" -#: src/vminstall/msg.py:272 +#: src/vminstall/msg.py:273 msgid "Memory" msgstr "" -#: src/vminstall/msg.py:273 +#: src/vminstall/msg.py:274 msgid "Processors" msgstr "" -#: src/vminstall/msg.py:274 +#: src/vminstall/msg.py:275 msgid "Automated install file or URL" msgstr "" -#: src/vminstall/msg.py:275 +#: src/vminstall/msg.py:276 msgid "Available Memory" msgstr "" -#: src/vminstall/msg.py:276 +#: src/vminstall/msg.py:277 msgid "Available Processors" msgstr "" -#: src/vminstall/msg.py:277 +#: src/vminstall/msg.py:278 msgid "Initial Memory" msgstr "" -#: src/vminstall/msg.py:278 +#: src/vminstall/msg.py:279 msgid "Maximum Memory" msgstr "" -#: src/vminstall/msg.py:279 +#: src/vminstall/msg.py:280 msgid "Virtual Processors" msgstr "" -#: src/vminstall/msg.py:280 +#: src/vminstall/msg.py:281 msgid "Installation Source" msgstr "" -#: src/vminstall/msg.py:281 +#: src/vminstall/msg.py:282 msgid "Automated Installation" msgstr "" -#: src/vminstall/msg.py:282 +#: src/vminstall/msg.py:283 msgid "Operating System" msgstr "" -#: src/vminstall/msg.py:283 +#: src/vminstall/msg.py:284 msgid "Power Off" msgstr "" -#: src/vminstall/msg.py:284 +#: src/vminstall/msg.py:285 msgid "Reboot" msgstr "" -#: src/vminstall/msg.py:285 +#: src/vminstall/msg.py:286 msgid "Crash" msgstr "" -#: src/vminstall/msg.py:288 +#: src/vminstall/msg.py:289 msgid "Kickstart file or URL" msgstr "" -#: src/vminstall/msg.py:289 +#: src/vminstall/msg.py:290 msgid "AutoYaST file" msgstr "" -#: src/vminstall/msg.py:290 +#: src/vminstall/msg.py:291 msgid "NetWare response file" msgstr "" -#: src/vminstall/msg.py:293 +#: src/vminstall/msg.py:294 msgid "Creating the Virtual Machine" msgstr "" -#: src/vminstall/msg.py:294 +#: src/vminstall/msg.py:295 msgid "Writing the configuration file" msgstr "" -#: src/vminstall/msg.py:295 +#: src/vminstall/msg.py:296 msgid "Locate Operating System Settings File" msgstr "" -#: src/vminstall/msg.py:296 +#: src/vminstall/msg.py:297 msgid "Locate Disk or Disk Image" msgstr "" -#: src/vminstall/msg.py:299 +#: src/vminstall/msg.py:300 msgid "Do you want to add another virtual disk?" msgstr "" -#: src/vminstall/msg.py:300 +#: src/vminstall/msg.py:301 msgid "Do you want to add another virtual network adapter?" msgstr "" -#: src/vminstall/msg.py:301 +#: src/vminstall/msg.py:302 msgid "What type of virtual disk do you want to add?" msgstr "" -#: src/vminstall/msg.py:302 +#: src/vminstall/msg.py:303 msgid "Where will the virtual disk physically reside?" msgstr "" -#: src/vminstall/msg.py:303 +#: src/vminstall/msg.py:304 msgid "What type of virtual network adapter do you want to add?" msgstr "" -#: src/vminstall/msg.py:304 +#: src/vminstall/msg.py:305 msgid "Create a sparse image file for the virtual disk?" msgstr "" -#: src/vminstall/msg.py:306 +#: src/vminstall/msg.py:307 msgid "Default" msgstr "" -#: src/vminstall/msg.py:309 +#: src/vminstall/msg.py:310 msgid "Operating System Type" msgstr "" -#: src/vminstall/msg.py:310 +#: src/vminstall/msg.py:311 msgid "Managed Virtual Machines" msgstr "" -#: src/vminstall/msg.py:311 +#: src/vminstall/msg.py:312 msgid "Configuration File" msgstr "" -#: src/vminstall/msg.py:312 +#: src/vminstall/msg.py:313 msgid "Specify the URL containing the network installation source." msgstr "" -#: src/vminstall/msg.py:315 +#: src/vminstall/msg.py:316 msgid "" "A hypervisor is not running. For kvm, load the kvm kernel modules. If you " "want to run xen, reboot and load the xen kernel." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.4.23/po/zh_CN.po new/vm-install-0.4.24/po/zh_CN.po --- old/vm-install-0.4.23/po/zh_CN.po 2010-03-15 23:19:24.000000000 +0100 +++ new/vm-install-0.4.24/po/zh_CN.po 2010-03-30 01:02:12.000000000 +0200 @@ -6,7 +6,7 @@ "Project-Id-Version: xen-vm-install\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-02-10 13:01-0700\n" -"PO-Revision-Date: 2010-03-11 12:06\n" +"PO-Revision-Date: 2010-03-24 15:11\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -654,7 +654,7 @@ #: src/vminstall/msg.py:223 msgid "Setting the maximum memory greater than the initial memory requires the VM operating system to have a memory balloon driver." -msgstr "设置大于初始内存的最大内存时，要求虚拟机操作系统有内存 balloon driver。" +msgstr "将最大内存设置为大于初始内存，需要虚拟机操作系统具有内存气球驱动程序。" #: src/vminstall/msg.py:226 msgid "Specify the amount of memory and number of processors to allocate for the VM." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.4.23/po/zh_TW.po new/vm-install-0.4.24/po/zh_TW.po --- old/vm-install-0.4.23/po/zh_TW.po 2010-03-15 23:19:24.000000000 +0100 +++ new/vm-install-0.4.24/po/zh_TW.po 2010-03-30 01:02:12.000000000 +0200 @@ -6,7 +6,7 @@ "Project-Id-Version: xen-vm-install\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-02-10 13:01-0700\n" -"PO-Revision-Date: 2010-03-12 12:09\n" +"PO-Revision-Date: 2010-03-24 15:28\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -116,7 +116,7 @@ #: src/vminstall/msg.py:58 msgid "Must be the 'root' user to manage Xen." -msgstr "根使用者才能管理 Xen。" +msgstr "root 使用者才能管理 Xen。" #: src/vminstall/msg.py:61 msgid "Failed to start the VM." @@ -634,7 +634,7 @@ #: src/vminstall/msg.py:218 msgid "Create a virtual disk based on a device (CD or other block device), an existing image file (ISO), or a new file. Specify a device by its device node, such as /dev/cdrom, not its mount point." -msgstr "根據裝置 (CD 或其他區塊設備)、現有影像檔案 (ISO) 或新檔案建立虛擬磁碟。依據裝置節點 (例如 /dev/cdrom) 而不是裝載點，來指定裝置。" +msgstr "根據裝置 (CD 或其他區塊設備)、現有影像檔案 (ISO) 或新檔案建立虛擬磁碟。依據裝置節點 (例如 /dev/cdrom) 而不是掛接點，來指定裝置。" #: src/vminstall/msg.py:219 msgid "Please specify the settings for the virtual network adapter." @@ -654,7 +654,7 @@ #: src/vminstall/msg.py:223 msgid "Setting the maximum memory greater than the initial memory requires the VM operating system to have a memory balloon driver." -msgstr "若要設定大於啟始記憶體的最大記憶體，虛擬機器作業系統必須安裝記憶體快閃驅動程式。" +msgstr "若要設定大於啟始記憶體的最大記憶體，虛擬機器作業系統必須安裝記憶體 balloon 驅動程式。" #: src/vminstall/msg.py:226 msgid "Specify the amount of memory and number of processors to allocate for the VM." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.4.23/setup.py new/vm-install-0.4.24/setup.py --- old/vm-install-0.4.23/setup.py 2010-03-15 23:19:24.000000000 +0100 +++ new/vm-install-0.4.24/setup.py 2010-03-30 01:02:12.000000000 +0200 @@ -1,7 +1,7 @@ from distutils.core import setup setup(name='vminstall', - version='0.4.23', + version='0.4.24', description='Define a virtual machine and install its operating system', author='Charles Coffing', author_email='ccoffing(a)novell.com', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.4.23/src/vminstall/msg.py new/vm-install-0.4.24/src/vminstall/msg.py --- old/vm-install-0.4.23/src/vminstall/msg.py 2010-03-04 14:38:58.000000000 +0100 +++ new/vm-install-0.4.24/src/vminstall/msg.py 2010-03-30 01:02:09.000000000 +0200 @@ -31,6 +31,7 @@ parse_failed = _("Failed to parse the XML file '%(file)s'.") disk_block_or_file = _("The virtual disk may only be stored on a block device or in a file.") no_media = _("No media is present in the drive.") +must_be_root = _("Must be the 'root' user to run vm-install") # Error prompts for the CLI correct_retry = _("Please correct the error and try again.") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gwibber for openSUSE:Factory
by root＠Hilbert.suse.de 02 Apr '10

02 Apr '10

Hello community, here is the log from the commit of package gwibber for openSUSE:Factory checked in at Sat Apr 3 00:20:59 CEST 2010. -------- --- GNOME/gwibber/gwibber.changes 2010-03-14 09:03:43.000000000 +0100 +++ /mounts/work_src_done/STABLE/gwibber/gwibber.changes 2010-04-01 22:58:07.000000000 +0200 @@ -1,0 +2,35 @@ +Wed Mar 31 22:21:21 UTC 2010 - dimstar(a)opensuse.org + +- Update to version 2.29.94 + + Minor bug fixes. + +------------------------------------------------------------------- +Tue Mar 30 08:04:19 UTC 2010 - dimstar(a)opensuse.org + +- Update to version 2.29.93: + + Use MAX_MESSAGE_LENGTH for max length instead of hard coding + 140 + + Changed the views to not emit the entire doc as a value + + lp#528302: Set default focus to the text input widget + + lp#534667: Made a string translatable + + lp#538846: setting translation domain for .ui files + + lp#520462: Mark strings translatable + + lp#538851: Added X-GNOME-Gettext-Domain to allow translations + of the desktop files to be loaded at runtime + + lp#539583: Use the desktopcouch API for excluding the DB and + handle errors + + Set window icons properly so they scale nicely + + lp#535263: Set account IDs in desktopcouch to force merging on + sync instead of creating dupes + +------------------------------------------------------------------- +Wed Mar 24 20:44:39 UTC 2010 - dimstar(a)opensuse.org + +- Update to bzr revision 684. + +------------------------------------------------------------------- +Thu Mar 18 21:03:31 UTC 2010 - dimstar(a)opensuse.org + +- Require python-couchdb. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- gwibber-2.29.92.tar.bz2 New: ---- gwibber-2.29.94.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gwibber.spec ++++++ --- /var/tmp/diff_new_pack.Ug5IYz/_old 2010-04-03 00:20:51.000000000 +0200 +++ /var/tmp/diff_new_pack.Ug5IYz/_new 2010-04-03 00:20:51.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package gwibber (Version 2.29.92) +# spec file for package gwibber (Version 2.29.94) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2008 Andrew Wafaa @@ -19,8 +19,8 @@ Name: gwibber -Version: 2.29.92 -Release: 2 +Version: 2.29.94 +Release: 1 License: GPLv2+ Summary: Microblogging Client Url: https://launchpad.net/gwibber @@ -39,12 +39,14 @@ Requires: %{name}-lang = %{version} Requires: dbus-1-python Requires: python-curl +Requires: python-couchdb Requires: python-desktopcouch Requires: python-egenix-mx-base Requires: python-feedparser Requires: python-imaging Requires: python-mako Requires: python-notify +Requires: python-oauth Requires: python-simplejson Requires: python-webkitgtk Requires: python-xdg ++++++ gwibber-2.29.92.tar.bz2 -> gwibber-2.29.94.tar.bz2 ++++++ ++++ 4088 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

1 0

commit ladspa for openSUSE:Factory
by root＠Hilbert.suse.de 02 Apr '10

02 Apr '10

Hello community, here is the log from the commit of package ladspa for openSUSE:Factory checked in at Sat Apr 3 00:20:57 CEST 2010. -------- --- ladspa/ladspa-devel.changes 2008-02-13 13:49:03.000000000 +0100 +++ /mounts/work_src_done/STABLE/ladspa/ladspa-devel.changes 2010-01-21 08:26:21.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Jan 21 07:27:40 UTC 2010 - davejplater(a)gmail.com + +- Update to 1.13 + +------------------------------------------------------------------- --- ladspa/ladspa.changes 2009-11-25 15:53:16.000000000 +0100 +++ /mounts/work_src_done/STABLE/ladspa/ladspa.changes 2010-03-22 06:17:02.000000000 +0100 @@ -1,0 +2,34 @@ +Mon Mar 22 05:12:28 UTC 2010 - davejplater(a)gmail.com + +- Add swh-configure-2.65.patch for autoconf-2.65 build + +------------------------------------------------------------------- +Tue Jan 26 07:21:56 UTC 2010 - davejplater(a)gmail.com + +- Fixed swt lib build with swh-liblo.dif & swh-configure.patch + +------------------------------------------------------------------- +Fri Jan 22 08:52:05 UTC 2010 - davejplater(a)gmail.com + +- Update plugins to AMB-plugins-0.6.1, FIL-plugins-0.3.0, + MCP-plugins-0.4.0, caps_0.4.4, pvoc_0.1.12, tap-plugins-0.7.1 and + vocoder-ladspa-0.3. +- Fix tap-type-punning-fix.dif + +------------------------------------------------------------------- +Thu Jan 21 07:00:52 UTC 2010 - davejplater(a)gmail.com + +- Update to ladspa-1.13 +- Removed ladspa_sdk-compile-fix.diff and adapted ladspa.dif +- Moved examples directory to {_docdir}/{name}/examples +- Updated "License: LGPL2.1+" +- Version 1.13 - 6 Nov 2007 + + • Fix compile error in sine.cpp (GCC4). + • Fix typo in text output by analyseplugin. + • Extra usage text in analyseplugin and applyplugin. + • Replace strdup() with localStrdup() in sine.cpp to avoid malloc/new + mismatch. + • Remove "local" part from install directories. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- AMB-plugins-0.0.1.tar.bz2 FIL-plugins-0.0.1.tar.bz2 MCP-plugins-0.3.0.tar.bz2 caps_0.4.2.tar.bz2 ladspa_sdk-compile-fix.diff ladspa_sdk_1.12.tar.bz2 pvoc-0.1.10-gcc4-fix.diff pvoc_0.1.10.tar.bz2 tap-plugins-0.7.0.tar.bz2 vocoder-ladspa-0.2.tar.bz2 New: ---- AMB-plugins-0.6.1.tar.bz2 FIL-plugins-0.3.0.tar.bz2 MCP-plugins-0.4.0.tar.bz2 caps_0.4.4.tar.bz2 ladspa_sdk_1.13.tar.bz2 pvoc_0.1.12.tar.bz2 swh-configure-2.65.patch swh-configure.patch swh-libblo.dif tap-plugins-0.7.1.tar.bz2 vocoder-ladspa-0.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ladspa-devel.spec ++++++ --- /var/tmp/diff_new_pack.RKtF0t/_old 2010-04-03 00:20:43.000000000 +0200 +++ /var/tmp/diff_new_pack.RKtF0t/_new 2010-04-03 00:20:43.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package ladspa-devel (Version 1.12.code10.3) +# spec file for package ladspa-devel (Version 1.13) # -# 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 @@ -19,15 +19,16 @@ Name: ladspa-devel -Summary: Include Files mandatory for Development. -Version: 1.12.code10.3 -Release: 106 -License: GPLv2+ +Summary: Include Files mandatory for Development +Version: 1.13 +Release: 1 +License: LGPLv2.1+ Group: Development/Libraries/C and C++ -Source: ladspa_sdk_1.12.tar.bz2 +Source: ladspa_sdk_1.13.tar.bz2 Url: http://www.ladspa.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch +Provides: ladspa-devel > 1.12.code10.3.1 %description This package contains include files to develop LADSPA plugins. ++++++ ladspa.spec ++++++ --- /var/tmp/diff_new_pack.RKtF0t/_old 2010-04-03 00:20:43.000000000 +0200 +++ /var/tmp/diff_new_pack.RKtF0t/_new 2010-04-03 00:20:43.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package ladspa (Version 1.12.code10.3.1) +# spec file for package ladspa (Version 1.13) # -# 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 @@ -19,31 +19,32 @@ Name: ladspa -BuildRequires: fdupes fftw-devel fftw3-devel flac-devel gcc-c++ ladspa-devel libsndfile-devel pkgconfig -%define swh_version 0.4.15 -%define vocoder_version 0.2 +BuildRequires: fdupes fftw-devel fftw3-devel flac-devel gcc-c++ ladspa-devel libsndfile-devel pkgconfig xorg-x11-util-devel +%define AMB_version 0.6.1 +%define FIL_version 0.3.0 +%define MCP_version 0.4.0 +%define REV_version 0.3.1 +%define VCO_version 0.3.0 %define alienwah_version 1.13 -%define sooperlooper_version 0.93 +%define blepvco_version 0.1.0 %define blop_version 0.2.8 +%define caps_version 0.4.4 +%define pvoc_version 0.1.12 +%define sooperlooper_version 0.93 +%define swh_version 0.4.15 +%define tap_version 0.7.1 %define vcf_version 0.0.5 %define vlevel_version 0.5 -%define MCP_version 0.3.0 -%define REV_version 0.3.1 -%define VCO_version 0.3.0 -%define FIL_version 0.0.1 -%define AMB_version 0.0.1 -%define tap_version 0.7.0 -%define caps_version 0.4.2 -%define pvoc_version 0.1.10 -%define blepvco_version 0.1.0 +%define vocoder_version 0.3 Summary: The Linux Audio Developer's Simple Plug-In API -Version: 1.12.code10.3.1 -Release: 120 -License: GPLv2+ +Version: 1.13 +Release: 1 +License: LGPLv2.1+ Group: Development/Libraries/C and C++ AutoReq: on Autoprov: off -Source1: ladspa_sdk_1.12.tar.bz2 +Provides: ladspa > 1.12.code10.3.1 +Source1: ladspa_sdk_1.13.tar.bz2 Source2: cmt_src_1.15.tar.bz2 Source3: swh-plugins-%{swh_version}.tar.bz2 Source4: ladspa-swh.tex @@ -86,8 +87,13 @@ Patch16: pvoc-compile-fix.dif Patch17: swh-0.4.13-gcc4-fix.diff Patch18: sooperlooper-0.93-gcc4-fix.diff -Patch20: pvoc-0.1.10-gcc4-fix.diff -Patch21: ladspa_sdk-compile-fix.diff +Patch20: swh-libblo.dif +# swh-configure.patch changes for >= autoconf-2.65 in openSUSE 11.3 +%if %suse_version <= 1120 +Patch21: swh-configure.patch +%else +Patch21: swh-configure-2.65.patch +%endif Patch22: alienwah-compile-fix.diff Patch23: alienwah-float_complex.diff Patch25: pvoc-0.1.10-depend-copts-fix.diff @@ -129,14 +135,16 @@ # %setup -q -c -n ladspa -T -a 1 -a 2 -a 3 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19 -a 20 -a 21 -a 22 -a 23 -a 24 %patch -(cd ladspa_sdk -%patch21 -) (cd swh-plugins-%{swh_version} %patch1 %patch15 %patch17 %patch26 -p1 +%patch20 -p1 +touch config.rpath +./autogen.sh --prefix=%{_prefix} +%{?suse_update_config:%{suse_update_config -f}} +%patch21 -p 1 ) (cd cmt %patch2 @@ -153,6 +161,7 @@ %patch6 %patch27 %patch28 +%{?suse_update_config:%{suse_update_config -f}} ) (cd vcf-%{vcf_version} %patch7 @@ -180,11 +189,8 @@ ) (cd pvoc-%{pvoc_version} %patch16 -%patch20 %patch25 ) -# (cd caps-%{caps_version} -# ) %build # This package failed when testing with -Wl,-as-needed being default. @@ -192,98 +198,101 @@ export SUSE_ASNEEDED=0 # LADSPA SDK cd ladspa_sdk/src -make CFLAGS="$RPM_OPT_FLAGS -fPIC" targets +make CFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb" targets cd ../.. # CMT cd cmt/src -make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC" targets +make CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC -ggdb" targets cd ../.. # SWH plugins cd swh-plugins-%{swh_version} +%if %suse_version <= 1100 autoreconf --install --force -CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC -fno-strict-aliasing" \ +%endif +#./autogen.sh --prefix=%{_prefix} --libdir=%{_libdir} +CFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb -DPIC -fno-strict-aliasing" \ ./configure --prefix=%{_prefix} -make CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC -fno-strict-aliasing" +make CFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb -DPIC -fno-strict-aliasing" cd .. # Vocoder cd vocoder-%{vocoder_version} -make CFLAGS="$RPM_OPT_FLAGS -fPIC" +make CFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb" cd .. # Alien Wah cd alienwah-%{alienwah_version} -make CFLAGS="$RPM_OPT_FLAGS -fPIC" +make CFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb" cd .. # Sooperlooper cd sooperlooper-%{sooperlooper_version} -make CFLAGS="$RPM_OPT_FLAGS -fPIC" +make CFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb" cd .. # Blop cd blop-%{blop_version} -autoreconf --install --force +#autoreconf --install --force ./configure --prefix=%{_prefix} \ --with-ladspa-plugin-dir=%{_libdir}/ladspa -make CFLAGS="$RPM_OPT_FLAGS -DNO_DEBUG -DPIC -fPIC" +make CFLAGS="$RPM_OPT_FLAGS -DNO_DEBUG -DPIC -fPIC -ggdb" cd .. # VCF cd vcf-%{vcf_version} -make CFLAGS="$RPM_OPT_FLAGS -fPIC" +make CFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb" cd .. # unmatched cd unmatched -make CFLAGS="$RPM_OPT_FLAGS -fPIC" +make CFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb" cd .. # matched cd matched -make CFLAGS="$RPM_OPT_FLAGS -fPIC" +make CFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb" cd .. # preamp cd preamp -make CFLAGS="$RPM_OPT_FLAGS -fPIC -fno-strict-aliasing" \ - CXXFLAGS="$RPM_OPT_FLAGS -fPIC -fno-strict-aliasing" +make CFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb -fno-strict-aliasing" \ + CXXFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb -fno-strict-aliasing" cd .. # MCP plugins cd MCP-plugins-%{MCP_version} -make CXXFLAGS="$RPM_OPT_FLAGS -fPIC" +make CXXFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb" cd .. # REV plugins cd REV-plugins-%{REV_version} -make CXXFLAGS="$RPM_OPT_FLAGS -fPIC" +make CXXFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb" cd .. # VCO plugins cd VCO-plugins-%{VCO_version} -make CXXFLAGS="$RPM_OPT_FLAGS -fPIC" +make CXXFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb" cd .. # vlevel cd vlevel-%{vlevel_version} -make CXXFLAGS="$RPM_OPT_FLAGS -fPIC" +make CXXFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb" cd .. # tap-plugins cd tap-plugins-%{tap_version} -make CFLAGS="$RPM_OPT_FLAGS -fPIC -c" +make CFLAGS="$RPM_OPT_FLAGS -fPIC -ggdb -c" cd .. # super-60 cd super-60 -make CFLAGS="$RPM_OPT_FLAGS -fPIC" +make CFLAGS="$RPM_OPT_FLAGS -ggdb -fPIC" cd .. # caps cd caps-%{caps_version} -make CFLAGS="$RPM_OPT_FLAGS -fPIC" +make CFLAGS="$RPM_OPT_FLAGS -ggdb -fPIC" cd .. # FIL plugins cd FIL-plugins-%{FIL_version} -make CXXFLAGS="$RPM_OPT_FLAGS -fPIC" +make CXXFLAGS="$RPM_OPT_FLAGS -ggdb -fPIC" cd .. # AMB plugins cd AMB-plugins-%{AMB_version} -make CXXFLAGS="$RPM_OPT_FLAGS -fPIC" +make CXXFLAGS="$RPM_OPT_FLAGS -ggdb -fPIC" cd .. # pvoc plugins cd pvoc-%{pvoc_version} -make OPTS="$RPM_OPT_FLAGS -fPIC" +make OPTS="$RPM_OPT_FLAGS -ggdb -fPIC" cd .. # blepvco cd blepvco-%{blepvco_version} -make CPPFLAGS="$RPM_OPT_FLAGS -fPIC" +make CPPFLAGS="$RPM_OPT_FLAGS -ggdb -fPIC" cd .. %install @@ -333,7 +342,8 @@ mkdir -p "$RPM_BUILD_ROOT"%{_bindir} install -c -m 755 vlevel-%{vlevel_version}/vlevel-bin "$RPM_BUILD_ROOT"%{_bindir} # additional RDF files -cp %{SOURCE30} $RPM_BUILD_ROOT%{_datadir}/ladspa/rdf +mkdir -p $RPM_BUILD_ROOT%{_datadir}/ladspa/rdf +cp -p %{SOURCE30} $RPM_BUILD_ROOT%{_datadir}/ladspa/rdf cp tap-plugins-%{tap_version}/*.rdf $RPM_BUILD_ROOT%{_datadir}/ladspa/rdf # install documents mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}/{cmt,swh,vcf} @@ -373,8 +383,8 @@ cp %{SOURCE4} %{SOURCE5} $RPM_BUILD_ROOT%{_docdir}/%{name}/swh cp %{SOURCE50} $RPM_BUILD_ROOT%{_docdir}/%{name}/vcf cp -av vlevel-%{vlevel_version}/docs $RPM_BUILD_ROOT%{_docdir}/%{name}/vlevel -mkdir -p $RPM_BUILD_ROOT%{_docdir}/examples/vlevel -cp -av vlevel-%{vlevel_version}/utils/* $RPM_BUILD_ROOT%{_docdir}/examples/vlevel +mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}/examples/vlevel +cp -av vlevel-%{vlevel_version}/utils/* $RPM_BUILD_ROOT%{_docdir}/%{name}/examples/vlevel chmod 644 $RPM_BUILD_ROOT%{_docdir}/%{name}/cmt/plugins.html # remove incldue file (already in devel package) rm -f $RPM_BUILD_ROOT%{_includedir}/* @@ -387,7 +397,7 @@ %files -f %{name}.lang %defattr(-,root,root) %doc %{_docdir}/%{name} -%doc %{_docdir}/examples +%doc %{_docdir}/%{name}/examples %{_libdir}/ladspa %{_bindir}/* %{_datadir}/ladspa ++++++ AMB-plugins-0.0.1.tar.bz2 -> AMB-plugins-0.6.1.tar.bz2 ++++++ ++++ 5640 lines of diff (skipped) ++++++ FIL-plugins-0.0.1.tar.bz2 -> FIL-plugins-0.3.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FIL-plugins-0.0.1/AUTHORS new/FIL-plugins-0.3.0/AUTHORS --- old/FIL-plugins-0.0.1/AUTHORS 2004-05-09 23:54:24.000000000 +0200 +++ new/FIL-plugins-0.3.0/AUTHORS 2009-06-09 22:13:39.000000000 +0200 @@ -1 +1 @@ -Fons Adriaensen <fons.adriaensen(a)skynet.be> +Fons Adriaensen <fons(a)kokkinizita.net> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FIL-plugins-0.0.1/Makefile new/FIL-plugins-0.3.0/Makefile --- old/FIL-plugins-0.0.1/Makefile 2004-05-08 23:25:51.000000000 +0200 +++ new/FIL-plugins-0.3.0/Makefile 2009-06-09 22:13:12.000000000 +0200 @@ -1,3 +1,19 @@ +# Copyright (C) 2004-2009 Fons Adriaensen <fons(a)kokkinizita.net> +# +# 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 of the License, 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., 675 Mass Ave, Cambridge, MA 02139, USA. + CPPFLAGS += -I. -fPIC -D_REENTRANT -Wall -O3 @@ -11,17 +27,9 @@ filters.o: ladspaplugin.h filters.h filters_if.o: ladspaplugin.h filters.h - -install: +install: all cp *.so /usr/lib/ladspa - -DIR := $(shell basename `pwd`) - -archive: clean - cd ..; /bin/rm -f $(DIR).tar.bz2; tar cvf $(DIR).tar $(DIR); bzip2 $(DIR).tar - - clean: /bin/rm -f *~ *.o *.so diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FIL-plugins-0.0.1/exp2ap.cc new/FIL-plugins-0.3.0/exp2ap.cc --- old/FIL-plugins-0.0.1/exp2ap.cc 2003-12-01 21:18:18.000000000 +0100 +++ new/FIL-plugins-0.3.0/exp2ap.cc 2009-06-09 22:12:14.000000000 +0200 @@ -1,3 +1,22 @@ +/* + Copyright (C) 2004-2009 Fons Adriaensen <fons(a)kokkinizita.net> + + 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 of the License, 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., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + + #include <math.h> @@ -5,10 +24,9 @@ { int i; - i = (int)(floor (x)); + i = (int)(floorf (x)); x -= i; -// return ldexp (1 + x * (0.66 + 0.34 * x), i); - return ldexp (1 + x * (0.6930 + x * (0.2416 + x * (0.0517 + x * 0.0137))), i); + return ldexpf (1 + x * (0.6930f + x * (0.2416f + x * (0.0517f + x * 0.0137f))), i); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FIL-plugins-0.0.1/filters.cc new/FIL-plugins-0.3.0/filters.cc --- old/FIL-plugins-0.0.1/filters.cc 2004-05-11 23:39:42.000000000 +0200 +++ new/FIL-plugins-0.3.0/filters.cc 2009-06-09 22:10:59.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 Fons Adriaensen + Copyright (C) 2004-2009 Fons Adriaensen <fons(a)kokkinizita.net> 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 @@ -46,7 +46,7 @@ int i, j, k; float *aip = _port [AIP]; float *aop = _port [AOP]; - float *p, sig [32]; + float *p, sig [48]; float t, g, d; float fgain; float sfreq [NSECT]; @@ -61,7 +61,7 @@ if (t > 0.4998) t = 0.4998; sfreq [j] = t; sband [j] = _port [SECT + 4 * j + Paramsect::BAND][0]; - if (_port [SECT + 4 * j + Paramsect::SECT][0]) sgain [j] = exp2ap (0.1661 * _port [SECT + 4 * j + Paramsect::GAIN][0]); + if (_port [SECT + 4 * j + Paramsect::SECT][0] > 0) sgain [j] = exp2ap (0.1661 * _port [SECT + 4 * j + Paramsect::GAIN][0]); else sgain [j] = 1.0; } @@ -86,7 +86,7 @@ j = _fade; g = j / 16.0; p = 0; - if (_port [FILT][0]) + if (_port [FILT][0] > 0) { if (j == 16) p = sig; else ++j; @@ -113,5 +113,3 @@ } } - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FIL-plugins-0.0.1/filters.h new/FIL-plugins-0.3.0/filters.h --- old/FIL-plugins-0.0.1/filters.h 2004-05-11 23:38:20.000000000 +0200 +++ new/FIL-plugins-0.3.0/filters.h 2009-06-09 22:10:49.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 Fons Adriaensen + Copyright (C) 2004-2009 Fons Adriaensen <fons(a)kokkinizita.net> 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 @@ -32,44 +32,57 @@ void init (void) { - _f = 0.25; - _b = _g = 1.0; - _a = _s1 = _s2 = _z1 = _z2 = 0.0; + _f = 0.25f; + _b = _g = 1.0f; + _a = _s1 = _s2 = _z1 = _z2 = 0.0f; } void proc (int k, float *sig, float f, float b, float g) { float s1, s2, d1, d2, a, da, x, y; + bool u2 = false; - if (f < 0.5 * _f) f = 0.5 * _f; - else if (f > 2.0 * _f) f = 2.0 * _f; s1 = _s1; + s2 = _s2; + a = _a; d1 = 0; + d2 = 0; + da = 0; + if (f != _f) { + if (f < 0.5f * _f) f = 0.5f * _f; + else if (f > 2.0f * _f) f = 2.0f * _f; _f = f; - _s1 = -cos (2 * M_PI * f); + _s1 = -cosf (6.283185f * f); d1 = (_s1 - s1) / k; + u2 = true; } - if (g < 0.5 * _g) g = 0.5 * _g; - else if (g > 2.0 * _g) g = 2.0 * _g; - a = _a; - da = 0; if (g != _g) { + if (g < 0.5f * _g) g = 0.5f * _g; + else if (g > 2.0f * _g) g = 2.0f * _g; _g = g; - _a = 0.5 * (g - 1.0); + _a = 0.5f * (g - 1.0f); da = (_a - a) / k; + u2 = true; } - if (b < 0.5 * _b) b = 0.5 * _b; - else if (b > 2.0 * _b) b = 2.0 * _b; - _b = b; - b *= 4 * f; - s2 = _s2; - _s2 = (1 + _a - b) / (1 + _a + b); - d2 = (_s2 - s2) / k; + if (b != _b) + { + if (b < 0.5f * _b) b = 0.5f * _b; + else if (b > 2.0f * _b) b = 2.0f * _b; + _b = b; + u2 = true; + } + + if (u2) + { + b *= 7 * f / sqrtf (g); + _s2 = (1 - b) / (1 + b); + d2 = (_s2 - s2) / k; + } while (k--) { @@ -81,7 +94,7 @@ *sig++ -= a * (_z2 + s2 * y - x); y -= s1 * _z1; _z2 = _z1 + s1 * y; - _z1 = y + 1e-10; + _z1 = y + 1e-10f; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/FIL-plugins-0.0.1/filters_if.cc new/FIL-plugins-0.3.0/filters_if.cc --- old/FIL-plugins-0.0.1/filters_if.cc 2004-05-09 15:34:10.000000000 +0200 +++ new/FIL-plugins-0.3.0/filters_if.cc 2009-06-09 22:11:09.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 Fons Adriaensen + Copyright (C) 2004-2009 Fons Adriaensen <fons(a)kokkinizita.net> 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 @@ -23,10 +23,10 @@ #include "filters.h" #define NMODS 1 -#define VERSION "0.0.1" +#define VERSION "0.3.0" -static const char* maker = "Fons Adriaensen <fons.adriaensen(a)alcatel.be>"; +static const char* maker = "Fons Adriaensen <fons(a)kokkinizita.net>"; static const char* copyr = "GPL"; @@ -103,6 +103,7 @@ LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL }; + static const char * const pname0 [Ladspa_Paramfilt::NPORT] = { "Input", @@ -127,27 +128,28 @@ "Gain 4" }; + static const LADSPA_PortRangeHint phint0 [Ladspa_Paramfilt::NPORT] = { { 0, 0, 0 }, { 0, 0, 0 }, - { LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE | LADSPA_HINT_INTEGER | LADSPA_HINT_TOGGLED, 0, 1 }, + { LADSPA_HINT_TOGGLED | LADSPA_HINT_DEFAULT_0, 0, 1 }, { LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE | LADSPA_HINT_DEFAULT_0, -20, 20 }, - { LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE | LADSPA_HINT_INTEGER | LADSPA_HINT_TOGGLED, 0, 1 }, - { LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE | LADSPA_HINT_LOGARITHMIC | LADSPA_HINT_DEFAULT_MIDDLE, 20, 2e3 }, - { LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE | LADSPA_HINT_LOGARITHMIC | LADSPA_HINT_DEFAULT_1, 0.125, 8 }, + { LADSPA_HINT_TOGGLED | LADSPA_HINT_DEFAULT_0, 0, 1 }, + { LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE | LADSPA_HINT_LOGARITHMIC | LADSPA_HINT_DEFAULT_MIDDLE, 2e1f, 2e3f }, + { LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE | LADSPA_HINT_LOGARITHMIC | LADSPA_HINT_DEFAULT_1, 0.125f, 8.0f }, { LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE | LADSPA_HINT_DEFAULT_0, -20, 20 }, - { LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE | LADSPA_HINT_INTEGER | LADSPA_HINT_TOGGLED, 0, 1 }, - { LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE | LADSPA_HINT_LOGARITHMIC | LADSPA_HINT_DEFAULT_MIDDLE, 40, 4e3 }, - { LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE | LADSPA_HINT_LOGARITHMIC | LADSPA_HINT_DEFAULT_1, 0.125, 8 }, + { LADSPA_HINT_TOGGLED | LADSPA_HINT_DEFAULT_0, 0, 1 }, + { LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE | LADSPA_HINT_LOGARITHMIC | LADSPA_HINT_DEFAULT_MIDDLE, 4e1f, 4e3f }, + { LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE | LADSPA_HINT_LOGARITHMIC | LADSPA_HINT_DEFAULT_1, 0.125f, 8.0f }, { LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE | LADSPA_HINT_DEFAULT_0, -20, 20 }, - { LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE | LADSPA_HINT_INTEGER | LADSPA_HINT_TOGGLED, 0, 1 }, - { LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE | LADSPA_HINT_LOGARITHMIC | LADSPA_HINT_DEFAULT_MIDDLE, 100, 10e3 }, - { LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE | LADSPA_HINT_LOGARITHMIC | LADSPA_HINT_DEFAULT_1, 0.125, 8 }, + { LADSPA_HINT_TOGGLED | LADSPA_HINT_DEFAULT_0, 0, 1 }, + { LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE | LADSPA_HINT_LOGARITHMIC | LADSPA_HINT_DEFAULT_MIDDLE, 1e2f, 1e4f }, + { LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE | LADSPA_HINT_LOGARITHMIC | LADSPA_HINT_DEFAULT_1, 0.125f, 8.0f }, { LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE | LADSPA_HINT_DEFAULT_0, -20, 20 }, - { LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE | LADSPA_HINT_INTEGER | LADSPA_HINT_TOGGLED, 0, 1 }, - { LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE | LADSPA_HINT_LOGARITHMIC | LADSPA_HINT_DEFAULT_MIDDLE, 200, 20e3 }, - { LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE | LADSPA_HINT_LOGARITHMIC | LADSPA_HINT_DEFAULT_1, 0.125, 8 }, + { LADSPA_HINT_TOGGLED | LADSPA_HINT_DEFAULT_0, 0, 1 }, + { LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE | LADSPA_HINT_LOGARITHMIC | LADSPA_HINT_DEFAULT_MIDDLE, 2e2f, 2e4f }, + { LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE | LADSPA_HINT_LOGARITHMIC | LADSPA_HINT_DEFAULT_1, 0.125f, 8.0f }, { LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE | LADSPA_HINT_DEFAULT_0, -20, 20 } }; @@ -177,6 +179,7 @@ } }; + extern "C" const LADSPA_Descriptor *ladspa_descriptor (unsigned long i) { if (i >= NMODS) return 0; ++++++ MCP-plugins-0.3.0.tar.bz2 -> MCP-plugins-0.4.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MCP-plugins-0.3.0/AUTHORS new/MCP-plugins-0.4.0/AUTHORS --- old/MCP-plugins-0.3.0/AUTHORS 2003-12-01 21:18:18.000000000 +0100 +++ new/MCP-plugins-0.4.0/AUTHORS 2007-08-27 18:27:12.000000000 +0200 @@ -1 +1 @@ -Fons Adriaensen <fons.adriaensen(a)alcatel.be> +Fons Adriaensen <fons(a)kokkinizita.net> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MCP-plugins-0.3.0/Makefile new/MCP-plugins-0.4.0/Makefile --- old/MCP-plugins-0.3.0/Makefile 2004-03-12 21:56:29.000000000 +0100 +++ new/MCP-plugins-0.4.0/Makefile 2008-04-05 20:05:45.000000000 +0200 @@ -1,4 +1,21 @@ -CPPFLAGS += -I. -fPIC -D_REENTRANT -Wall -O4 +# Copyright (C) 2003-2008 Fons Adriaensen <fons(a)kokkinizita.net> +# +# 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 of the License, 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., 675 Mass Ave, Cambridge, MA 02139, USA. + + +CPPFLAGS += -I. -fPIC -D_REENTRANT -Wall -O3 all: mvclpf24.so mvchpf24.so cs_phaser.so cs_chorus.so @@ -32,14 +49,14 @@ cs_chorus_if.o: ladspaplugin.h cs_chorus.h -install: +install: all cp *.so /usr/lib/ladspa DIR := $(shell basename `pwd`) archive: clean - cd ..; /bin/rm -f $(DIR).tar.bz2; tar cvf $(DIR).tar $(DIR); bzip2 $(DIR).tar + cd ..; /bin/rm -f $(DIR).tar.bz2; tar cvjf $(DIR).tar.bz2 $(DIR) clean: /bin/rm -f *~ *.o *.so diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MCP-plugins-0.3.0/README new/MCP-plugins-0.4.0/README --- old/MCP-plugins-0.3.0/README 2004-04-09 22:01:05.000000000 +0200 +++ new/MCP-plugins-0.4.0/README 2008-04-05 20:00:38.000000000 +0200 @@ -1,6 +1,6 @@ ----------------------------------------------------------------------------------- - Copyright (C) 2003 Fons Adriaensen + Copyright (C) 2003-2008 Fons Adriaensen <fons(a)kokkinizita.net> 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 @@ -20,6 +20,12 @@ -------------------------------------------- +cs_phaser.so -- version 0.4.0 - 5/4/2008 +-------------------------------------------- + +Code cleanup. + +-------------------------------------------- cs_phaser.so -- version 0.3.0 - 10/4/2004 -------------------------------------------- @@ -47,6 +53,15 @@ -------------------------------------------- +cs_chorus.so -- version 0.4.0 - 5/4/2008 +-------------------------------------------- + +Code cleanup and triple output version added. +The third one is as the second, but has three +separate outputs. Pan L,C,R for a nice stereo +effect. + +-------------------------------------------- cs_chorus.so -- version 0.3.0 - 10/4/2004 -------------------------------------------- -------------------------------------------- @@ -58,12 +73,19 @@ that are 120 degrees apart in phase. The summed outputs modulate three delay lines. Make sure the static delay (first parameter) is at least equal to the sum of the two modulation depths. -The two versions are functionally identical. The second one upsamples +The two plugins are functionally identical. The second one upsamples the input to the delay lines in an attempt to mitigate the errors produced by the linear interpolation at the output. If you hear any difference please let me know which one you prefer. + +-------------------------------------------- +mvclpf24.so -- version 0.4.0 - 5/4/2008 +-------------------------------------------- + +Code cleanup. + -------------------------------------------- mvclpf24.so -- version 0.3.0 - 10/4/2004 -------------------------------------------- @@ -160,6 +182,12 @@ -------------------------------------------- +mvclpf24.so -- version 0.4.0 - 5/4/2008 +-------------------------------------------- + +Code cleanup. + +-------------------------------------------- mvchpf24.so -- First release - 10/4/2004 -------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MCP-plugins-0.3.0/cs_chorus.cc new/MCP-plugins-0.4.0/cs_chorus.cc --- old/MCP-plugins-0.3.0/cs_chorus.cc 2003-12-06 22:27:49.000000000 +0100 +++ new/MCP-plugins-0.4.0/cs_chorus.cc 2008-04-05 20:02:00.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2003 Fons Adriaensen + Copyright (C) 2003-2008 Fons Adriaensen <fons(a)kokkinizita.net> 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 @@ -64,8 +64,8 @@ int j; float *p0, *p1; float t, x, y; - p0 = _port [0]; - p1 = _port [1]; + p0 = _port [INPUT]; + p1 = _port [OUTPUT]; wi = _wi; do @@ -74,33 +74,33 @@ { _gi = 64; - t = 402.12 * _port [3][0] / _fsam; + t = 402.12f * _port [FREQ1][0] / _fsam; x = _x1 - t * _y1; y = _y1 + t * _x1; - t = sqrt (x * x + y * y); + t = sqrtf (x * x + y * y); _x1 = x / t; _y1 = y / t; - t = 402.12 * _port [5][0] / _fsam; + t = 402.12f * _port [FREQ2][0] / _fsam; x = _x2 - t * _y2; y = _y2 + t * _x2; - t = sqrt (x * x + y * y); + t = sqrtf (x * x + y * y); _x2 = x / t; _y2 = y / t; - x = _port [4][0] * _x1 + _port [6][0] * _x2; - y = _port [4][0] * _y1 + _port [6][0] * _y2; + x = _port [TMOD1][0] * _x1 + _port [TMOD2][0] * _x2; + y = _port [TMOD1][0] * _y1 + _port [TMOD2][0] * _y2; _dr [0] = x; - _dr [1] = -0.500 * x + 0.866 * y; - _dr [2] = -0.500 * x - 0.866 * y; + _dr [1] = -0.500f * x + 0.866f * y; + _dr [2] = -0.500f * x - 0.866f * y; for (j = 0; j < 3; j++) { - t = _port [2][0] + _dr [j]; + t = _port [DELAY][0] + _dr [j]; if (t < 0) t = 0; if (t > 30) t = 30; - t *= _fsam / 1000.0; + t *= _fsam / 1000.0f; _dr [j] = (t - _ri [j]) / 64; } } @@ -118,11 +118,11 @@ x = wi - _ri [j]; _ri [j] += _dr [j]; if (x < 0) x += _size; - i = (int)(floor (x)); + i = (int)(floorf (x)); x -= i; y += (1 - x) * _line [i] + x * _line [i + 1]; } - y *= 0.333; + y *= 0.333f; if (add) *p1++ += y * _gain; else *p1++ = y; @@ -180,8 +180,8 @@ float *p0, *p1; float a, b, t, x, y; - p0 = _port [0]; - p1 = _port [1]; + p0 = _port [INPUT]; + p1 = _port [OUTPUT]; wi = _wi; a = _a; @@ -192,33 +192,33 @@ { _gi = 64; - t = 402.12 * _port [3][0] / _fsam; + t = 402.12f * _port [FREQ1][0] / _fsam; x = _x1 - t * _y1; y = _y1 + t * _x1; - t = sqrt (x * x + y * y); + t = sqrtf (x * x + y * y); _x1 = x / t; _y1 = y / t; - t = 402.12 * _port [5][0] / _fsam; + t = 402.12f * _port [FREQ2][0] / _fsam; x = _x2 - t * _y2; y = _y2 + t * _x2; - t = sqrt (x * x + y * y); + t = sqrtf (x * x + y * y); _x2 = x / t; _y2 = y / t; - x = _port [4][0] * _x1 + _port [6][0] * _x2; - y = _port [4][0] * _y1 + _port [6][0] * _y2; + x = _port [TMOD1][0] * _x1 + _port [TMOD2][0] * _x2; + y = _port [TMOD1][0] * _y1 + _port [TMOD2][0] * _y2; _dr [0] = x; - _dr [1] = -0.500 * x + 0.866 * y; - _dr [2] = -0.500 * x - 0.866 * y; + _dr [1] = -0.500f * x + 0.866f * y; + _dr [2] = -0.500f * x - 0.866f * y; for (j = 0; j < 3; j++) { - t = _port [2][0] + _dr [j]; + t = _port [DELAY][0] + _dr [j]; if (t < 0) t = 0; if (t > 30) t = 30; - t *= _fsam / 500.0; + t *= _fsam / 500.0f; _dr [j] = (t - _ri [j]) / 64; } } @@ -229,12 +229,12 @@ while (k--) { - x = *p0++ + 0.52 * a - 0.25 * b; - _line [++wi] = 0.5 * (x + b) + a; + x = *p0++ + 0.52f * a - 0.25f * b; + _line [++wi] = 0.5f * (x + b) + a; b = a; a = x; - x = 0.52 * a - 0.25 * b; - _line [++wi] = 0.5 * (x + b) + a; + x = 0.52f * a - 0.25f * b; + _line [++wi] = 0.5f * (x + b) + a; b = a; a = x; @@ -244,17 +244,159 @@ x = wi - _ri [j]; _ri [j] += _dr [j]; if (x < 0) x += _size; - i = (int)(floor (x)); + i = (int)(floorf (x)); x -= i; y += (1 - x) * _line [i] + x * _line [i + 1]; } - y *= 0.333; + y *= 0.333f; if (add) *p1++ += y * _gain; else *p1++ = y; } if (wi == _size) _line [wi = 0] = _line [_size]; } + while (len); + + _wi = wi; + _a = a; + _b = b; +} + + + + +Ladspa_CS_chorus3::Ladspa_CS_chorus3 (unsigned long fsam) : LadspaPlugin (fsam) +{ + _size = (unsigned long)(ceil (30 * fsam / 500.0)) + 192; + _size = (_size >> 6) << 6; + _line = new float [_size + 1]; +} + + +Ladspa_CS_chorus3::~Ladspa_CS_chorus3 (void) +{ + delete[] _line; +} + + +void Ladspa_CS_chorus3::setport (unsigned long port, LADSPA_Data *data) +{ + _port [port] = data; +} + + +void Ladspa_CS_chorus3::active (bool act) +{ + unsigned int i; + + if (act) + { + _wi = _gi = 0; + _x1 = _x2 = 1; + _y1 = _y2 = 0; + _a = _b = 0; + memset (_line, 0, (_size + 1) * sizeof (float)); + for (i = 0; i < 3; i++) _ri [i] = _dr [i] = 0; + } +} + + +void Ladspa_CS_chorus3::runproc (unsigned long len, bool add) +{ + unsigned long i, k, wi; + int j; + float *p0, *p1, *p2, *p3; + float a, b, t, x, y; + + p0 = _port [INPUT]; + p1 = _port [OUTPUT1]; + p2 = _port [OUTPUT2]; + p3 = _port [OUTPUT3]; + + wi = _wi; + a = _a; + b = _b; + do + { + if (_gi == 0) + { + _gi = 64; + + t = 402.12f * _port [FREQ1][0] / _fsam; + x = _x1 - t * _y1; + y = _y1 + t * _x1; + t = sqrtf (x * x + y * y); + _x1 = x / t; + _y1 = y / t; + + t = 402.12f * _port [FREQ2][0] / _fsam; + x = _x2 - t * _y2; + y = _y2 + t * _x2; + t = sqrtf (x * x + y * y); + _x2 = x / t; + _y2 = y / t; + + x = _port [TMOD1][0] * _x1 + _port [TMOD2][0] * _x2; + y = _port [TMOD1][0] * _y1 + _port [TMOD2][0] * _y2; + + _dr [0] = x; + _dr [1] = -0.500f * x + 0.866f * y; + _dr [2] = -0.500f * x - 0.866f * y; + + for (j = 0; j < 3; j++) + { + t = _port [DELAY][0] + _dr [j]; + if (t < 0) t = 0; + if (t > 30) t = 30; + t *= _fsam / 500.0f; + _dr [j] = (t - _ri [j]) / 64; + } + } + + k = (_gi < len) ? _gi : len; + _gi -= k; + len -= k; + + while (k--) + { + x = *p0++ + 0.52f * a - 0.25f * b; + _line [++wi] = 0.5f * (x + b) + a; + b = a; + a = x; + x = 0.52f * a - 0.25f * b; + _line [++wi] = 0.5f * (x + b) + a; + b = a; + a = x; + + x = wi - _ri [0]; + _ri [0] += _dr [0]; + if (x < 0) x += _size; + i = (int)(floorf (x)); + x -= i; + y = (1 - x) * _line [i] + x * _line [i + 1]; + if (add) *p1++ += y * _gain; + else *p1++ = y; + + x = wi - _ri [1]; + _ri [1] += _dr [1]; + if (x < 0) x += _size; + i = (int)(floorf (x)); + x -= i; + y = (1 - x) * _line [i] + x * _line [i + 1]; + if (add) *p2++ += y * _gain; + else *p2++ = y; + + x = wi - _ri [2]; + _ri [2] += _dr [2]; + if (x < 0) x += _size; + i = (int)(floorf (x)); + x -= i; + y = (1 - x) * _line [i] + x * _line [i + 1]; + if (add) *p3++ += y * _gain; + else *p3++ = y; + } + if (wi == _size) _line [wi = 0] = _line [_size]; + } while (len); _wi = wi; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MCP-plugins-0.3.0/cs_chorus.h new/MCP-plugins-0.4.0/cs_chorus.h --- old/MCP-plugins-0.3.0/cs_chorus.h 2003-12-06 22:29:21.000000000 +0100 +++ new/MCP-plugins-0.4.0/cs_chorus.h 2008-04-05 20:02:09.000000000 +0200 @@ -1,6 +1,6 @@ /* - Copyright (C) 2003 Fons Adriaensen - + Copyright (C) 2003-2008 Fons Adriaensen <fons(a)kokkinizita.net> + 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 of the License, or @@ -27,7 +27,7 @@ { public: - enum { NPORT = 7 }; + enum { INPUT, OUTPUT, DELAY, FREQ1, TMOD1, FREQ2, TMOD2, NPORT }; Ladspa_CS_chorus1 (unsigned long fsam); virtual void setport (unsigned long port, LADSPA_Data *data); @@ -53,7 +53,7 @@ { public: - enum { NPORT = 7 }; + enum { INPUT, OUTPUT, DELAY, FREQ1, TMOD1, FREQ2, TMOD2, NPORT }; Ladspa_CS_chorus2 (unsigned long fsam); virtual void setport (unsigned long port, LADSPA_Data *data); @@ -75,4 +75,32 @@ float *_line; }; + +class Ladspa_CS_chorus3 : public LadspaPlugin +{ +public: + + enum { INPUT, OUTPUT1, OUTPUT2, OUTPUT3, DELAY, FREQ1, TMOD1, FREQ2, TMOD2, NPORT }; + + Ladspa_CS_chorus3 (unsigned long fsam); + virtual void setport (unsigned long port, LADSPA_Data *data); + virtual void active (bool act); + virtual void runproc (unsigned long len, bool add); + virtual ~Ladspa_CS_chorus3 (void); + +private: + + float *_port [NPORT]; + unsigned long _size; + unsigned long _wi; + unsigned long _gi; + float _ri [3]; + float _dr [3]; + float _x1, _y1; + float _x2, _y2; + float _a, _b; + float *_line; +}; + + #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MCP-plugins-0.3.0/cs_chorus_if.cc new/MCP-plugins-0.4.0/cs_chorus_if.cc --- old/MCP-plugins-0.3.0/cs_chorus_if.cc 2003-12-06 22:29:35.000000000 +0100 +++ new/MCP-plugins-0.4.0/cs_chorus_if.cc 2008-04-05 20:02:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2003 Fons Adriaensen + Copyright (C) 2003-2008 Fons Adriaensen <fons(a)kokkinizita.net> 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 @@ -22,11 +22,12 @@ #include "cs_chorus.h" -#define IDENT 1944 -#define NMODS 2 +#define NMODS 3 +#define VERSION "0.4.0" -static const char* maker = "Fons Adriaensen <fons.adriaensen(a)alcatel.be>"; -static const char* copyr = "(C) 2003 Fons Adriaensen - GNU General Public License version 2 applies"; + +static const char* maker = "Fons Adriaensen <fons(a)kokkinizita.net>"; +static const char* copyr = "(C) 2003-2008 Fons Adriaensen - License: GPL2"; static void pconnect (LADSPA_Handle H, unsigned long port, LADSPA_Data *data) @@ -86,7 +87,17 @@ } -static const LADSPA_PortDescriptor pdesc1 [Ladspa_CS_chorus1::NPORT] = +static const char* name3 = "Triple chorus"; +static const char* label3 = "TripleChorus"; + +static LADSPA_Handle instant3 (const struct _LADSPA_Descriptor *desc, unsigned long rate) +{ + return new Ladspa_CS_chorus3 (rate); +} + + + +static const LADSPA_PortDescriptor pdesc12 [Ladspa_CS_chorus1::NPORT] = { LADSPA_PORT_INPUT | LADSPA_PORT_AUDIO, LADSPA_PORT_OUTPUT | LADSPA_PORT_AUDIO, @@ -97,7 +108,7 @@ LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL }; -static const char * const pname1 [Ladspa_CS_chorus1::NPORT] = +static const char * const pname12 [Ladspa_CS_chorus1::NPORT] = { "Input", "Output", @@ -108,10 +119,50 @@ "Mod Amplitude 2 (ms)" }; -static const LADSPA_PortRangeHint phint1 [Ladspa_CS_chorus1::NPORT] = +static const LADSPA_PortRangeHint phint12 [Ladspa_CS_chorus1::NPORT] = +{ + { 0, 0, 0 }, + { 0, 0, 0 }, + { LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE | LADSPA_HINT_DEFAULT_0, 0, 30 }, + { LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE | LADSPA_HINT_LOGARITHMIC, 0.003, 10 }, + { LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE | LADSPA_HINT_DEFAULT_0, 0, 10 }, + { LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE | LADSPA_HINT_LOGARITHMIC, 0.01, 30 }, + { LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE | LADSPA_HINT_DEFAULT_0, 0, 3 } +}; + + +static const LADSPA_PortDescriptor pdesc3 [Ladspa_CS_chorus3::NPORT] = +{ + LADSPA_PORT_INPUT | LADSPA_PORT_AUDIO, + LADSPA_PORT_OUTPUT | LADSPA_PORT_AUDIO, + LADSPA_PORT_OUTPUT | LADSPA_PORT_AUDIO, + LADSPA_PORT_OUTPUT | LADSPA_PORT_AUDIO, + LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL, + LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL, + LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL, + LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL, + LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL +}; + +static const char * const pname3 [Ladspa_CS_chorus3::NPORT] = +{ + "Input", + "Output1", + "Output2", + "Output3", + "Delay (ms)", + "Mod Frequency 1 (Hz)", + "Mod Amplitude 1 (ms)", + "Mod Frequency 2 (Hz)", + "Mod Amplitude 2 (ms)" +}; + +static const LADSPA_PortRangeHint phint3 [Ladspa_CS_chorus3::NPORT] = { { 0, 0, 0 }, { 0, 0, 0 }, + { 0, 0, 0 }, + { 0, 0, 0 }, { LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE | LADSPA_HINT_DEFAULT_0, 0, 30 }, { LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE | LADSPA_HINT_LOGARITHMIC, 0.003, 10 }, { LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE | LADSPA_HINT_DEFAULT_0, 0, 10 }, @@ -123,16 +174,16 @@ static const LADSPA_Descriptor moddescr [NMODS] = { { - IDENT+0, + 1944, label1, LADSPA_PROPERTY_REALTIME | LADSPA_PROPERTY_HARD_RT_CAPABLE, name1, maker, copyr, Ladspa_CS_chorus1::NPORT, - pdesc1, - pname1, - phint1, + pdesc12, + pname12, + phint12, 0, instant1, pconnect, @@ -144,21 +195,42 @@ cleanup }, { - IDENT+1, + 1945, label2, LADSPA_PROPERTY_REALTIME | LADSPA_PROPERTY_HARD_RT_CAPABLE, name2, maker, copyr, - Ladspa_CS_chorus2::NPORT, - pdesc1, - pname1, - phint1, + Ladspa_CS_chorus1::NPORT, + pdesc12, + pname12, + phint12, 0, instant2, pconnect, activate, runplugin, + runadding, + setadding, + deactivate, + cleanup + }, + { + 1951, + label3, + LADSPA_PROPERTY_REALTIME | LADSPA_PROPERTY_HARD_RT_CAPABLE, + name3, + maker, + copyr, + Ladspa_CS_chorus3::NPORT, + pdesc3, + pname3, + phint3, + 0, + instant3, + pconnect, + activate, + runplugin, runadding, setadding, deactivate, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MCP-plugins-0.3.0/cs_phaser.cc new/MCP-plugins-0.4.0/cs_phaser.cc --- old/MCP-plugins-0.3.0/cs_phaser.cc 2004-03-10 00:27:30.000000000 +0100 +++ new/MCP-plugins-0.4.0/cs_phaser.cc 2008-04-05 20:02:27.000000000 +0200 @@ -1,6 +1,6 @@ /* - Copyright (C) 2003 Fons Adriaensen - + Copyright (C) 2003-2008 Fons Adriaensen <fons(a)kokkinizita.net> + 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 of the License, or @@ -56,13 +56,13 @@ p4 = _port [4] - 1; ns = (int)(floor (_port [6][0] + 0.5)); - g0 = exp2ap (0.1661 * _port [5][0]); + g0 = exp2ap (0.1661f * _port [5][0]); gf = _port [10][0]; gm = _port [11][0]; gi = 1 - fabs (gm); w = _w; - z = _z + 1e-10; + z = _z + 1e-10f; do { @@ -72,10 +72,10 @@ p4 += k; len -= k; - t = (exp2ap (_port [8][0] * *p3 + _port [7][0] + *p2 + 9.683) + _port [9][0] * *p4 * 1000) / _fsam; - if (t < 0.0) t = 0.0; - if (t > 1.5) t = 1.5; - t = (sin (t) - 1) / cos (t) + 1; + t = (exp2ap (_port [8][0] * *p3 + _port [7][0] + *p2 + 9.683f) + _port [9][0] * *p4 * 1000.0f) / _fsam; + if (t < 0.0f) t = 0.0f; + if (t > 1.5f) t = 1.5f; + t = (sinf (t) - 1) / cosf (t) + 1; dw = (t - w) / k; while (k--) @@ -83,7 +83,7 @@ w += dw; x = g0 * *p0++; z = gf * z + x; - z = 4 * tanh (0.25 * z); + z = 4 * tanhf (0.25f * z); for (i = 0; i < ns; i++) { t = _c [i]; @@ -135,12 +135,12 @@ p1 = _port [1]; ns = (int)(floor (_port [3][0] + 0.5)); - g0 = exp2ap (0.1661 * _port [2][0]); + g0 = exp2ap (0.1661f * _port [2][0]); gf = _port [8][0]; gm = _port [9][0]; gi = 1 - fabs (gm); - z = _z + 1e-10; + z = _z + 1e-10f; w = _w; v = _v; @@ -151,14 +151,14 @@ _gi = DSUB; _p += 2 * DSUB * _port [5][0] / _fsam; if (_p > 1) _p -= 2; - x = 0.999 * _port [6][0]; + x = 0.999f * _port [6][0]; d = _p - x; - if (d < 0) t = 0.5 + d / (1 + x); - else t = 0.5 - d / (1 - x); - t = exp2ap (_port [7][0] * t + _port [4][0] + 9.683) / _fsam; - if (t < 0.0) t = 0.0; - if (t > 1.5) t = 1.5; - t = (sin (t) - 1) / cos (t) + 1; + if (d < 0) t = 0.5f + d / (1 + x); + else t = 0.5f - d / (1 - x); + t = exp2ap (_port [7][0] * t + _port [4][0] + 9.683f) / _fsam; + if (t < 0.0f) t = 0.0f; + if (t > 1.5f) t = 1.5f; + t = (sinf (t) - 1) / cosf (t) + 1; v = (t - w) / DSUB; } @@ -169,7 +169,7 @@ { x = g0 * *p0++; z = gf * z + x; - z = 4 * tanh (0.25 * z); + z = 4 * tanhf (0.25f * z); for (i = 0; i < ns; i++) { t = _c [i]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MCP-plugins-0.3.0/cs_phaser.h new/MCP-plugins-0.4.0/cs_phaser.h --- old/MCP-plugins-0.3.0/cs_phaser.h 2003-12-06 22:30:26.000000000 +0100 +++ new/MCP-plugins-0.4.0/cs_phaser.h 2008-04-05 20:02:35.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2003 Fons Adriaensen + Copyright (C) 2003-2008 Fons Adriaensen <fons(a)kokkinizita.net> 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MCP-plugins-0.3.0/cs_phaser_if.cc new/MCP-plugins-0.4.0/cs_phaser_if.cc --- old/MCP-plugins-0.3.0/cs_phaser_if.cc 2004-03-10 00:06:24.000000000 +0100 +++ new/MCP-plugins-0.4.0/cs_phaser_if.cc 2008-04-05 20:02:47.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2003 Fons Adriaensen + Copyright (C) 2003-2008 Fons Adriaensen <fons(a)kokkinizita.net> 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 @@ -22,11 +22,12 @@ #include "cs_phaser.h" -#define IDENT 1946 +#define VERSION "0.4.0" #define NMODS 2 -static const char* maker = "Fons Adriaensen <fons.adriaensen(a)alcatel.be>"; -static const char* copyr = "(C) 2003 Fons Adriaensen - GNU General Public License version 2 applies"; + +static const char* maker = "Fons Adriaensen <fons(a)kokkinizita.net>"; +static const char* copyr = "(C) 2003-2008 Fons Adriaensen - License: GPL2"; static void pconnect (LADSPA_Handle H, unsigned long port, LADSPA_Data *data) @@ -183,7 +184,7 @@ static const LADSPA_Descriptor moddescr [NMODS] = { { - IDENT+0, + 1946, label0, LADSPA_PROPERTY_REALTIME | LADSPA_PROPERTY_HARD_RT_CAPABLE, name0, @@ -204,7 +205,7 @@ cleanup }, { - IDENT+1, + 1947, label1, LADSPA_PROPERTY_REALTIME | LADSPA_PROPERTY_HARD_RT_CAPABLE, name1, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MCP-plugins-0.3.0/exp2ap.cc new/MCP-plugins-0.4.0/exp2ap.cc --- old/MCP-plugins-0.3.0/exp2ap.cc 2003-12-06 22:30:51.000000000 +0100 +++ new/MCP-plugins-0.4.0/exp2ap.cc 2008-04-05 20:02:54.000000000 +0200 @@ -1,6 +1,6 @@ /* - Copyright (C) 2003 Fons Adriaensen - + Copyright (C) 2003-2008 Fons Adriaensen <fons(a)kokkinizita.net> + 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 of the License, or @@ -24,10 +24,9 @@ { int i; - i = (int)(floor (x)); + i = (int)(floorf (x)); x -= i; -// return ldexp (1 + x * (0.66 + 0.34 * x), i); - return ldexp (1 + x * (0.6930 + x * (0.2416 + x * (0.0517 + x * 0.0137))), i); + return ldexpf (1 + x * (0.6930f + x * (0.2416f + x * (0.0517f + x * 0.0137f))), i); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MCP-plugins-0.3.0/ladspaplugin.h new/MCP-plugins-0.4.0/ladspaplugin.h --- old/MCP-plugins-0.3.0/ladspaplugin.h 2003-12-01 21:18:18.000000000 +0100 +++ new/MCP-plugins-0.4.0/ladspaplugin.h 2008-04-05 20:03:08.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2003 Fons Adriaensen + Copyright (C) 2003-2008 Fons Adriaensen <fons(a)kokkinizita.net> 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MCP-plugins-0.3.0/mvchpf24.cc new/MCP-plugins-0.4.0/mvchpf24.cc --- old/MCP-plugins-0.3.0/mvchpf24.cc 2004-03-14 15:01:02.000000000 +0100 +++ new/MCP-plugins-0.4.0/mvchpf24.cc 2008-04-05 20:03:17.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2003 Fons Adriaensen + Copyright (C) 2003-2008 Fons Adriaensen <fons(a)kokkinizita.net> 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 @@ -49,8 +49,8 @@ p1 = _port [AOUT]; p2 = _port [AFREQ] - 1; p3 = _port [AFMOD] - 1; - g0 = exp2ap (0.1661 * _port [CINP][0]) / 4; - g1 = exp2ap (0.1661 * _port [COUT][0]) * 4; + g0 = exp2ap (0.1661f * _port [CINP][0]) / 4; + g1 = exp2ap (0.1661f * _port [COUT][0]) * 4; if (add) g1 *= _gain; c1 = _c1; @@ -67,7 +67,7 @@ p3 += k; len -= k; - t = _fsam / exp2ap (_port [CFMOD][0] * *p3 + *p2 + _port [CFREQ][0] + 9.2); + t = _fsam / exp2ap (_port [CFMOD][0] * *p3 + *p2 + _port [CFREQ][0] + 9.2f); if (t < 2) t = 2; dw = (t - w) / k; @@ -75,30 +75,30 @@ { w += dw; - x = y = *p0++ * g0 - 0.3 * x; + x = y = *p0++ * g0 - 0.3f * x; - d = x - c1 + 1e-10; + d = x - c1 + 1e-10f; t = d * d; d *= (1 + t) / (w + t); c1 += d; x -= c1; c1 += d; - d = x - c2 + 1e-10; + d = x - c2 + 1e-10f; t = d * d; d *= (1 + t) / (w + t); c2 += d; x -= c2; c2 += d; - d = x - c3 + 1e-10; + d = x - c3 + 1e-10f; t = d * d; d *= (1 + t) / (w + t); c3 += d; x -= c3; c3 += d; - d = x - c4 + 1e-10; + d = x - c4 + 1e-10f; t = d * d; d *= (1 + t) / (w + t); c4 += d; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MCP-plugins-0.3.0/mvchpf24.h new/MCP-plugins-0.4.0/mvchpf24.h --- old/MCP-plugins-0.3.0/mvchpf24.h 2004-03-14 12:53:24.000000000 +0100 +++ new/MCP-plugins-0.4.0/mvchpf24.h 2008-04-05 20:03:27.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2003 Fons Adriaensen + Copyright (C) 2003-2008 Fons Adriaensen <fons(a)kokkinizita.net> 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MCP-plugins-0.3.0/mvchpf24_if.cc new/MCP-plugins-0.4.0/mvchpf24_if.cc --- old/MCP-plugins-0.3.0/mvchpf24_if.cc 2004-04-09 22:01:41.000000000 +0200 +++ new/MCP-plugins-0.4.0/mvchpf24_if.cc 2008-04-05 20:03:35.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2003 Fons Adriaensen + Copyright (C) 2003-2008 Fons Adriaensen <fons(a)kokkinizita.net> 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 @@ -23,11 +23,11 @@ #include "mvchpf24.h" #define NMODS 1 -#define VERSION "0.3.0" +#define VERSION "0.4.0" -static const char* maker = "Fons Adriaensen <fons.adriaensen(a)skynet.be>"; -static const char* copyr = "(C) 2004 Fons Adriaensen, GNU General Public License Version 2 applies"; +static const char* maker = "Fons Adriaensen <fons(a)kokkinizita.net>"; +static const char* copyr = "(C) 2003-2008 Fons Adriaensen - License: GPL2"; static void pconnect (LADSPA_Handle H, unsigned long port, LADSPA_Data *data) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MCP-plugins-0.3.0/mvclpf24.cc new/MCP-plugins-0.4.0/mvclpf24.cc --- old/MCP-plugins-0.3.0/mvclpf24.cc 2004-03-03 00:29:33.000000000 +0100 +++ new/MCP-plugins-0.4.0/mvclpf24.cc 2008-04-05 20:03:50.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2003 Fons Adriaensen + Copyright (C) 2003-2008 Fons Adriaensen <fons(a)kokkinizita.net> 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 @@ -44,16 +44,16 @@ float c1, c2, c3, c4, c5; float g0, g1, r, dr, w, dw, x, t; - p0 = _port [0]; - p1 = _port [1]; - p2 = _port [2] - 1; - p3 = _port [3] - 1; - p4 = _port [4] - 1; - g0 = exp2ap (0.1661 * _port [5][0]) / 4; - g1 = exp2ap (0.1661 * _port [10][0]) * 4; + p0 = _port [A_INPUT]; + p1 = _port [A_OUTPUT]; + p2 = _port [A_FREQ] - 1; + p3 = _port [A_FMOD] - 1; + p4 = _port [A_RESO] - 1; + g0 = exp2ap (0.1661f * _port [C_IPGAIN][0]) / 4; + g1 = exp2ap (0.1661f * _port [C_OPGAIN][0]) * 4; if (add) g1 *= _gain; - c1 = _c1 + 1e-6; + c1 = _c1 + 1e-6f; c2 = _c2; c3 = _c3; c4 = _c4; @@ -69,16 +69,16 @@ p4 += k; len -= k; - t = exp2ap (_port [7][0] * *p3 + _port [6][0] + *p2 + 10.82) / _fsam; - if (t < 0.8) t *= 1 - 0.4 * t - 0.125 * t * t; + t = exp2ap (_port [C_FMODG][0] * *p3 + _port [C_FREQ][0] + *p2 + 10.82f) / _fsam; + if (t < 0.8f) t *= 1 - 0.4f * t - 0.125f * t * t; else { - t *= 0.6; - if (t > 0.92) t = 0.92; + t *= 0.6f; + if (t > 0.92f) t = 0.92f; } dw = (t - w) / k; - t = _port [9][0] * *p4 + _port [8][0]; + t = _port [C_RESOG][0] * *p4 + _port [C_RESO][0]; if (r > 1) r = 1; if (r < 0) r = 0; dr = (t - r) / k; @@ -87,16 +87,16 @@ { w += dw; r += dr; - x = -4.2 * r * c5 + *p0++ * g0 + 1e-10; - t = c1 / (1 + fabs (c1)); + x = -4.2 * r * c5 + *p0++ * g0 + 1e-10f; + t = c1 / (1 + fabsf (c1)); c1 += w * (x - t); - x = c1 / (1 + fabs (c1)); + x = c1 / (1 + fabsf (c1)); c2 += w * (x - c2); c3 += w * (c2 - c3); c4 += w * (c3 - c4); if (add) *p1++ += g1 * c4; else *p1++ = g1 * c4; - c5 += 0.5 * (c4 - c5); + c5 += 0.5f * (c4 - c5); } } while (len); @@ -131,16 +131,16 @@ float c1, c2, c3, c4, c5; float g0, g1, r, dr, w, dw, x, t; - p0 = _port [0]; - p1 = _port [1]; - p2 = _port [2] - 1; - p3 = _port [3] - 1; - p4 = _port [4] - 1; - g0 = exp2ap (0.1661 * _port [5][0]) / 2; - g1 = exp2ap (0.1661 * _port [10][0]) * 2; + p0 = _port [A_INPUT]; + p1 = _port [A_OUTPUT]; + p2 = _port [A_FREQ] - 1; + p3 = _port [A_FMOD] - 1; + p4 = _port [A_RESO] - 1; + g0 = exp2ap (0.1661f * _port [C_IPGAIN][0]) / 4; + g1 = exp2ap (0.1661f * _port [C_OPGAIN][0]) * 4; if (add) g1 *= _gain; - c1 = _c1 + 1e-6; + c1 = _c1 + 1e-6f; c2 = _c2; c3 = _c3; c4 = _c4; @@ -156,16 +156,16 @@ p4 += k; len -= k; - t = exp2ap (_port [7][0] * *p3 + _port [6][0] + *p2 + 10.71) / _fsam; - if (t < 0.8) t *= 1 - 0.4 * t - 0.125 * t * t; + t = exp2ap (_port [C_FMODG][0] * *p3 + _port [C_FREQ][0] + *p2 + 10.71f) / _fsam; + if (t < 0.8f) t *= 1 - 0.4f * t - 0.125f * t * t; else { - t *= 0.6; - if (t > 0.92) t = 0.92; + t *= 0.6f; + if (t > 0.92f) t = 0.92f; } dw = (t - w) / k; - t = _port [9][0] * *p4 + _port [8][0]; + t = _port [C_RESOG][0] * *p4 + _port [C_RESO][0]; if (t > 1) t = 1; if (t < 0) t = 0; dr = (t - r) / k; @@ -175,9 +175,9 @@ w += dw; r += dr; - x = -4.5 * r * c5 + *p0++ * g0 + 1e-10; -// x = tanh (x); - x /= sqrt (1 + x * x); + x = -4.5f * r * c5 + *p0++ * g0 + 1e-10f; +// x = tanhf (x); + x /= sqrtf (1 + x * x); c1 += w * (x - c1) / (1 + c1 * c1); c2 += w * (c1 - c2) / (1 + c2 * c2); c3 += w * (c2 - c3) / (1 + c3 * c3); @@ -185,7 +185,7 @@ if (add) *p1++ += g1 * (c4); else *p1++ = g1 * (c4); - c5 += 0.5 * (c4 - c5); + c5 += 0.5f * (c4 - c5); } } while (len); @@ -220,13 +220,13 @@ float c1, c2, c3, c4, c5; float g0, g1, r, dr, w, dw, x, t, d; - p0 = _port [0]; - p1 = _port [1]; - p2 = _port [2] - 1; - p3 = _port [3] - 1; - p4 = _port [4] - 1; - g0 = exp2ap (0.1661 * _port [5][0]) / 2; - g1 = exp2ap (0.1661 * _port [10][0]) * 2; + p0 = _port [A_INPUT]; + p1 = _port [A_OUTPUT]; + p2 = _port [A_FREQ] - 1; + p3 = _port [A_FMOD] - 1; + p4 = _port [A_RESO] - 1; + g0 = exp2ap (0.1661f * _port [C_IPGAIN][0]) / 4; + g1 = exp2ap (0.1661f * _port [C_OPGAIN][0]) * 4; if (add) g1 *= _gain; c1 = _c1; @@ -245,16 +245,16 @@ p4 += k; len -= k; - t = exp2ap (_port [7][0] * *p3 + _port [6][0] + *p2 + 9.70) / _fsam; - if (t < 0.75) t *= 1.005 - t * (0.624 - t * (0.65 - t * 0.54)); + t = exp2ap (_port [C_FMODG][0] * *p3 + _port [C_FREQ][0] + *p2 + 9.70f) / _fsam; + if (t < 0.75f) t *= 1.005f - t * (0.624f - t * (0.65f - t * 0.54f)); else { - t *= 0.6748; - if (t > 0.82) t = 0.82; + t *= 0.6748f; + if (t > 0.82f) t = 0.82f; } dw = (t - w) / k; - t = _port [9][0] * *p4 + _port [8][0]; + t = _port [C_RESOG][0] * *p4 + _port [C_RESO][0]; if (t > 1) t = 1; if (t < 0) t = 0; dr = (t - r) / k; @@ -264,39 +264,39 @@ w += dw; r += dr; - x = *p0 * g0 - (4.3 - 0.2 * w) * r * c5 + 1e-10; -// x = tanh (x); - x /= sqrt (1 + x * x); + x = *p0 * g0 - (4.3f - 0.2f * w) * r * c5 + 1e-10f; +// x = tanhf (x); + x /= sqrtf (1 + x * x); d = w * (x - c1) / (1 + c1 * c1); - x = c1 + 0.77 * d; - c1 = x + 0.23 * d; + x = c1 + 0.77f * d; + c1 = x + 0.23f * d; d = w * (x - c2) / (1 + c2 * c2); - x = c2 + 0.77 * d; - c2 = x + 0.23 * d; + x = c2 + 0.77f * d; + c2 = x + 0.23f * d; d = w * (x - c3) / (1 + c3 * c3); - x = c3 + 0.77 * d; - c3 = x + 0.23 * d; + x = c3 + 0.77f * d; + c3 = x + 0.23f * d; d = w * (x - c4); - x = c4 + 0.77 * d; - c4 = x + 0.23 * d; - c5 += 0.85 * (c4 - c5); - - x = *p0++ * g0 -(4.3 - 0.2 * w) * r * c5; -// x = tanh (x); - x /= sqrt (1 + x * x); + x = c4 + 0.77f * d; + c4 = x + 0.23f * d; + c5 += 0.85f * (c4 - c5); + + x = *p0++ * g0 -(4.3f - 0.2f * w) * r * c5; +// x = tanhf (x); + x /= sqrtf (1 + x * x); d = w * (x - c1) / (1 + c1 * c1); - x = c1 + 0.77 * d; - c1 = x + 0.23 * d; + x = c1 + 0.77f * d; + c1 = x + 0.23f * d; d = w * (x - c2) / (1 + c2 * c2); - x = c2 + 0.77 * d; - c2 = x + 0.23 * d; + x = c2 + 0.77f * d; + c2 = x + 0.23f * d; d = w * (x - c3) / (1 + c3 * c3); - x = c3 + 0.77 * d; - c3 = x + 0.23 * d; + x = c3 + 0.77f * d; + c3 = x + 0.23f * d; d = w * (x - c4); - x = c4 + 0.77 * d; - c4 = x + 0.23 * d; - c5 += 0.85 * (c4 - c5); + x = c4 + 0.77f * d; + c4 = x + 0.23f * d; + c5 += 0.85f * (c4 - c5); if (add) *p1++ += g1 * c4; else *p1++ = g1 * c4; @@ -333,17 +333,17 @@ float c1, c2, c3, c4, c5; float g0, g1, r, dr, w, dw, x, t, d, y; - p0 = _port [0]; - p1 = _port [1]; - p2 = _port [2] - 1; - p3 = _port [3] - 1; - p4 = _port [4] - 1; - g0 = exp2ap (0.1661 * _port [5][0]) / 2; - g1 = exp2ap (0.1661 * _port [11][0]) * 2; - op = (int)(floor (_port [10][0] + 0.5)); + p0 = _port [A_INPUT]; + p1 = _port [A_OUTPUT]; + p2 = _port [A_FREQ] - 1; + p3 = _port [A_FMOD] - 1; + p4 = _port [A_RESO] - 1; + g0 = exp2ap (0.1661f * _port [C_IPGAIN][0]) / 4; + g1 = exp2ap (0.1661f * _port [C_OPGAIN][0]) * 4; + op = (int)(floorf (_port [C_LPFILT][0] + 0.5)); if (add) g1 *= _gain; - c1 = _c1 + 1e-6; + c1 = _c1 + 1e-6f; c2 = _c2; c3 = _c3; c4 = _c4; @@ -359,16 +359,16 @@ p4 += k; len -= k; - t = exp2ap (_port [7][0] * *p3 + _port [6][0] + *p2 + 9.70) / _fsam; - if (t < 0.75) t *= 1.005 - t * (0.624 - t * (0.65 - t * 0.54)); + t = exp2ap (_port [C_FMODG][0] * *p3 + _port [C_FREQ][0] + *p2 + 9.70f) / _fsam; + if (t < 0.75f) t *= 1.005f - t * (0.624f - t * (0.65f - t * 0.54f)); else { - t *= 0.6748; - if (t > 0.82) t = 0.82; + t *= 0.6748f; + if (t > 0.82f) t = 0.82f; } dw = (t - w) / k; - t = _port [9][0] * *p4 + _port [8][0]; + t = _port [C_RESOG][0] * *p4 + _port [C_RESO][0]; if (t > 1) t = 1; if (t < 0) t = 0; dr = (t - r) / k; @@ -378,39 +378,39 @@ w += dw; r += dr; - x = *p0 * g0 - (4.3 - 0.2 * w) * r * c5 + 1e-10; -// x = tanh (x); - x /= sqrt (1 + x * x); + x = *p0 * g0 - (4.3f - 0.2f * w) * r * c5 + 1e-10f; +// x = tanhf (x); + x /= sqrtf (1 + x * x); d = w * (x - c1) / (1 + c1 * c1); - x = c1 + 0.77 * d; - c1 = x + 0.23 * d; + x = c1 + 0.77f * d; + c1 = x + 0.23f * d; d = w * (x - c2) / (1 + c2 * c2); - x = c2 + 0.77 * d; - c2 = x + 0.23 * d; + x = c2 + 0.77f * d; + c2 = x + 0.23f * d; d = w * (x - c3) / (1 + c3 * c3); - x = c3 + 0.77 * d; - c3 = x + 0.23 * d; + x = c3 + 0.77f * d; + c3 = x + 0.23f * d; d = w * (x - c4); - x = c4 + 0.77 * d; - c4 = x + 0.23 * d; - c5 += 0.85 * (c4 - c5); - - x = y = *p0++ * g0 -(4.3 - 0.2 * w) * r * c5; -// x = tanh (x); - x /= sqrt (1 + x * x); + x = c4 + 0.77f * d; + c4 = x + 0.23f * d; + c5 += 0.85f * (c4 - c5); + + x = y = *p0++ * g0 -(4.3f - 0.2f * w) * r * c5; +// x = tanhf (x); + x /= sqrtf (1 + x * x); d = w * (x - c1) / (1 + c1 * c1); - x = c1 + 0.77 * d; - c1 = x + 0.23 * d; + x = c1 + 0.77f * d; + c1 = x + 0.23f * d; d = w * (x - c2) / (1 + c2 * c2); - x = c2 + 0.77 * d; - c2 = x + 0.23 * d; + x = c2 + 0.77f * d; + c2 = x + 0.23f * d; d = w * (x - c3) / (1 + c3 * c3); - x = c3 + 0.77 * d; - c3 = x + 0.23 * d; + x = c3 + 0.77f * d; + c3 = x + 0.23f * d; d = w * (x - c4); - x = c4 + 0.77 * d; - c4 = x + 0.23 * d; - c5 += 0.85 * (c4 - c5); + x = c4 + 0.77f * d; + c4 = x + 0.23f * d; + c5 += 0.85f * (c4 - c5); switch (op) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MCP-plugins-0.3.0/mvclpf24.h new/MCP-plugins-0.4.0/mvclpf24.h --- old/MCP-plugins-0.3.0/mvclpf24.h 2004-03-09 20:52:02.000000000 +0100 +++ new/MCP-plugins-0.4.0/mvclpf24.h 2008-04-05 20:04:01.000000000 +0200 @@ -1,6 +1,6 @@ /* - Copyright (C) 2003 Fons Adriaensen - + Copyright (C) 2003-2008 Fons Adriaensen <fons(a)kokkinizita.net> + 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 of the License, or @@ -27,7 +27,8 @@ { public: - enum { NPORT = 11 }; + enum { A_INPUT, A_OUTPUT, A_FREQ, A_FMOD, A_RESO, + C_IPGAIN, C_FREQ, C_FMODG, C_RESO, C_RESOG, C_OPGAIN, NPORT }; Ladspa_Moogvcf1 (unsigned long fsam) : LadspaPlugin (fsam) {} virtual void setport (unsigned long port, LADSPA_Data *data); @@ -47,7 +48,8 @@ { public: - enum { NPORT = 11 }; + enum { A_INPUT, A_OUTPUT, A_FREQ, A_FMOD, A_RESO, + C_IPGAIN, C_FREQ, C_FMODG, C_RESO, C_RESOG, C_OPGAIN, NPORT }; Ladspa_Moogvcf2 (unsigned long fsam) : LadspaPlugin (fsam) {} virtual void setport (unsigned long port, LADSPA_Data *data); @@ -67,7 +69,8 @@ { public: - enum { NPORT = 11 }; + enum { A_INPUT, A_OUTPUT, A_FREQ, A_FMOD, A_RESO, + C_IPGAIN, C_FREQ, C_FMODG, C_RESO, C_RESOG, C_OPGAIN, NPORT }; Ladspa_Moogvcf3 (unsigned long fsam) : LadspaPlugin (fsam) {} virtual void setport (unsigned long port, LADSPA_Data *data); @@ -87,7 +90,9 @@ { public: - enum { NPORT = 12, NLABEL = 5 }; + enum { A_INPUT, A_OUTPUT, A_FREQ, A_FMOD, A_RESO, + C_IPGAIN, C_FREQ, C_FMODG, C_RESO, C_RESOG, + C_LPFILT, C_OPGAIN, NPORT, NLABEL = 5 }; Ladspa_Moogvcf4 (unsigned long fsam) : LadspaPlugin (fsam) {} virtual void setport (unsigned long port, LADSPA_Data *data); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MCP-plugins-0.3.0/mvclpf24_if.cc new/MCP-plugins-0.4.0/mvclpf24_if.cc --- old/MCP-plugins-0.3.0/mvclpf24_if.cc 2004-04-09 21:51:11.000000000 +0200 +++ new/MCP-plugins-0.4.0/mvclpf24_if.cc 2008-04-05 20:04:09.000000000 +0200 @@ -1,5 +1,5 @@ /* - Copyright (C) 2003 Fons Adriaensen + Copyright (C) 2003-2008 Fons Adriaensen <fons(a)kokkinizita.net> 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 @@ -23,11 +23,11 @@ #include "mvclpf24.h" #define NMODS 4 -#define VERSION "0.3.0" +#define VERSION "0.4.0" -static const char* maker = "Fons Adriaensen <fons.adriaensen(a)alcatel.be>"; -static const char* copyr = "(C) 2003 Fons Adriaensen, GNU General Public License Version 2 applies"; +static const char* maker = "Fons Adriaensen <fons(a)kokkinizita.net>"; +static const char* copyr = "(C) 2003-2008 Fons Adriaensen - License: GPL2"; static void pconnect (LADSPA_Handle H, unsigned long port, LADSPA_Data *data) ++++++ caps_0.4.2.tar.bz2 -> caps_0.4.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caps-0.4.2/Amp.h new/caps-0.4.4/Amp.h --- old/caps-0.4.2/Amp.h 2007-06-15 20:22:45.000000000 +0200 +++ new/caps-0.4.4/Amp.h 2009-07-28 18:38:03.000000000 +0200 @@ -1,7 +1,7 @@ /* Amp.h - Copyright 2002-7 Tim Goetze <tim(a)quitte.de> + Copyright 2002-9 Tim Goetze <tim(a)quitte.de> http://quitte.de/dsp/ @@ -310,6 +310,8 @@ cut = 2; supply = 0.; + + tone = -1; /* causes initialisation of the filter at first cycle */ } void run (int n) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caps-0.4.2/CHANGES new/caps-0.4.4/CHANGES --- old/caps-0.4.2/CHANGES 2007-06-19 10:16:48.000000000 +0200 +++ new/caps-0.4.4/CHANGES 2009-07-29 01:48:15.000000000 +0200 @@ -1,3 +1,13 @@ +0.4.3 + * basics.h cleanup / comments + * minor Makefile cleanup + * comment cosmetics + * Eq and Eq2x2 per-band Q changed to 1.414 (= 1 octave) + * Eq lowest band default value fixed to read 0 + * Niclas' fix for the bessel function implemented + * uninitialised plugin states eliminated thanks to Damon + * linker options for OSX added to the Makefile + 0.4.2 * fixed the 'model' port index for AmpVTS in the RDF generator diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caps-0.4.2/Cabinet-Models32.h new/caps-0.4.4/Cabinet-Models32.h --- old/caps-0.4.2/Cabinet-Models32.h 2005-12-05 19:00:55.000000000 +0100 +++ new/caps-0.4.4/Cabinet-Models32.h 2007-07-06 15:58:13.000000000 +0200 @@ -63,6 +63,18 @@ {0.0, 0.618938053184, 0.180052941443, -0.1028119852, -0.19233134457, -0.14303971742, -0.0450998045919, 0.0341843500162, 0.0465086637485, 0.0071435730282, -0.0461779135605, -0.059013077843, -0.0284397368519, 0.0187689538251, 0.0341298347311, 0.0244703904826, 0.00720524642447, 0.00991307420138, 0.018738094495, 0.0275442994126, 0.0299092523536, 0.0339721143791, 0.0270175082759, 0.0151058732685, -0.00751060215331, -0.0236467101096, -0.0272347092017, -0.00812409176413, 0.0141531255726, 0.0270163512016, 0.00208457244433, -0.0784208903527}, 0.1132 }, + { + 32, /* mesa */ + {0.462494284717, 0.393585742058, 0.303328992303, 0.181503108654, 0.0629173541037, -0.020681232006, -0.0571885284376, -0.0467796891544, -0.0276756897046, -0.00892844543715, 0.00204563746045, 0.0115134879366, 0.00106846505647, -0.0149439761237, -0.0330954690659, -0.0337794782369, -0.0276991983671, -0.0190072253549, -0.0324525139664, -0.0630355306227, -0.0999209480709, -0.111933999507, -0.110645947594, -0.092891889065, -0.0692697576821, -0.0450776510962, -0.0392851148349, -0.035324392499, -0.035403719608, -0.0376283525137, -0.0612971281858, -0.0900100571873}, + {0.0, 0.56035020932, 0.29343466934, 0.0772363317707, -0.0530744622425, -0.0885361452358, -0.0589180077997, -0.00257855932105, 0.0334935643243, 0.0442328268628, 0.0294583386742, 0.00717959220156, -0.0175320543891, -0.0208128084726, -0.00373790944406, 0.0334761867029, 0.0627006023834, 0.0700861323961, 0.0416727224516, -0.000637024095321, -0.0357094622237, -0.0404012923223, -0.0285442599547, -0.00354190734239, 0.0184796761008, 0.0306524756002, 0.0181509660649, -0.00687913029057, -0.0393242377083, -0.0550286859069, -0.0375235630652, 0.0471541139774}, + 0.2500 + }, + { + 32, /* pro_jr */ + {0.734249445521, 0.491537503216, 0.337459965314, 0.176462147927, 0.0276390917692, -0.0644515999868, -0.0972401016684, -0.0803985996088, -0.0428685363211, -0.0140919517701, -0.0337409328059, -0.0478897322188, -0.0362288411405, -0.0130597902066, -0.00582049410513, 0.0022469159791, -0.00964075940401, -0.0380828738621, -0.0763568061844, -0.089961400489, -0.0952731732008, -0.0895604973654, -0.101346765163, -0.119569610891, -0.128233125318, -0.109253322153, -0.0821678710293, -0.041620049917, -0.0245690004857, -0.0219634796685, -0.0419014341928, -0.0651369005252}, + {0.0, 0.663188793345, 0.270439727768, 0.0190336508265, -0.0946822703696, -0.0888520332756, -0.0267575060227, 0.03588910806, 0.0599594346375, 0.041850528867, -0.00632721029526, -0.0244115687714, -0.0103162286821, 0.0119858957112, 0.0197992179523, 0.0238625339809, 0.0142267453341, 0.00296440492823, -0.00543873217766, -0.00014858213959, -0.00196572770138, -0.00750279035903, -0.0243069229182, -0.0285801812939, -0.0100437887585, 0.0259127459737, 0.0475587872734, 0.0497287926166, 0.0189008750066, -0.0156259358581, -0.0395277285226, -0.0325403937133}, + 0.2500 + }, }; Model32 @@ -103,6 +115,18 @@ {0.0, 0.594136919296, 0.201493775156, -0.0716153113375, -0.180702317671, -0.160390621032, -0.0826806167453, 0.000697581661664, 0.0397029332137, 0.0299147550153, -0.0177304803895, -0.0570701545448, -0.0652412298089, -0.0298128518083, 0.0124560081161, 0.0355161884622, 0.0255626596849, 0.00762986123778, -0.00431800264305, 0.00420452150537, 0.0150803653129, 0.0291131391488, 0.0359312991789, 0.0364212054952, 0.0203516393338, 0.0022141464642, -0.0149317465975, -0.0121651677123, 0.00704936522966, 0.0353605810957, 0.0322793623201, -0.0307481566657}, 0.0996 }, + { + 32, /* mesa */ + {0.495930895017, 0.376476419856, 0.303586589503, 0.197845120631, 0.0899987258287, 0.00535662962566, -0.0475751298521, -0.0519576953746, -0.0376515865627, -0.0168652310379, -0.00508935920432, 0.00888673824726, 0.0109356809664, 0.00654236486877, -0.0122417367265, -0.0265484743045, -0.0339837870474, -0.0233241554396, -0.0127914848925, -0.00515836827508, -0.0209864779144, -0.0475368628257, -0.0782299905969, -0.0909360283527, -0.0983527406681, -0.0938199589393, -0.0898861541372, -0.0810532718198, -0.0815503996776, -0.0796236089322, -0.0749972587191, -0.0599151413182}, + {0.0, 0.534078389658, 0.294930996327, 0.0991032789063, -0.0272295349878, -0.0770236019127, -0.0705005212384, -0.0257307535864, 0.0146092582685, 0.0379865150974, 0.0359872042115, 0.0230902724993, -0.000725294921074, -0.0174606095957, -0.0236682462783, -0.00669570447944, 0.021362472642, 0.0512331674592, 0.0584309807453, 0.044407663655, 0.00900197651083, -0.0217065441135, -0.037007819832, -0.0257650758221, -0.00590170187955, 0.0194528583388, 0.0320489572473, 0.030386820278, 0.00581345215134, -0.02347217653, -0.0472400829369, -0.0430772235107}, + 0.2500 + }, + { + 32, /* pro_jr */ + {0.767221028694, 0.44461349725, 0.324943328323, 0.187583401624, 0.0585707039826, -0.036895934974, -0.0893306767021, -0.0935390488322, -0.0758668196298, -0.0408583447944, -0.0309741335777, -0.0417509830741, -0.0550681782871, -0.0417048932451, -0.0295194484972, -0.0177059350466, -0.0189517349534, -0.0180093708399, -0.0336546809637, -0.0511188019942, -0.0648908298083, -0.0619349722444, -0.058573104994, -0.0470621645996, -0.0597723312001, -0.0855574645731, -0.109611426273, -0.113648127167, -0.112000636381, -0.0909222239483, -0.0727424833493, -0.0362189061166}, + {0.0, 0.62970643913, 0.293410547935, 0.0578415012725, -0.0672697168081, -0.094466063484, -0.0596589574295, 0.000648321788151, 0.0432524054305, 0.0596811813862, 0.0366985835211, 0.0035102339371, -0.0156226319473, -0.00793362884142, 0.00010974226424, 0.00946937446156, 0.012432810986, 0.0166353982569, 0.00885441580212, 0.00176491241101, -0.00465797946213, -0.00706780418692, -0.0169292031721, -0.0217285491491, -0.0298358684941, -0.0214136482558, 0.00603804801211, 0.0432427970473, 0.0585065590431, 0.0472784452715, -0.00622503195681, -0.0778508047032}, + 0.2500 + }, }; Model32 @@ -143,6 +167,18 @@ {0.0, 0.51943795847, 0.326729354403, 0.149229797985, 0.0109767104297, -0.0732768493116, -0.111088974509, -0.110789539541, -0.0898934114003, -0.0564578047856, -0.0231004313356, 0.0069673688738, 0.0254240918116, 0.0337510299271, 0.0282514883492, 0.0147089116391, -0.00647743824673, -0.0269028751263, -0.0446349197143, -0.0510564142456, -0.0478791675617, -0.0324832722564, -0.0121393859238, 0.0104982033447, 0.0241412382054, 0.026038551433, 0.00994372364326, -0.0158545375622, -0.0436236854665, -0.0537883431888, -0.032574614307, 0.0387767610956}, 0.0666 }, + { + 32, /* mesa */ + {0.800744790951, 0.174351736281, 0.162047205857, 0.138794638546, 0.105850412073, 0.0723656260485, 0.0365740092219, 0.00431957094182, -0.0274260159266, -0.052813754463, -0.0747002681782, -0.0875980404567, -0.0959206315285, -0.0964326627017, -0.0951211930444, -0.0890916136798, -0.0839336477818, -0.0759587618493, -0.0699911420952, -0.0618103150195, -0.0562569921852, -0.0497246788081, -0.0474425366429, -0.045118852226, -0.0466084665482, -0.0466183009403, -0.048518031551, -0.0465434705359, -0.0436608634155, -0.0338725172886, -0.0202008830722, 0.0028064387038}, + {0.0, 0.348283848037, 0.278266186344, 0.208315992656, 0.142238507639, 0.0877418515218, 0.0426721771028, 0.0101211230173, -0.0142620082039, -0.0279206093939, -0.0353541175487, -0.0344380562925, -0.030780249931, -0.0230674032021, -0.016830370528, -0.00961683532214, -0.00530786189015, -0.000225073976316, 0.00276994164541, 0.00775476255757, 0.0114020240885, 0.0168731013913, 0.0203623771917, 0.0249313385656, 0.0267810408235, 0.0287888955038, 0.026286558388, 0.0210452426156, 0.00782753651909, -0.0119982689793, -0.0444362907999, -0.0880582917654}, + 0.2500 + }, + { + 32, /* pro_jr */ + {0.909835294941, 0.237116967883, 0.220493213781, 0.188296175986, 0.145804855731, 0.1035213914, 0.0593519550104, 0.018535542445, -0.0211984146917, -0.0519769598497, -0.0754321013216, -0.0869433378891, -0.0920887014799, -0.087865027182, -0.0792907797887, -0.0637463287733, -0.0482713945314, -0.0325419993651, -0.0236382913314, -0.0187673840883, -0.0211003792763, -0.0242608362201, -0.0299312006336, -0.032972160693, -0.038384284548, -0.0433373155719, -0.0522438990617, -0.0598215574684, -0.0680342990137, -0.0706075753658, -0.0696540637908, -0.0592163425206}, + {0.0, 0.437589362895, 0.316542061632, 0.204591087565, 0.109610647885, 0.0395709089276, -0.0101168883103, -0.0392507441308, -0.0536854447628, -0.0525994961208, -0.0429181531663, -0.0263178649123, -0.0108114446263, 0.00361113168474, 0.0124368978113, 0.0183164472387, 0.0173632458965, 0.0133080282174, 0.00451776800884, -0.0027292732446, -0.0084152300302, -0.00649797485834, 0.000343904158769, 0.0135853277076, 0.0260015642816, 0.0368350330248, 0.0397116093504, 0.035854103932, 0.0201173890247, -0.00598389310382, -0.0479894271495, -0.10412912505}, + 0.2500 + }, }; Model32 @@ -183,5 +219,17 @@ {0.0, 0.495552580909, 0.326384725738, 0.167649233033, 0.0373913746446, -0.049802990613, -0.0971841927371, -0.108389008817, -0.0971430950292, -0.0702481334571, -0.0402478232447, -0.00995144228925, 0.0120995492915, 0.0263638891687, 0.0284733804008, 0.0226883648689, 0.00733748451124, -0.0103570201666, -0.0304762029918, -0.0447374261541, -0.0534169560389, -0.0509721172171, -0.0411315716449, -0.0225994268992, -0.00306083571223, 0.0162408742504, 0.0258967736277, 0.0250750690024, 0.00862389563333, -0.0164131934788, -0.0455336929843, -0.0629205840552}, 0.0663 }, + { + 32, /* mesa */ + {0.816556812848, 0.150293117891, 0.141795487793, 0.124839522537, 0.099196755702, 0.0723627786971, 0.0428519140057, 0.0161310830227, -0.0110923701697, -0.034007587359, -0.0554568663798, -0.070468417213, -0.0823376819593, -0.0871844200317, -0.0898440433576, -0.0874713568897, -0.0851052646307, -0.0795934648554, -0.075427699709, -0.0687589148326, -0.0639930873009, -0.0572185996408, -0.0529180674694, -0.0475806410473, -0.0456514163291, -0.0429752541034, -0.0432519558816, -0.0416267292155, -0.0408422393067, -0.0352236824279, -0.0269876908459, -0.0103181623672}, + {0.0, 0.324884890574, 0.268628249933, 0.210962607294, 0.15379956812, 0.104238396719, 0.0608732030517, 0.0272239220101, -0.000475953058616, -0.019347999351, -0.0332735025431, -0.039418716712, -0.0418327023679, -0.0385575041649, -0.0342524288567, -0.0267537524134, -0.0202714386094, -0.0115967221036, -0.00421419915726, 0.0052675530631, 0.0133773574491, 0.0230906449798, 0.0303465968119, 0.0374618799867, 0.0402738707573, 0.0409671902591, 0.0352080031286, 0.0253938319794, 0.0070273986645, -0.0175302180141, -0.0528396401673, -0.0967034944448}, + 0.2500 + }, + { + 32, /* pro_jr */ + {0.925365759135, 0.205121186223, 0.193282167511, 0.170964672217, 0.139026712618, 0.10615970874, 0.0712170483592, 0.0387785989803, 0.00565122246474, -0.022529589284, -0.0474765753603, -0.0638195347354, -0.0750789855745, -0.0781013105481, -0.0774023301337, -0.0698851353181, -0.0601759362765, -0.0460666153988, -0.033417255906, -0.0207620686126, -0.0136627961657, -0.008873845834, -0.00924040700271, -0.00959897299234, -0.0122760927684, -0.0134131792383, -0.0169861222268, -0.0197237904964, -0.0247929394164, -0.0274056341581, -0.0290372582108, -0.0230858292646}, + {0.0, 0.384047660947, 0.296120799911, 0.212432468703, 0.136561707438, 0.0758675413252, 0.0277844248084, -0.00596868040294, -0.0302987351926, -0.0432929213814, -0.0490562834943, -0.0462652470517, -0.0403753213236, -0.030690892845, -0.022025662253, -0.0121577019191, -0.00457323646437, 0.00324370289428, 0.00777535572758, 0.0119010287281, 0.0130997070818, 0.0155933691883, 0.0177344547654, 0.023362610354, 0.028693981754, 0.0347549373256, 0.0352150834795, 0.0303066390313, 0.0145055938776, -0.0110543984149, -0.0508137742561, -0.102480420772}, + 0.2500 + }, }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caps-0.4.2/Cabinet.cc new/caps-0.4.4/Cabinet.cc --- old/caps-0.4.2/Cabinet.cc 2007-06-16 20:37:48.000000000 +0200 +++ new/caps-0.4.4/Cabinet.cc 2007-07-06 15:50:07.000000000 +0200 @@ -205,9 +205,6 @@ void CabinetII::switch_model (int m) { - if (m < 0) m = 0; - else if (m > 5) m = 5; - model = m; n = models[m].n; @@ -276,7 +273,7 @@ }, { "model", INPUT | CONTROL, - {BOUNDED | INTEGER | DEFAULT_1, 0, 5} + {BOUNDED | INTEGER | DEFAULT_1, 0, 7} }, { "gain (dB)", INPUT | CONTROL, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caps-0.4.2/Descriptor.h new/caps-0.4.4/Descriptor.h --- old/caps-0.4.2/Descriptor.h 2007-06-16 14:05:57.000000000 +0200 +++ new/caps-0.4.4/Descriptor.h 2009-07-28 18:38:03.000000000 +0200 @@ -1,7 +1,7 @@ /* Descriptor.h - Copyright 2004-6 Tim Goetze <tim(a)quitte.de> + Copyright 2004-9 Tim Goetze <tim(a)quitte.de> http://quitte.de/dsp/ @@ -11,7 +11,7 @@ Descriptor<P> expects P to declare some common methods, like init(), activate() etc, plus a static port_info[] and LADSPA_Data * ports[] - and adding_gain. + and adding_gain. (P should derive from Plugin, too.) */ /* @@ -48,8 +48,6 @@ : public LADSPA_Descriptor { public: - static int thishostsucks; - DescriptorStub() { PortCount = 0; @@ -85,10 +83,6 @@ : public DescriptorStub { public: - /* Tom Szilyagi reports that hosts exist which call activate() before - * connect_port(). Since CAPS' plugins expect ports to be valid we - * need a safeguard: at instantiation, each port is connected to the - * lower bound. */ LADSPA_PortRangeHint * ranges; public: @@ -100,7 +94,7 @@ PortCount = (sizeof (T::port_info) / sizeof (PortInfo)); /* unroll PortInfo members */ - char ** names = new char * [PortCount]; + const char ** names = new const char * [PortCount]; LADSPA_PortDescriptor * desc = new LADSPA_PortDescriptor [PortCount]; ranges = new LADSPA_PortRangeHint [PortCount]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caps-0.4.2/Eq.cc new/caps-0.4.4/Eq.cc --- old/caps-0.4.2/Eq.cc 2007-06-18 17:41:46.000000000 +0200 +++ new/caps-0.4.4/Eq.cc 2007-06-23 22:34:39.000000000 +0200 @@ -47,7 +47,7 @@ return g * adjust[i]; } -#define Q 1.2 +#define Q 1.414 void Eq::init() @@ -116,7 +116,7 @@ }, { "31 Hz", INPUT | CONTROL, - {BOUNDED | DEFAULT_LOW, -48, 24} + {BOUNDED | DEFAULT_0, -48, 24} }, { "63 Hz", INPUT | CONTROL, @@ -327,4 +327,9 @@ autogen(); } +/* //////////////////////////////////////////////////////////////////////// */ +/* + todo: parametric -- 20-400, 60-1k, 150-2.5k, 500-8k, 1k-20k + bandwidth 0-2 octaves + */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caps-0.4.2/Makefile new/caps-0.4.4/Makefile --- old/caps-0.4.2/Makefile 2007-06-19 10:19:01.000000000 +0200 +++ new/caps-0.4.4/Makefile 2009-08-03 18:27:41.000000000 +0200 @@ -1,15 +1,21 @@ PREFIX = /usr/local CC = g++ -OPTS = -O2 -ffast-math -funroll-loops -Wall -fPIC -DPIC + +# only use -ffast-math if you're feeling mighty adventurous. (g++ issues) +OPTS = -O2 -funroll-loops -Wall -fPIC -DPIC #OPTS = -g -DDEBUG +_LDFLAGS = -nostartfiles -shared +STRIP = strip + -include defines.make CFLAGS = $(OPTS) $(_CFLAGS) +LDFLAGS = $(_LDFLAGS) $(CFLAGS) PLUG = caps -VERSION = 0.4.2 +VERSION = 0.4.4 SOURCES = $(wildcard *.cc) OBJECTS = $(SOURCES:.cc=.o) @@ -20,7 +26,7 @@ DEST = $(PREFIX)/lib/ladspa RDFDEST = $(PREFIX)/share/ladspa/rdf -# all systems go ############################################################## +# all systems go ------------------------------------------------------------- all: depend $(PLUG).so tags @@ -42,20 +48,20 @@ python tools/make-rdf.py > $(PLUG).rdf $(PLUG).so: $(OBJECTS) - $(CC) -nostartfiles $(CFLAGS) -shared -o $@ $(OBJECTS) + $(CC) $(LDFLAGS) -o $@ $(OBJECTS) .cc.s: $(CC) $(CFLAGS) -S $< .cc.o: depend - $(CC) $(CFLAGS) -I/usr/local/include -c $< + $(CC) $(CFLAGS) -c $< tags: $(SOURCES) $(HEADERS) @echo making tags @-if [ -x /usr/bin/ctags ]; then ctags $(SOURCES) $(HEADERS) ; fi install: all - strip $(PLUG).so + @$(STRIP) $(PLUG).so > /dev/null install -d $(DEST) install -m 644 $(PLUG).so $(DEST) install -d $(RDFDEST) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caps-0.4.2/basics.h new/caps-0.4.4/basics.h --- old/caps-0.4.2/basics.h 2007-06-16 20:06:15.000000000 +0200 +++ new/caps-0.4.4/basics.h 2009-07-28 18:38:03.000000000 +0200 @@ -1,7 +1,7 @@ /* basics.h - Copyright 2004-5 Tim Goetze <tim(a)quitte.de> + Copyright 2004-9 Tim Goetze <tim(a)quitte.de> http://quitte.de/dsp/ @@ -32,7 +32,7 @@ #define _GNU_SOURCE 1 #define _USE_GNU 1 -/* gcc protects a lot of standard math calls. */ +/* unlocking some standard math calls. */ #define __USE_ISOC99 1 #define __USE_ISOC9X 1 #define _ISOC99_SOURCE 1 @@ -48,9 +48,9 @@ #include "ladspa.h" +/* reducing LADSPA_DEFINES_WITH_LOTS_OF_CHARACTERS_REALLY verbosity */ #define BOUNDED (LADSPA_HINT_BOUNDED_BELOW | LADSPA_HINT_BOUNDED_ABOVE) #define INTEGER LADSPA_HINT_INTEGER -/* #define FS LADSPA_HINT_SAMPLE_RATE *//* deprecated */ #define LOG LADSPA_HINT_LOGARITHMIC #define TOGGLE LADSPA_HINT_TOGGLED @@ -74,6 +74,8 @@ #define TEN_TO_THE_SIXTH 1000000 #define MIN_GAIN .000001 /* -120 dB */ + +/* smallest non-denormal 32 bit IEEE float is 1.18�10-38 */ #define NOISE_FLOOR .00000000000005 /* -266 dB */ typedef __int8_t int8; @@ -86,7 +88,7 @@ typedef __uint64_t uint64; typedef struct { - char * name; + const char * name; LADSPA_PortDescriptor descriptor; LADSPA_PortRangeHint range; } PortInfo; @@ -140,7 +142,7 @@ return (float) random() / (float) RAND_MAX; } -/* for testing only. */ +/* NB: also true if 0 */ inline bool is_denormal (float & f) { @@ -148,7 +150,7 @@ return ((i & 0x7f800000) == 0); } -/* not sure if this double version is correct, actually ... */ +/* todo: not sure if this double version is correct, actually ... */ inline bool is_denormal (double & f) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caps-0.4.2/caps.html new/caps-0.4.4/caps.html --- old/caps-0.4.2/caps.html 2007-06-19 10:19:45.000000000 +0200 +++ new/caps-0.4.4/caps.html 2009-11-09 02:37:48.000000000 +0100 @@ -134,7 +134,7 @@ <h2>The CAPS Audio Plugin Suite</h2> <table border=0 width=100% cellpadding=0 cellspacing=0> <tr> <td align=left width=20%> - <b>Release 0.4.1</b> + <b>Release 0.4.4</b> </td> <td rowspan=2 align=center> <a href=http://quitte.de/dsp/caps.html title="Yes, this page, only guaranteed fresh!">http://quitte.de/dsp/caps.html</a> @@ -145,7 +145,7 @@ </tr> <tr> <td align=left> - June 19, 2007 </td> + November 9, 2009 </td> <td align=right> <a href=mailto:tim@quitte.de?subject=CAPS>tim(a)quitte.de</a> </td> @@ -256,6 +256,14 @@ <a href=http://ccrma.stanford.edu/>CCRMA</a>. </p> <p> + Invaluable suggestions, bug hunting and fixing and + numerous patient reminders + of the sorry state of affairs + have been graciously + provided by (among others and in no particular order) + Sampo Savolainen, Damon Chaplin, Paul Winkler and Niclas Wretström. + </p> + <p> All of CAPS is <a href=COPYING>free software</a> and distributed in source code. </p> @@ -321,15 +329,16 @@ </p> <pre align=left> -$ tar xvfz caps_0.4.1.tar.gz  -$ cd caps-0.4.1  +$ tar xvfz caps_0.4.4.tar.gz  +$ cd caps-0.4.4  $ ./configure.py $ make $ su # make install</pre> <p> - (The <tt>configure.py</tt> step is optional but recommended.) + The <tt>configure.py</tt> step is optional on Linux but recommended + for optimum performance. </p> <p> You should now be able use the plugins from the collection @@ -349,15 +358,20 @@ <a href=http://www.debian.org>downgrade now</a>? </p> + <h5>OSX</h5> <p> - PPC and other non-x86 users may have to edit the - Makefile. - CAPS should compile on OSX but I haven't been able to test it. + <tt>configure.py</tt> should detect an OSX build and prepare the + relevant flags for Apple's different-thinking <tt>ld</tt> + implementation. + Mind you, this is untested by me and + not guaranteed to actually work. If it does, please + tell me. Thanks! </p> <h5>Troubleshooting</h5> <p> - With no external dependencies, compiling CAPS should rarely fail. If it + With no external dependencies, compiling CAPS + should rarely fail on a Linux box. If it does on your machine, please send the output of the <tt>make</tt> command so we can try and fix the problem. </p> @@ -409,6 +423,10 @@ for your life, but the sonic experience may differ from what is advertised. </p> + <p> + Usage at sample rates of 176 kHz or higher may cause problems with some + plugins. We recommend not exceeding 100 kHz for all applications. + </p> <h5>Realtime Use</h5> <p> @@ -461,6 +479,20 @@ <li> Processing blocks larger than 2<sup>31</sup> - 1 aren't supported. </li> + <li> + Old <tt>jack-rack</tt> host versions have some crazy ideas about the + default control parameters of the CAPS plugins – they're all + over the place. + </li> + <li> + Sample rates in excess of 100 kHz may cause some plugins to develop + problems. + </li> + <li> + The <a href=#White>White</a> plugin + actually produces a slightly purplish signal despite the rather + boastful claims of signal purity made elsewhere. + </li> </ul>  <br> @@ -1050,7 +1082,7 @@ and <a href=#SweepVFII>SweepVFII</a> units, the difference being that the filter is hard-wired for bandpass operation and the band centre frequency is modulated by an envelope-following circuit. - In short, an effect commonly estimated and known as an automatic wah, + In short, an effect commonly known and esteemed as an automatic wah, or AutoWah. Probably most useful with instruments allowing fine control over dynamics at all times. </p> @@ -1431,12 +1463,22 @@ </ul> <p> You can fetch the data sheet compilation - <a href=http://quitte.de/dsp/caps-0.4.1.pdf>from the CAPS homepage</a>. + <a href=http://quitte.de/dsp/caps-0.4.4.pdf>from the CAPS homepage</a>. </p> <a name=Changelog><h4>Changelog</h4></a> <pre> +0.4.3 + * basics.h cleanup / comments + * minor Makefile cleanup + * comment cosmetics + * Eq and Eq2x2 per-band Q changed to 1.414 (= 1 octave) + * Eq lowest band default value fixed to read 0 + * Niclas' fix for the bessel function implemented + * uninitialised plugin states eliminated thanks to Damon + * linker options for OSX added to the Makefile + 0.4.2 * fixed the 'model' port index for AmpVTS in the RDF generator @@ -1642,7 +1684,7 @@  <br> <div class=foot> - tim@<a href=http://quitte.de/>quitte.de</a>, June 19 2007. + tim@<a href=http://quitte.de/>quitte.de</a>, November 9 2009. </div> </center> </body> </html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caps-0.4.2/caps.rdf new/caps-0.4.4/caps.rdf --- old/caps-0.4.2/caps.rdf 2007-06-19 09:58:23.000000000 +0200 +++ new/caps-0.4.4/caps.rdf 2007-07-06 16:05:49.000000000 +0200 @@ -60,13 +60,23 @@ <ladspa:hasPoint> <ladspa:Point rdf:value="4" - ladspa:hasLabel="Wing 68" /> + ladspa:hasLabel="Little Wing 68" /> </ladspa:hasPoint> <ladspa:hasPoint> <ladspa:Point rdf:value="5" ladspa:hasLabel="Martial" /> </ladspa:hasPoint> + <ladspa:hasPoint> + <ladspa:Point + rdf:value="6" + ladspa:hasLabel="Mesa" /> + </ladspa:hasPoint> + <ladspa:hasPoint> + <ladspa:Point + rdf:value="7" + ladspa:hasLabel="Pro Jr" /> + </ladspa:hasPoint> </ladspa:Scale> </ladspa:hasScale> </ladspa:InputControlPort> @@ -245,13 +255,23 @@ <ladspa:hasPoint> <ladspa:Point rdf:value="4" - ladspa:hasLabel="Wing 68" /> + ladspa:hasLabel="Little Wing 68" /> </ladspa:hasPoint> <ladspa:hasPoint> <ladspa:Point rdf:value="5" ladspa:hasLabel="Martial" /> </ladspa:hasPoint> + <ladspa:hasPoint> + <ladspa:Point + rdf:value="6" + ladspa:hasLabel="Mesa" /> + </ladspa:hasPoint> + <ladspa:hasPoint> + <ladspa:Point + rdf:value="7" + ladspa:hasLabel="Pro Jr" /> + </ladspa:hasPoint> </ladspa:Scale> </ladspa:hasScale> </ladspa:InputControlPort> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caps-0.4.2/configure.py new/caps-0.4.4/configure.py --- old/caps-0.4.2/configure.py 2007-06-17 13:59:08.000000000 +0200 +++ new/caps-0.4.4/configure.py 2009-08-03 18:27:49.000000000 +0200 @@ -2,6 +2,7 @@ import os CFLAGS = [] +OSX_LDFLAGS = "-bundle -undefined suppress -flat_namespace" def we_have_sse(): try: return 'sse' in open ('/proc/cpuinfo').read().split() @@ -10,10 +11,17 @@ try: return 'ssse3' in open ('/proc/cpuinfo').read().split() except: return 0 +def we_think_so_different_dude(): + try: return 'Darwin' == os.popen ('uname -s').read().strip() + except: return 0 + def store(): f = open ('defines.make', 'w') print >> f, "_CFLAGS=" + ' '.join (CFLAGS) - + if we_think_so_different_dude(): + print >> f, "_LDFLAGS=", OSX_LDFLAGS + print >> f, "STRIP = echo" + if __name__ == '__main__': if we_have_sse(): CFLAGS += ('-msse', '-mfpmath=sse') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caps-0.4.2/dsp/BiQuad.h new/caps-0.4.4/dsp/BiQuad.h --- old/caps-0.4.2/dsp/BiQuad.h 2007-06-16 20:23:38.000000000 +0200 +++ new/caps-0.4.4/dsp/BiQuad.h 2007-06-19 14:29:27.000000000 +0200 @@ -1,11 +1,11 @@ /* dsp/BiQuad.h - Copyright 2003-4 Tim Goetze <tim(a)quitte.de> + Copyright 2003-7 Tim Goetze <tim(a)quitte.de> http://quitte.de/dsp/ - bi-quad implementation. + Bi-quad IIR filter. */ /* @@ -42,6 +42,7 @@ BiQuad() { + /* initialize to unity */ a[0] = 1; a[1] = a[2] = b[0] = b[1] = b[2] = 0; @@ -92,8 +93,9 @@ return r; } - /* additional methods for using the biquad to filter an - * upsampled signal with 0 padding */ + /* Following are additional methods for using the biquad to filter an + * upsampled signal with 0 padding -- some terms reduce to 0 in this + * case */ inline d_sample process_0_1() { register int z = h; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caps-0.4.2/dsp/OnePole.h new/caps-0.4.4/dsp/OnePole.h --- old/caps-0.4.2/dsp/OnePole.h 2007-06-16 20:23:38.000000000 +0200 +++ new/caps-0.4.4/dsp/OnePole.h 2007-06-19 18:02:31.000000000 +0200 @@ -1,7 +1,7 @@ /* dsp/OnePole.h - Copyright 2003-4 Tim Goetze <tim(a)quitte.de> + Copyright 2003-7 Tim Goetze <tim(a)quitte.de> http://quitte.de/dsp/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caps-0.4.2/dsp/RMS.h new/caps-0.4.4/dsp/RMS.h --- old/caps-0.4.2/dsp/RMS.h 2007-06-12 22:42:53.000000000 +0200 +++ new/caps-0.4.4/dsp/RMS.h 2007-12-29 00:20:16.000000000 +0100 @@ -32,9 +32,11 @@ class RMS { - public: + protected: d_sample buffer[64]; int write; + + public: double sum; RMS() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caps-0.4.2/dsp/ToneStack.h new/caps-0.4.4/dsp/ToneStack.h --- old/caps-0.4.2/dsp/ToneStack.h 2007-06-17 20:27:10.000000000 +0200 +++ new/caps-0.4.4/dsp/ToneStack.h 2009-07-28 18:38:03.000000000 +0200 @@ -1,7 +1,7 @@ /* ToneStack.h - Copyright 2006-7 + Copyright 2006-9 David Yeh <dtyeh(a)ccrma.stanford.edu> (implementation) Tim Goetze <tim(a)quitte.de> (cosmetics) @@ -83,6 +83,7 @@ ToneStack() { + model = -1; setparams (presets[0]); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caps-0.4.2/dsp/windows.h new/caps-0.4.4/dsp/windows.h --- old/caps-0.4.2/dsp/windows.h 2005-09-27 21:47:04.000000000 +0200 +++ new/caps-0.4.4/dsp/windows.h 2009-07-28 18:38:03.000000000 +0200 @@ -1,7 +1,7 @@ /* dsp/windows.h - Copyright 2004 Tim Goetze <tim(a)quitte.de> + Copyright 2004-9 Tim Goetze <tim(a)quitte.de> http://quitte.de/dsp/ @@ -148,12 +148,12 @@ double k = besseli ((beta * sqrt (1 - pow ((2 * i / (n - 1)), 2)))) / bb; /* can you spell hack */ - if (!finite (k)) + if (!finite (k) || isnan(k)) k = 0; F (s[si], k); } - /* assymetrical hack: sort out first value! + /* asymmetrical hack: sort out first value! win[0] = win[len-1]; */ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/caps-0.4.2/interface.cc new/caps-0.4.4/interface.cc --- old/caps-0.4.2/interface.cc 2007-06-17 13:07:16.000000000 +0200 +++ new/caps-0.4.4/interface.cc 2009-07-28 18:38:03.000000000 +0200 @@ -1,7 +1,7 @@ /* interface.cc - Copyright 2004-7 Tim Goetze <tim(a)quitte.de> + Copyright 2004-9 Tim Goetze <tim(a)quitte.de> http://quitte.de/dsp/ ++++++ ladspa.dif ++++++ --- /var/tmp/diff_new_pack.RKtF0t/_old 2010-04-03 00:20:44.000000000 +0200 +++ /var/tmp/diff_new_pack.RKtF0t/_new 2010-04-03 00:20:44.000000000 +0200 @@ -1,6 +1,8 @@ ---- ladspa_sdk/src/makefile -+++ ladspa_sdk/src/makefile 2002/05/07 10:59:53 -@@ -28,6 +28,9 @@ +Index: ladspa_sdk/src/makefile +=================================================================== +--- ladspa_sdk/src/makefile.orig ++++ ladspa_sdk/src/makefile +@@ -27,6 +27,9 @@ PROGRAMS = ../bin/analyseplugin \ ../bin/listplugins CC = cc CPP = c++ @@ -10,18 +12,20 @@ ############################################################################### # -@@ -59,7 +62,7 @@ - play /tmp/test.wav +@@ -59,7 +62,7 @@ test: /tmp/test.wav ../snd/noise.wav alw + @echo Test complete. install: targets -- -mkdirhier $(INSTALL_PLUGINS_DIR) \ -+ -$(MKDIRHIER) $(INSTALL_PLUGINS_DIR) \ - $(INSTALL_INCLUDE_DIR) \ - $(INSTALL_BINARY_DIR) +- -mkdirhier $(INSTALL_PLUGINS_DIR) ++ -$(MKDIRHIER) $(INSTALL_PLUGINS_DIR) + -mkdirhier $(INSTALL_INCLUDE_DIR) + -mkdirhier $(INSTALL_BINARY_DIR) cp ../plugins/* $(INSTALL_PLUGINS_DIR) ---- ladspa_sdk/src/plugins/amp.c -+++ ladspa_sdk/src/plugins/amp.c 2002/05/07 12:17:35 -@@ -152,8 +152,8 @@ +Index: ladspa_sdk/src/plugins/amp.c +=================================================================== +--- ladspa_sdk/src/plugins/amp.c.orig ++++ ladspa_sdk/src/plugins/amp.c +@@ -152,8 +152,8 @@ LADSPA_Descriptor * g_psStereoDescriptor /* _init() is called automatically when the plugin library is first loaded. */ @@ -32,7 +36,7 @@ char ** pcPortNames; LADSPA_PortDescriptor * piPortDescriptors; -@@ -333,8 +333,8 @@ +@@ -335,8 +335,8 @@ deleteDescriptor(LADSPA_Descriptor * psD /*****************************************************************************/ /* _fini() is called automatically when the library is unloaded. */ @@ -43,9 +47,11 @@ deleteDescriptor(g_psMonoDescriptor); deleteDescriptor(g_psStereoDescriptor); } ---- ladspa_sdk/src/plugins/delay.c -+++ ladspa_sdk/src/plugins/delay.c 2002/05/07 12:17:09 -@@ -228,8 +228,8 @@ +Index: ladspa_sdk/src/plugins/delay.c +=================================================================== +--- ladspa_sdk/src/plugins/delay.c.orig ++++ ladspa_sdk/src/plugins/delay.c +@@ -228,8 +228,8 @@ LADSPA_Descriptor * g_psDescriptor = NUL /* _init() is called automatically when the plugin library is first loaded. */ @@ -56,7 +62,7 @@ char ** pcPortNames; LADSPA_PortDescriptor * piPortDescriptors; -@@ -318,8 +318,8 @@ +@@ -322,8 +322,8 @@ _init() { /*****************************************************************************/ /* _fini() is called automatically when the library is unloaded. */ @@ -67,9 +73,11 @@ long lIndex; if (g_psDescriptor) { free((char *)g_psDescriptor->Label); ---- ladspa_sdk/src/plugins/filter.c -+++ ladspa_sdk/src/plugins/filter.c 2002/05/07 12:17:53 -@@ -252,8 +252,8 @@ +Index: ladspa_sdk/src/plugins/filter.c +=================================================================== +--- ladspa_sdk/src/plugins/filter.c.orig ++++ ladspa_sdk/src/plugins/filter.c +@@ -252,8 +252,8 @@ LADSPA_Descriptor * g_psHPFDescriptor = /* _init() is called automatically when the plugin library is first loaded. */ @@ -80,7 +88,7 @@ char ** pcPortNames; LADSPA_PortDescriptor * piPortDescriptors; -@@ -429,8 +429,8 @@ +@@ -431,8 +431,8 @@ deleteDescriptor(LADSPA_Descriptor * psD /*****************************************************************************/ /* _fini() is called automatically when the library is unloaded. */ @@ -91,9 +99,11 @@ deleteDescriptor(g_psLPFDescriptor); deleteDescriptor(g_psHPFDescriptor); } ---- ladspa_sdk/src/plugins/noise.c -+++ ladspa_sdk/src/plugins/noise.c 2002/05/07 12:18:09 -@@ -142,8 +142,8 @@ +Index: ladspa_sdk/src/plugins/noise.c +=================================================================== +--- ladspa_sdk/src/plugins/noise.c.orig ++++ ladspa_sdk/src/plugins/noise.c +@@ -142,8 +142,8 @@ LADSPA_Descriptor * g_psDescriptor; /* _init() is called automatically when the plugin library is first loaded. */ @@ -104,7 +114,7 @@ char ** pcPortNames; LADSPA_PortDescriptor * piPortDescriptors; -@@ -217,8 +217,8 @@ +@@ -219,8 +219,8 @@ _init() { /*****************************************************************************/ /* _fini() is called automatically when the library is unloaded. */ ++++++ ladspa_sdk_1.12.tar.bz2 -> ladspa_sdk_1.13.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ladspa_sdk/doc/changes.html new/ladspa_sdk/doc/changes.html --- old/ladspa_sdk/doc/changes.html 2002-08-07 23:26:26.000000000 +0200 +++ new/ladspa_sdk/doc/changes.html 2007-11-06 12:01:27.000000000 +0100 @@ -94,9 +94,27 @@ <LI>Remove memory leak in search code.</LI> +</UL> + <H2>Version 1.12 - 7 Aug 2002</H2> <UL> <LI>Update for LADSPA v1.1 (default values and 1.0f=0dB).</LI> </UL> + +<H2>Version 1.13 - 6 Nov 2007</H2> +<UL> + +<LI>Fix compile error in sine.cpp (GCC4).</LI> + +<LI>Fix typo in text output by analyseplugin.</LI> + +<LI>Extra usage text in analyseplugin and applyplugin.</LI> + +<LI>Replace strdup() with localStrdup() in sine.cpp to avoid +malloc/new mismatch.</LI> + +<LI>Remove "local" part from install directories.</LI> + +</UL> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ladspa_sdk/doc/overview.html new/ladspa_sdk/doc/overview.html --- old/ladspa_sdk/doc/overview.html 2002-08-07 23:26:26.000000000 +0200 +++ new/ladspa_sdk/doc/overview.html 2007-11-06 11:00:17.000000000 +0100 @@ -1,4 +1,4 @@ -<H1>LADSPA SDK v1.12 Overview</H1> +<H1>LADSPA SDK v1.13 Overview</H1> <P>There is a large number of synthesis packages in use or development on the Linux platform at this time. The Linux Audio Developer's Simple diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ladspa_sdk/src/analyseplugin.c new/ladspa_sdk/src/analyseplugin.c --- old/ladspa_sdk/src/analyseplugin.c 2002-07-06 19:50:39.000000000 +0200 +++ new/ladspa_sdk/src/analyseplugin.c 2007-11-06 11:52:55.000000000 +0100 @@ -121,7 +121,7 @@ printf("Yes\n"); else printf("No\n"); - printf("Has deativate() Function: "); + printf("Has deactivate() Function: "); if (psDescriptor->deactivate != NULL) printf("Yes\n"); else @@ -391,7 +391,9 @@ "Usage:\tanalyseplugin [flags] <LADSPA plugin file name> " "[<plugin label>].\n" "Flags:" - "\t-l\tProduce a summary list rather than a verbose report.\n"); + "-l Produce a summary list rather than a verbose report.\n" + "Note that the LADSPA_PATH environment variable is used " + "to help find plugins.\n"); return(1); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ladspa_sdk/src/applyplugin.c new/ladspa_sdk/src/applyplugin.c --- old/ladspa_sdk/src/applyplugin.c 2002-05-18 19:01:36.000000000 +0200 +++ new/ladspa_sdk/src/applyplugin.c 2007-11-06 11:52:56.000000000 +0100 @@ -798,11 +798,13 @@ "\t[<LADSPA plugin file name> <plugin label> " "<Control1> <Control2>...]...\n" "Flags:" - "\t-s<seconds>\tAdd seconds of silence after end of input file.\n" + "\t-s<seconds> Add seconds of silence after end of input file.\n" "\n" "To find out what control values are needed by a plugin, " "use the\n" - "\"analyseplugin\" program and check for control input ports.\n"); + "\"analyseplugin\" program and check for control input ports.\n" + "Note that the LADSPA_PATH environment variable is used " + "to help find plugins.\n"); return(1); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ladspa_sdk/src/makefile new/ladspa_sdk/src/makefile --- old/ladspa_sdk/src/makefile 2002-07-06 19:34:20.000000000 +0200 +++ new/ladspa_sdk/src/makefile 2007-11-06 11:42:45.000000000 +0100 @@ -1,13 +1,12 @@ ############################################################################### # -# INSTALLATION DIRECTORIES +# Installation DIRECTORIES # -# Change these if you want to install somewhere else. In particularly -# you may wish to remove the middle "local/" part of each entry. +# Change these if you want to install somewhere else. -INSTALL_PLUGINS_DIR = /usr/local/lib/ladspa/ +INSTALL_PLUGINS_DIR = /usr/lib/ladspa/ INSTALL_INCLUDE_DIR = /usr/include/ -INSTALL_BINARY_DIR = /usr/local/bin/ +INSTALL_BINARY_DIR = /usr/bin/ ############################################################################### # @@ -51,17 +50,18 @@ @echo --------------------------------------------- @echo First listen to the white noise input signal: @echo --------------------------------------------- - play ../snd/noise.wav + -sndfile-play ../snd/noise.wav @echo ------------------------- @echo Compare to plugin output. @echo ------------------------- @echo Should be a noise band around 6000Hz, repeated quietly after 1s. - play /tmp/test.wav + -sndfile-play /tmp/test.wav + @echo Test complete. install: targets - -mkdirhier $(INSTALL_PLUGINS_DIR) \ - $(INSTALL_INCLUDE_DIR) \ - $(INSTALL_BINARY_DIR) + -mkdirhier $(INSTALL_PLUGINS_DIR) + -mkdirhier $(INSTALL_INCLUDE_DIR) + -mkdirhier $(INSTALL_BINARY_DIR) cp ../plugins/* $(INSTALL_PLUGINS_DIR) cp ladspa.h $(INSTALL_INCLUDE_DIR) cp ../bin/* $(INSTALL_BINARY_DIR) @@ -74,7 +74,7 @@ echo ; ../bin/analyseplugin -l ../plugins/sine.so ; echo ../bin/analyseplugin ../plugins/amp.so ../bin/analyseplugin ../plugins/noise.so - time ../bin/applyplugin -s 1 \ + ../bin/applyplugin -s 1 \ ../snd/noise.wav /tmp/test.wav \ ../plugins/filter.so lpf 500 \ ../plugins/filter.so lpf 500 \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ladspa_sdk/src/plugins/sine.cpp new/ladspa_sdk/src/plugins/sine.cpp --- old/ladspa_sdk/src/plugins/sine.cpp 2002-07-06 19:23:17.000000000 +0200 +++ new/ladspa_sdk/src/plugins/sine.cpp 2007-11-06 11:13:34.000000000 +0100 @@ -42,6 +42,15 @@ /*****************************************************************************/ +inline char * +localStrdup(const char * input) { + char * output = new char[strlen(input) + 1]; + strcpy(output, input); + return output; +} + +/*****************************************************************************/ + void initialise_sine_table() { if (g_pfSineTable == NULL) { @@ -92,99 +101,139 @@ } friend LADSPA_Handle instantiateSineOscillator(const LADSPA_Descriptor *, - unsigned long SampleRate) { - return new SineOscillator(SampleRate); - } - + unsigned long SampleRate); friend void connectPortToSineOscillator(LADSPA_Handle Instance, unsigned long Port, - LADSPA_Data * DataLocation) { - switch (Port) { - case OSC_FREQUENCY: - ((SineOscillator *)Instance)->m_pfFrequency = DataLocation; - break; - case OSC_AMPLITUDE: - ((SineOscillator *)Instance)->m_pfAmplitude = DataLocation; - break; - case OSC_OUTPUT: - ((SineOscillator *)Instance)->m_pfOutput = DataLocation; - break; - } - } + LADSPA_Data * DataLocation); + friend void activateSineOscillator(void * pvHandle); + friend void runSineOscillator_FreqAudio_AmpAudio(LADSPA_Handle Instance, + unsigned long SampleCount); + friend void runSineOscillator_FreqAudio_AmpCtrl(LADSPA_Handle Instance, + unsigned long SampleCount); + friend void runSineOscillator_FreqCtrl_AmpAudio(LADSPA_Handle Instance, + unsigned long SampleCount); + friend void runSineOscillator_FreqCtrl_AmpCtrl(LADSPA_Handle Instance, + unsigned long SampleCount); + friend void cleanupSineOscillator(void *pvHandle); - friend void activateSineOscillator(void * pvHandle) { - ((SineOscillator *)pvHandle)->m_lPhase = 0; - } +}; - friend void runSineOscillator_FreqAudio_AmpAudio(LADSPA_Handle Instance, - unsigned long SampleCount) { - SineOscillator * poSineOscillator = (SineOscillator *)Instance; - for (unsigned long lIndex = 0; lIndex < SampleCount; lIndex++) { - /* Extract frequency at this point to guarantee inplace - support. */ - LADSPA_Data fFrequency - = (poSineOscillator->m_pfFrequency[lIndex]); - poSineOscillator->m_pfOutput[lIndex] - = (g_pfSineTable[poSineOscillator->m_lPhase >> SINE_TABLE_SHIFT] - * poSineOscillator->m_pfAmplitude[lIndex]); - poSineOscillator->setPhaseStepFromFrequency(fFrequency); - poSineOscillator->m_lPhase - += poSineOscillator->m_lPhaseStep; - } +/*****************************************************************************/ + +LADSPA_Handle +instantiateSineOscillator(const LADSPA_Descriptor *, + unsigned long SampleRate) { + return new SineOscillator(SampleRate); +} + +/*****************************************************************************/ + +void +connectPortToSineOscillator(LADSPA_Handle Instance, + unsigned long Port, + LADSPA_Data * DataLocation) { + switch (Port) { + case OSC_FREQUENCY: + ((SineOscillator *)Instance)->m_pfFrequency = DataLocation; + break; + case OSC_AMPLITUDE: + ((SineOscillator *)Instance)->m_pfAmplitude = DataLocation; + break; + case OSC_OUTPUT: + ((SineOscillator *)Instance)->m_pfOutput = DataLocation; + break; } +} - friend void runSineOscillator_FreqAudio_AmpCtrl(LADSPA_Handle Instance, - unsigned long SampleCount) { - SineOscillator * poSineOscillator = (SineOscillator *)Instance; - LADSPA_Data fAmplitude = *(poSineOscillator->m_pfAmplitude); - for (unsigned long lIndex = 0; lIndex < SampleCount; lIndex++) { - /* Extract frequency at this point to guarantee inplace - support. */ - LADSPA_Data fFrequency - = (poSineOscillator->m_pfFrequency[lIndex]); - poSineOscillator->m_pfOutput[lIndex] - = (g_pfSineTable[poSineOscillator->m_lPhase >> SINE_TABLE_SHIFT] - * fAmplitude); - poSineOscillator->setPhaseStepFromFrequency(fFrequency); - poSineOscillator->m_lPhase - += poSineOscillator->m_lPhaseStep; - } +/*****************************************************************************/ + +void +activateSineOscillator(void * pvHandle) { + ((SineOscillator *)pvHandle)->m_lPhase = 0; +} + +/*****************************************************************************/ + +void +runSineOscillator_FreqAudio_AmpAudio(LADSPA_Handle Instance, + unsigned long SampleCount) { + SineOscillator * poSineOscillator = (SineOscillator *)Instance; + for (unsigned long lIndex = 0; lIndex < SampleCount; lIndex++) { + /* Extract frequency at this point to guarantee inplace + support. */ + LADSPA_Data fFrequency + = (poSineOscillator->m_pfFrequency[lIndex]); + poSineOscillator->m_pfOutput[lIndex] + = (g_pfSineTable[poSineOscillator->m_lPhase >> SINE_TABLE_SHIFT] + * poSineOscillator->m_pfAmplitude[lIndex]); + poSineOscillator->setPhaseStepFromFrequency(fFrequency); + poSineOscillator->m_lPhase + += poSineOscillator->m_lPhaseStep; } +} - friend void runSineOscillator_FreqCtrl_AmpAudio(LADSPA_Handle Instance, - unsigned long SampleCount) { - SineOscillator * poSineOscillator = (SineOscillator *)Instance; - poSineOscillator->setPhaseStepFromFrequency - (*(poSineOscillator->m_pfFrequency)); - for (unsigned long lIndex = 0; lIndex < SampleCount; lIndex++) { - poSineOscillator->m_pfOutput[lIndex] - = (g_pfSineTable[poSineOscillator->m_lPhase >> SINE_TABLE_SHIFT] - * poSineOscillator->m_pfAmplitude[lIndex]); - poSineOscillator->m_lPhase - += poSineOscillator->m_lPhaseStep; - } +/*****************************************************************************/ + +void +runSineOscillator_FreqAudio_AmpCtrl(LADSPA_Handle Instance, + unsigned long SampleCount) { + SineOscillator * poSineOscillator = (SineOscillator *)Instance; + LADSPA_Data fAmplitude = *(poSineOscillator->m_pfAmplitude); + for (unsigned long lIndex = 0; lIndex < SampleCount; lIndex++) { + /* Extract frequency at this point to guarantee inplace + support. */ + LADSPA_Data fFrequency + = (poSineOscillator->m_pfFrequency[lIndex]); + poSineOscillator->m_pfOutput[lIndex] + = (g_pfSineTable[poSineOscillator->m_lPhase >> SINE_TABLE_SHIFT] + * fAmplitude); + poSineOscillator->setPhaseStepFromFrequency(fFrequency); + poSineOscillator->m_lPhase + += poSineOscillator->m_lPhaseStep; } +} - friend void runSineOscillator_FreqCtrl_AmpCtrl(LADSPA_Handle Instance, - unsigned long SampleCount) { - SineOscillator * poSineOscillator = (SineOscillator *)Instance; - LADSPA_Data fAmplitude = *(poSineOscillator->m_pfAmplitude); - poSineOscillator->setPhaseStepFromFrequency - (*(poSineOscillator->m_pfFrequency)); - for (unsigned long lIndex = 0; lIndex < SampleCount; lIndex++) { - poSineOscillator->m_pfOutput[lIndex] - = (g_pfSineTable[poSineOscillator->m_lPhase >> SINE_TABLE_SHIFT] - * fAmplitude); - poSineOscillator->m_lPhase - += poSineOscillator->m_lPhaseStep; - } +/*****************************************************************************/ + +void +runSineOscillator_FreqCtrl_AmpAudio(LADSPA_Handle Instance, + unsigned long SampleCount) { + SineOscillator * poSineOscillator = (SineOscillator *)Instance; + poSineOscillator->setPhaseStepFromFrequency + (*(poSineOscillator->m_pfFrequency)); + for (unsigned long lIndex = 0; lIndex < SampleCount; lIndex++) { + poSineOscillator->m_pfOutput[lIndex] + = (g_pfSineTable[poSineOscillator->m_lPhase >> SINE_TABLE_SHIFT] + * poSineOscillator->m_pfAmplitude[lIndex]); + poSineOscillator->m_lPhase + += poSineOscillator->m_lPhaseStep; } +} - friend void cleanupSineOscillator(void *pvHandle) { - delete (SineOscillator *)pvHandle; +/*****************************************************************************/ + +void +runSineOscillator_FreqCtrl_AmpCtrl(LADSPA_Handle Instance, + unsigned long SampleCount) { + SineOscillator * poSineOscillator = (SineOscillator *)Instance; + LADSPA_Data fAmplitude = *(poSineOscillator->m_pfAmplitude); + poSineOscillator->setPhaseStepFromFrequency + (*(poSineOscillator->m_pfFrequency)); + for (unsigned long lIndex = 0; lIndex < SampleCount; lIndex++) { + poSineOscillator->m_pfOutput[lIndex] + = (g_pfSineTable[poSineOscillator->m_lPhase >> SINE_TABLE_SHIFT] + * fAmplitude); + poSineOscillator->m_lPhase + += poSineOscillator->m_lPhaseStep; } +} -}; +/*****************************************************************************/ + +void +cleanupSineOscillator(void *pvHandle) { + delete (SineOscillator *)pvHandle; +} /*****************************************************************************/ @@ -219,9 +268,9 @@ g_psDescriptors[lPluginIndex]->Properties = LADSPA_PROPERTY_HARD_RT_CAPABLE; g_psDescriptors[lPluginIndex]->Maker - = strdup("Richard Furse (LADSPA example plugins)"); + = localStrdup("Richard Furse (LADSPA example plugins)"); g_psDescriptors[lPluginIndex]->Copyright - = strdup("None"); + = localStrdup("None"); g_psDescriptors[lPluginIndex]->PortCount = 3; piPortDescriptors @@ -235,11 +284,11 @@ g_psDescriptors[lPluginIndex]->PortNames = (const char **)pcPortNames; pcPortNames[OSC_FREQUENCY] - = strdup("Frequency (Hz)"); + = localStrdup("Frequency (Hz)"); pcPortNames[OSC_AMPLITUDE] - = strdup("Amplitude"); + = localStrdup("Amplitude"); pcPortNames[OSC_OUTPUT] - = strdup("Output"); + = localStrdup("Output"); psPortRangeHints = new LADSPA_PortRangeHint[3]; g_psDescriptors[lPluginIndex]->PortRangeHints @@ -280,9 +329,9 @@ switch (lPluginIndex) { case 0: g_psDescriptors[lPluginIndex]->Label - = strdup("sine_faaa"); + = localStrdup("sine_faaa"); g_psDescriptors[lPluginIndex]->Name - = strdup("Sine Oscillator (Freq:audio, Amp:audio)"); + = localStrdup("Sine Oscillator (Freq:audio, Amp:audio)"); piPortDescriptors[OSC_FREQUENCY] = LADSPA_PORT_INPUT | LADSPA_PORT_AUDIO; piPortDescriptors[OSC_AMPLITUDE] @@ -292,9 +341,9 @@ break; case 1: g_psDescriptors[lPluginIndex]->Label - = strdup("sine_faac"); + = localStrdup("sine_faac"); g_psDescriptors[lPluginIndex]->Name - = strdup("Sine Oscillator (Freq:audio, Amp:control)"); + = localStrdup("Sine Oscillator (Freq:audio, Amp:control)"); piPortDescriptors[OSC_FREQUENCY] = LADSPA_PORT_INPUT | LADSPA_PORT_AUDIO; piPortDescriptors[OSC_AMPLITUDE] @@ -304,9 +353,9 @@ break; case 2: g_psDescriptors[lPluginIndex]->Label - = strdup("sine_fcaa"); + = localStrdup("sine_fcaa"); g_psDescriptors[lPluginIndex]->Name - = strdup("Sine Oscillator (Freq:control, Amp:audio)"); + = localStrdup("Sine Oscillator (Freq:control, Amp:audio)"); piPortDescriptors[OSC_FREQUENCY] = LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL; piPortDescriptors[OSC_AMPLITUDE] @@ -316,9 +365,9 @@ break; case 3: g_psDescriptors[lPluginIndex]->Label - = strdup("sine_fcac"); + = localStrdup("sine_fcac"); g_psDescriptors[lPluginIndex]->Name - = strdup("Sine Oscillator (Freq:control, Amp:control)"); + = localStrdup("Sine Oscillator (Freq:control, Amp:control)"); piPortDescriptors[OSC_FREQUENCY] = LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL; piPortDescriptors[OSC_AMPLITUDE] ++++++ pvoc_0.1.10.tar.bz2 -> pvoc_0.1.12.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pvoc-0.1.10/Descriptor.h new/pvoc-0.1.12/Descriptor.h --- old/pvoc-0.1.10/Descriptor.h 2004-03-19 14:05:53.000000000 +0100 +++ new/pvoc-0.1.12/Descriptor.h 2008-01-15 11:19:06.000000000 +0100 @@ -1,7 +1,7 @@ /* Descriptor.h - Copyright 2004 Tim Goetze <tim(a)quitte.de> + Copyright 2004-6 Tim Goetze <tim(a)quitte.de> http://quitte.de/dsp/ @@ -11,16 +11,11 @@ Descriptor<P> expects P to declare some common methods, like init(), activate() etc, plus a static port_info[] and LADSPA_Data * ports[] - and of course 'adding_gain'. - - maintaining both port_info[] and ports[] is a bit of a bitch, but, - hey, "you only do it once (tm)" .. and then you do it over and over - again. particularly bothersome is also the necessary unrolling of our - PortInfo array to fit into LADSPA_Descriptor's inconsequential way of - port data structuring, which results in quite a bit of memory holding - duplicated data. oh well. + and adding_gain. + */ /* + 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 @@ -35,12 +30,13 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA or point your web browser to http://www.gnu.org. + */ #ifndef _DESCRIPTOR_H_ #define _DESCRIPTOR_H_ -/* common stub for Descriptor makes it possible to delete without special- +/* common stub for Descriptor makes it possible to delete() without special- * casing for every plugin class. */ class DescriptorStub @@ -52,7 +48,7 @@ PortCount = 0; } - virtual ~DescriptorStub() + ~DescriptorStub() { if (PortCount) { @@ -71,19 +67,19 @@ /* tom szilyagi reports that hosts exist which call activate() before * connect_port(). since caps' plugins expect ports to be valid we * need a safeguard: at instantiation, each port is connected to the - * lower bound. When (If?) LADSPA default values are ever fixed, connecting - * to the default will be preferred. */ + * lower bound. */ LADSPA_PortRangeHint * ranges; public: - Descriptor(); + Descriptor() {setup();} + void setup(); void autogen() { - PortCount = (sizeof (T::port_info) / sizeof (::PortInfo)); + PortCount = (sizeof (T::port_info) / sizeof (PortInfo)); /* unroll PortInfo members */ - char ** names = new char * [PortCount]; + const char ** names = new const char * [PortCount]; LADSPA_PortDescriptor * desc = new LADSPA_PortDescriptor [PortCount]; ranges = new LADSPA_PortRangeHint [PortCount]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pvoc-0.1.10/Makefile new/pvoc-0.1.12/Makefile --- old/pvoc-0.1.10/Makefile 2004-04-18 01:10:30.000000000 +0200 +++ new/pvoc-0.1.12/Makefile 2008-01-15 11:59:12.000000000 +0100 @@ -1,6 +1,6 @@ PREFIX = /usr/local -OPTS = -O6 -ffast-math -funroll-loops -Wall +OPTS = -O6 -ffast-math -funroll-loops -Wall -fPIC CC = g++ @@ -11,7 +11,7 @@ UTILDEST = $(PREFIX)/bin MAN1DEST = $(PREFIX)/man/man1 -VERSION = 0.1.10 +VERSION = 0.1.12 PVOCSRC = pvoc.cc PLUGSRC = interface.cc Plugins.cc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pvoc-0.1.10/Plugins.cc new/pvoc-0.1.12/Plugins.cc --- old/pvoc-0.1.10/Plugins.cc 2004-03-25 02:16:55.000000000 +0100 +++ new/pvoc-0.1.12/Plugins.cc 2007-07-18 15:04:32.000000000 +0200 @@ -1,7 +1,7 @@ /* Plugins.cc - Copyright 2004 Tim Goetze <tim(a)quitte.de> + Copyright 2004-7 Tim Goetze <tim(a)quitte.de> Copyright 2001-2 Richard Dobson, Trevor Wishart http://quitte.de/dsp/ @@ -177,7 +177,8 @@ } }; -Descriptor<Exaggerate>::Descriptor<Exaggerate>() +template <> void +Descriptor<Exaggerate>::setup() { UniqueID = 1791; Label = "Exaggerate"; @@ -345,7 +346,8 @@ } }; -Descriptor<Transpose>::Descriptor<Transpose>() +template <> void +Descriptor<Transpose>::setup() { UniqueID = 1792; Label = "Transpose"; @@ -496,7 +498,8 @@ } }; -Descriptor<Accumulate>::Descriptor<Accumulate>() +template <> void +Descriptor<Accumulate>::setup() { UniqueID = 1793; Label = "Accumulate"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pvoc-0.1.10/basics.h new/pvoc-0.1.12/basics.h --- old/pvoc-0.1.10/basics.h 2004-03-24 21:03:20.000000000 +0100 +++ new/pvoc-0.1.12/basics.h 2008-01-11 00:56:06.000000000 +0100 @@ -87,7 +87,7 @@ typedef __uint64_t uint64; typedef struct { - char * name; + const char * name; LADSPA_PortDescriptor descriptor; LADSPA_PortRangeHint range; } PortInfo; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pvoc-0.1.10/pvoc.html new/pvoc-0.1.12/pvoc.html --- old/pvoc-0.1.10/pvoc.html 2004-04-18 01:11:41.000000000 +0200 +++ new/pvoc-0.1.12/pvoc.html 2008-01-15 11:59:15.000000000 +0100 @@ -1,31 +1,29 @@ <html> <head> - <title>pvoc - quitte</title> + <title>pvoc</title> <style type=text/css> body, table { font-family: Helvetica, Tahoma, Geneva, sans-serif; } - pre, tt, code { - font-family: LucidaTypewriter, Courier, monospace; - } - h1, h2 { padding-top: 2pt; padding-bottom: 2pt; border-bottom: solid 1px black; - border-top: solid 1px black; - background-color: #eeeeee; - text-align: center; + sborder-top: solid 1px black; + sbackground-color: #eeeeee; + stext-align: center; } h3 { + width: 70%; border-bottom: solid 1px #cccccc; margin-top: 24pt; } h4 { - border-bottom: solid 1px #dddddd; + width: 70%; + border-bottom: dotted 1px #dddddd; } a { @@ -112,7 +110,21 @@ color: #ff0000; } - </style> + + h3 {margin-top: 18em;} + h4 {font-size: 11pt; padding-top: 2em;} + h5 {font-size: medium; margin-bottom: .5em;} + p {max-width: 42em;} + body {margin: 18px;} + p#foot {border-top: solid 1px black;} + h3 {font-size: 14pt; border-bottom: solid 1px black;} + h4 {color: #aa0000; border-bottom: solid 1px black;} + h4 {margin-top: 21px;margin-bottom: 0px;} + ul {max-width: 36em; margin-bottom: 1em;} + ul#plugs {margin-top: 1em; font-size:80%;} + li.bg {font-size: large;} + li {margin-bottom: .4em;} + table {padding-bottom:1em; border-bottom: solid 1px black;margin-bottom: 12px;} </style> </head> <body> @@ -122,7 +134,7 @@ <h2>pvoc</h2> <table border=0 width=100% cellpadding=0 cellspacing=0> <tr> <td align=left width=20%> - <b>Release 0.1.10</b> + <b>Release 0.1.12</b> </td> <td rowspan=2 align=center> <a href=http://quitte.de/dsp/pvoc.html>http://quitte.de/dsp/pvoc.html</a> @@ -133,7 +145,7 @@ </tr> <tr> <td align=left> - April 18 2004 </td> + January 15 2008 </td> <td align=right> <a href=mailto:tim@quitte.de?subject=pvoc>tim(a)quitte.de</a> </td> @@ -210,7 +222,7 @@ <p> This software package is © Copyright 1981-2004 Regents of the University of California, - 2001-2 Richard Dobson, 2004 Tim Goetze. + 2001-2 Richard Dobson, 2004-8 Tim Goetze. It is distributed under the <a href=COPYING>GNU General Public License</a>. @@ -227,7 +239,7 @@ <p> Download the latest release - from <a href=http://quitte.de/dsp/pvoc.html>the pvoc homepage</a>. + <a href=pvoc_0.1.12.tar.gz>here, it is pvoc_0.1.12.tar.gz (42 kB)</a>. </p>  <br> @@ -250,8 +262,8 @@ </p> <pre align=left> -$ tar xvfz pvoc_0.1.10.tar.gz  -$ cd pvoc-0.1.10  +$ tar xvfz pvoc_0.1.12.tar.gz  +$ cd pvoc-0.1.12  $ make # make install</pre> @@ -401,7 +413,7 @@ </p> <pre style="background-color:#f7f7f7;padding-left:24pt;"> -stretch(1) Sound Data Time Stretching stretch(1) +stretch(1) Sound Data Time Stretching stretch(1) @@ -416,27 +428,24 @@ DESCRIPTION - The stretch utility allows you to lengthen or shorten the - duration of an audio data stream without affecting the - pitch of the sampled data. It employs phase-vocoding to - achieve the effect, usually leading to better results than - time-domain techniques. Input audio data can be composed - of multiple channels, in which case output also is. - - Both output and input can be '-', indicating that signal - data is to be read from stdin or written to stdout respec- - tively (You can also omit the file names for the same - effect, starting with output). In either case, the sample - format is signed 16-bit little-endian (aka CD format). - - For physical file access, the utility makes use of the - sndfile library. The tool tries to guess the intended out- - put file format from the filename extension; in addition, - you can specify the output bit depth (quantization) with - the -b (--bits) parameter. + The stretch utility allows you to lengthen or shorten the duration of + an audio data stream without affecting the pitch of the sampled data. + It employs phase-vocoding to achieve the effect, usually leading to + better results than time-domain techniques. Input audio data can be + composed of multiple channels, in which case output also is. + + Both output and input can be '-', indicating that signal data is to be + read from stdin or written to stdout respectively (You can also omit + the file names for the same effect, starting with output). In either + case, the sample format is signed 16-bit little-endian (aka CD format). + + For physical file access, the utility makes use of the sndfile library. + The tool tries to guess the intended output file format from the file- + name extension; in addition, you can specify the output bit depth + (quantization) with the -b (--bits) parameter. - The tool is not capable of directly replacing the contents - of the input file. + The tool is not capable of directly replacing the contents of the input + file. OPTIONS @@ -444,23 +453,22 @@ stretch -t 1.5 infile.wav outfile.wav - This example stretches infile.wav to 150 % duration and - writes the result to outfile.wav. + This example stretches infile.wav to 150 % duration and writes the + result to outfile.wav. Most useful options: -t, --times <stretch factor> - sets the ratio by which the duration of the sound - signal is scaled. Extreme values can cause audible - artefacts in the output signal, usually perceived - as cyclic amplitude modulation. To achieve an exact - time expansion/compression ratio, the product of - this and the -o (--overlap) parameter needs to be - an integer value. + sets the ratio by which the duration of the sound signal is + scaled. Extreme values can cause audible artefacts in the out- + put signal, usually perceived as cyclic amplitude modulation. To + achieve an exact time expansion/compression ratio, the product + of this and the -o (--overlap) parameter needs to be an integer + value. -a, --amplify <factor> - sets the linear amplification factor for the output - signal. The default value is 1.0 . + sets the linear amplification factor for the output signal. The + default value is 1.0 . -q, --quiet makes the utility be silent about what it does. @@ -468,26 +476,24 @@ Processing control options: -f, --fft <DFT length> - sets the length of the DFT (discrete Fourier trans- - form), which should be a power of two for best - results. Odd values may cause the utility to throw - up. Larger DFT sizes imply better frequency resolu- - tion at the cost of increased computational demand. - The default value is 1024 samples. + sets the length of the DFT (discrete Fourier transform), which + should be a power of two for best results. Odd values may cause + the utility to throw up. Larger DFT sizes imply better frequency + resolution at the cost of increased computational demand. The + default value is 1024 samples. -o, --overlap <overlap> - controls the interval at which recomposition of the - signal takes place. Smaller values imply a smoother - result in exchange for increased computational - demand. The default value is 128 samples. + controls the interval at which recomposition of the signal takes + place. Smaller values imply a smoother result in exchange for + increased computational demand. The default value is 128 sam- + ples. Piped input signal options: - If signal input is from stdin, the default assumption - about the data format (other than the aforementioned - 16-bit signed little-endian convention) is two-channel - audio at 44.1 kHz sample rate. The following options over- - ride these: + If signal input is from stdin, the default assumption about the data + format (other than the aforementioned 16-bit signed little-endian con- + vention) is two-channel audio at 44.1 kHz sample rate. The following + options override these: -c, --channels <channel count> no surprises: 1 is mono, 2 stereo etc. @@ -498,67 +504,68 @@ Output bit depth: -b, --bits <quantization> - sets the output bit depth (only for physical file - output). 8, 16 or 24 for signed integers, 32 or 64 - for floating point. The default is 16-bit. (Inter- - nal precision is 32 bit floating-point.) + sets the output bit depth (only for physical file output). 8, + 16 or 24 for signed integers, 32 or 64 for floating point. The + default is 16-bit. (Internal precision is 32 bit floating- + point.) -l, --limit - this option causes the utility to clip the output - signal to stay within the output quantization or - the [-1,+1] range if output is in floating-point - format. The use of this flag is highly recommended - when output is in integer sample format (--bits - less than 32 or stdout output). + this option causes the utility to clip the output signal to stay + within the output quantization or the [-1,+1] range if output is + in floating-point format. The use of this flag is highly recom- + mended when output is in integer sample format (--bits less than + 32 or stdout output). Information options: -h, --help - prints version information and a list of supported - file formats/extensions, then quits. + prints version information and a list of supported file for- + mats/extensions, then quits. -v, --version prints version information, then quits. EXAMPLES - A few example invocations of the utility, all assuming - source data is in CD format (signed 16-bit samples, - stereo, 44.1 kHz): + A few example invocations of the utility, all assuming source data is + in CD format (signed 16-bit samples, stereo, 44.1 kHz): stretch -o 100 -t 1.2 cdda.wav | aplay -fcd - stretches cdda.wav to exactly 120 %, piping the output to - the aplay program for immediate playback. + stretches cdda.wav to exactly 120 %, piping the output to the aplay + program for immediate playback. cat file.ogg | oggdec - | stretch -t.8 | aplay -fcd - plays back an ogg stream, accelerated to 80 % duration. + plays back an ogg stream, accelerated to 80 % duration. If you prefer + mp3, an equivalent incantation is: + + madplay -o raw:- file.mp3 | stretch -t.8 | aplay -f cd + BUGS - Lousy command line parsing and error feedback. Lots of - combinations of output file formats and quantization - untested, as is the operation on big-endian systems. - Phase vocoding chews a lot of CPU cycles. + Lousy command line parsing and error feedback. Lots of combinations of + output file formats and quantization untested, as is the operation on + big-endian systems. Phase vocoding chews a lot of CPU cycles. AUTHORS - The original phase vocoder implementation was done by Mark - Dolson at UCSD, part of the CARL suite, skillfully con- - verted to streaming operation by Richard Dobson. + The original phase vocoder implementation was done by Mark Dolson at + UCSD, part of the CARL suite, skillfully converted to streaming opera- + tion by Richard Dobson. - The stretch tool and this manual page were written by Tim - Goetze <tim(a)quitte.de>. + The stretch tool and this manual page were written by Tim Goetze + <tim(a)quitte.de>. HOMEPAGE - The latest version of this tool can be obtained from + The latest version of this tool can be obtained from http://quitte.de/dsp/pvoc.html . - March 25, 2004 stretch(1) + March 25, 2004 stretch(1) </pre> <a name=Appendix><h3>Appendix</h3></a> @@ -566,6 +573,9 @@ <a name=Changelog><h4>Changelog</h4></a> <pre> +0.1.11 + * added g++-4 compliant Descriptor<> constructor decoration + 0.1.10 * ladspa.h included in tarball @@ -618,7 +628,7 @@  <br> <div class=foot> - tim@<a href=http://quitte.de/>quitte.de</a>, April 18 2004. + tim@<a href=http://quitte.de/>quitte.de</a>, January 15 2008. </div> </center> </body> </html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pvoc-0.1.10/stretch.1 new/pvoc-0.1.12/stretch.1 --- old/pvoc-0.1.10/stretch.1 2004-03-26 13:35:03.000000000 +0100 +++ new/pvoc-0.1.12/stretch.1 2008-01-15 11:35:23.000000000 +0100 @@ -121,7 +121,11 @@ .TP cat file.ogg | oggdec - | stretch -t.8 | aplay -fcd .P -plays back an \fIogg\fP stream, accelerated to 80 % duration. +plays back an \fIogg\fP stream, accelerated to 80 % duration. If +you prefer \fImp3\fP, an equivalent incantation is: +.TP + madplay -o raw:- file.mp3 | stretch -t.8 | aplay -f cd +.P .SH "BUGS" Lousy command line parsing and error feedback. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pvoc-0.1.10/stretch.cc new/pvoc-0.1.12/stretch.cc --- old/pvoc-0.1.10/stretch.cc 2004-03-26 13:31:11.000000000 +0100 +++ new/pvoc-0.1.12/stretch.cc 2008-01-15 11:27:22.000000000 +0100 @@ -46,7 +46,7 @@ static char error [400]; static void -die (char * fmt, ...) +die (const char * fmt, ...) { va_list list; @@ -88,7 +88,7 @@ /* /////////////////////////////////////////////////////////////////////// */ -static struct {char * ext; int fmt;} +static struct {const char * ext; int fmt;} formats[] = { {"aif", SF_FORMAT_AIFF }, {"wav", SF_FORMAT_WAV }, ++++++ swh-configure-2.65.patch ++++++ Index: swh-plugins-0.4.15/configure =================================================================== --- swh-plugins-0.4.15.orig/configure +++ swh-plugins-0.4.15/configure @@ -767,6 +767,7 @@ GMSGFMT MSGFMT GETTEXT_MACRO_VERSION USE_NLS +MKINSTALLDIRS CPP OTOOL64 OTOOL @@ -11223,6 +11224,17 @@ fi ALL_LINGUAS="en_GB" + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + case "$ac_aux_dir" in + /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;; + *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;; + esac + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 $as_echo_n "checking whether NLS is requested... " >&6; } # Check whether --enable-nls was given. ++++++ swh-configure.patch ++++++ Index: swh-plugins-0.4.15/configure =================================================================== --- swh-plugins-0.4.15.orig/configure +++ swh-plugins-0.4.15/configure @@ -811,6 +811,7 @@ GMSGFMT MSGFMT GETTEXT_MACRO_VERSION USE_NLS +MKINSTALLDIRS CPP OTOOL64 OTOOL @@ -12121,6 +12122,17 @@ fi ALL_LINGUAS="en_GB" + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + case "$ac_aux_dir" in + /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;; + *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;; + esac + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5 $as_echo_n "checking whether NLS is requested... " >&6; } # Check whether --enable-nls was given. ++++++ swh-libblo.dif ++++++ Index: swh-plugins-0.4.15/configure.in =================================================================== --- swh-plugins-0.4.15.orig/configure.in +++ swh-plugins-0.4.15/configure.in @@ -49,6 +50,7 @@ AC_PROG_LIBTOOL AC_LANG_C AC_PROG_CC +AM_PROG_CC_C_O AC_REQUIRE_CPP ALL_LINGUAS="en_GB" AM_GNU_GETTEXT([external]) ++++++ tap-plugins-0.7.0.tar.bz2 -> tap-plugins-0.7.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tap-plugins-0.7.0/CREDITS new/tap-plugins-0.7.1/CREDITS --- old/tap-plugins-0.7.0/CREDITS 2004-08-17 14:34:43.000000000 +0200 +++ new/tap-plugins-0.7.1/CREDITS 2009-08-17 13:10:57.000000000 +0200 @@ -49,6 +49,15 @@ with the CPU runaway problems in TAP Reverberator, by reporting the problem and trying out my solutions. +Maarten Maathuis <madman2003(a)gmail.com> contributed the Bauer +stereophonic-to-binaural DSP plugin. NOTE: this plugin only existed in +CVS between releases 0.7.0 and 0.7.1; it has been agreed to be removed +from TAP-plugins and released separately. + +Damon Chaplin <damon(a)karuna.eclipse.co.uk> tracked down issues that +caused problems on 64-bit machines, found uninitialised variables via +Valgrind, and also pinned down long lurking denormal issues. Thanks! + And, of course, special thanks to the Ardour [http://ardour.org] and JACK [http://jackit.sf.net] development teams for their tireless diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tap-plugins-0.7.0/Makefile new/tap-plugins-0.7.1/Makefile --- old/tap-plugins-0.7.0/Makefile 2004-08-17 14:34:43.000000000 +0200 +++ new/tap-plugins-0.7.1/Makefile 2009-08-17 13:10:57.000000000 +0200 @@ -1,4 +1,4 @@ -# Copyright (C) 2004 Tom Szilagyi +# Copyright (C) 2004-2009 Tom Szilagyi # # 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 @@ -14,7 +14,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # -# $Id: Makefile,v 1.16 2004/08/13 18:34:31 tszilagyi Exp $ +# $Id: Makefile,v 1.17 2006/11/26 19:42:44 tszilagyi Exp $ ##################################################################### @@ -156,5 +156,5 @@ clean: -rm -f `find . -name "*.so"` -rm -f `find . -name "*.o"` - -rm -f `find .. -name "*~"` + -rm -f `find . -name "*~"` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tap-plugins-0.7.0/tap_echo.c new/tap-plugins-0.7.1/tap_echo.c --- old/tap-plugins-0.7.0/tap_echo.c 2004-08-17 14:34:43.000000000 +0200 +++ new/tap-plugins-0.7.1/tap_echo.c 2009-08-17 13:10:57.000000000 +0200 @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: tap_echo.c,v 1.6 2004/08/05 16:18:44 tszilagyi Exp $ + $Id: tap_echo.c,v 1.7 2004/12/06 09:32:41 tszilagyi Exp $ */ @@ -103,6 +103,24 @@ if ((ptr = malloc(sizeof(Echo))) != NULL) { ((Echo *)ptr)->sample_rate = SampleRate; ((Echo *)ptr)->run_adding_gain = 1.0f; + + /* allocate memory for ringbuffers and related dynamic vars */ + if ((((Echo *)ptr)->ringbuffer_L = + calloc(MAX_DELAY * ((Echo *)ptr)->sample_rate / 1000, + sizeof(LADSPA_Data))) == NULL) + exit(1); + if ((((Echo *)ptr)->ringbuffer_R = + calloc(MAX_DELAY * ((Echo *)ptr)->sample_rate / 1000, + sizeof(LADSPA_Data))) == NULL) + exit(1); + if ((((Echo *)ptr)->buffer_pos_L = calloc(1, sizeof(unsigned long))) == NULL) + exit(1); + if ((((Echo *)ptr)->buffer_pos_R = calloc(1, sizeof(unsigned long))) == NULL) + exit(1); + + *(((Echo *)ptr)->buffer_pos_L) = 0; + *(((Echo *)ptr)->buffer_pos_R) = 0; + return ptr; } @@ -114,45 +132,19 @@ void activate_Echo(LADSPA_Handle Instance) { - Echo * ptr; - - ptr = (Echo *)Instance; + Echo * ptr = (Echo *)Instance; + int i; ptr->mpx_out_L = 0; ptr->mpx_out_R = 0; - /* allocate memory for ringbuffers and related dynamic vars */ - if ((ptr->ringbuffer_L = - calloc(MAX_DELAY * ptr->sample_rate / 1000, - sizeof(LADSPA_Data))) == NULL) - exit(1); - if ((ptr->ringbuffer_R = - calloc(MAX_DELAY * ptr->sample_rate / 1000, - sizeof(LADSPA_Data))) == NULL) - exit(1); - if ((ptr->buffer_pos_L = calloc(1, sizeof(unsigned long))) == NULL) - exit(1); - if ((ptr->buffer_pos_R = calloc(1, sizeof(unsigned long))) == NULL) - exit(1); - *(ptr->buffer_pos_L) = 0; - *(ptr->buffer_pos_R) = 0; -} - - -/* deactivate a plugin instance */ -void -deactivate_Echo(LADSPA_Handle Instance) { - - Echo * ptr; + *(ptr->buffer_pos_R) = 0; - ptr = (Echo *)Instance; - - /* free memory allocated for ringbuffers & co. in activate_Echo() */ - free(ptr->ringbuffer_L); - free(ptr->ringbuffer_R); - free(ptr->buffer_pos_L); - free(ptr->buffer_pos_R); + for (i = 0; i < MAX_DELAY * ptr->sample_rate / 1000; i++) { + ptr->ringbuffer_L[i] = 0.0f; + ptr->ringbuffer_R[i] = 0.0f; + } } @@ -428,6 +420,13 @@ void cleanup_Echo(LADSPA_Handle Instance) { + Echo * ptr = (Echo *)Instance; + + free(ptr->ringbuffer_L); + free(ptr->ringbuffer_R); + free(ptr->buffer_pos_L); + free(ptr->buffer_pos_R); + free(Instance); } @@ -584,7 +583,7 @@ stereo_descriptor->run = run_Echo; stereo_descriptor->run_adding = run_adding_gain_Echo; stereo_descriptor->set_run_adding_gain = set_run_adding_gain; - stereo_descriptor->deactivate = deactivate_Echo; + stereo_descriptor->deactivate = NULL; stereo_descriptor->cleanup = cleanup_Echo; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tap-plugins-0.7.0/tap_eq.c new/tap-plugins-0.7.1/tap_eq.c --- old/tap-plugins-0.7.0/tap_eq.c 2004-08-17 14:34:43.000000000 +0200 +++ new/tap-plugins-0.7.1/tap_eq.c 2009-08-17 13:10:57.000000000 +0200 @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: tap_eq.c,v 1.6 2004/04/18 19:56:56 tszilagyi Exp $ + $Id: tap_eq.c,v 1.7 2006/08/09 12:03:24 tszilagyi Exp $ */ @@ -224,6 +224,8 @@ float fs; fs = s_rate; + + memset(ptr, 0, sizeof(eq)); filters = calloc(8, sizeof(biquad)); @@ -231,6 +233,30 @@ ptr->fs = fs; ptr->run_adding_gain = 1.0f; + ptr->old_ch0f = 100.0f; + ptr->old_ch0g = 0; + + ptr->old_ch1f = 200.0f; + ptr->old_ch1g = 0; + + ptr->old_ch2f = 400.0f; + ptr->old_ch2g = 0; + + ptr->old_ch3f = 1000.0f; + ptr->old_ch3g = 0; + + ptr->old_ch4f = 3000.0f; + ptr->old_ch4g = 0; + + ptr->old_ch5f = 6000.0f; + ptr->old_ch5g = 0; + + ptr->old_ch6f = 12000.0f; + ptr->old_ch6g = 0; + + ptr->old_ch7f = 15000.0f; + ptr->old_ch7g = 0; + eq_set_params(&filters[0], 100.0f, 0.0f, BWIDTH, fs); eq_set_params(&filters[1], 200.0f, 0.0f, BWIDTH, fs); eq_set_params(&filters[2], 400.0f, 0.0f, BWIDTH, fs); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tap-plugins-0.7.0/tap_eqbw.c new/tap-plugins-0.7.1/tap_eqbw.c --- old/tap-plugins-0.7.0/tap_eqbw.c 2004-08-17 14:34:43.000000000 +0200 +++ new/tap-plugins-0.7.1/tap_eqbw.c 2009-08-17 13:10:57.000000000 +0200 @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: tap_eqbw.c,v 1.4 2004/04/18 19:56:56 tszilagyi Exp $ + $Id: tap_eqbw.c,v 1.5 2006/08/09 12:03:24 tszilagyi Exp $ */ @@ -271,12 +271,46 @@ fs = s_rate; + memset(ptr, 0, sizeof(eq)); + filters = calloc(8, sizeof(biquad)); ptr->filters = filters; ptr->fs = fs; ptr->run_adding_gain = 1.0f; + ptr->old_ch0f = 100.0f; + ptr->old_ch0g = 0.0f; + ptr->old_ch0b = BWIDTH; + + ptr->old_ch1f = 200.0f; + ptr->old_ch1g = 0.0f; + ptr->old_ch1b = BWIDTH; + + ptr->old_ch2f = 400.0f; + ptr->old_ch2g = 0.0f; + ptr->old_ch2b = BWIDTH; + + ptr->old_ch3f = 1000.0f; + ptr->old_ch3g = 0.0f; + ptr->old_ch3b = BWIDTH; + + ptr->old_ch4f = 3000.0f; + ptr->old_ch4g = 0.0f; + ptr->old_ch4b = BWIDTH; + + ptr->old_ch5f = 6000.0f; + ptr->old_ch5g = 0.0f; + ptr->old_ch5b = BWIDTH; + + ptr->old_ch6f = 12000.0f; + ptr->old_ch6g = 0.0f; + ptr->old_ch6b = BWIDTH; + + ptr->old_ch7f = 15000.0f; + ptr->old_ch7g = 0.0f; + ptr->old_ch7b = BWIDTH; + eq_set_params(&filters[0], 100.0f, 0.0f, BWIDTH, fs); eq_set_params(&filters[1], 200.0f, 0.0f, BWIDTH, fs); eq_set_params(&filters[2], 400.0f, 0.0f, BWIDTH, fs); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tap-plugins-0.7.0/tap_reverb.h new/tap-plugins-0.7.1/tap_reverb.h --- old/tap-plugins-0.7.0/tap_reverb.h 2004-08-17 14:34:43.000000000 +0200 +++ new/tap-plugins-0.7.1/tap_reverb.h 2009-08-17 13:10:57.000000000 +0200 @@ -17,6 +17,11 @@ $Id: tap_reverb.h,v 1.10 2004/06/14 16:43:55 tszilagyi Exp $ */ +#ifndef _ISOC99_SOURCE +#define _ISOC99_SOURCE +#endif + +#include <stdint.h> @@ -117,7 +122,6 @@ #define db2lin(x) ((x) > -90.0f ? powf(10.0f, (x) * 0.05f) : 0.0f) #define ABS(x) (x)>0.0f?(x):-1.0f*(x) #define LN_2_2 0.34657359f -#define FLUSH_TO_ZERO(x) (((*(unsigned int*)&(x))&0x7f800000)==0)?0.0f:(x) #define LIMIT(v,l,u) ((v)<(l)?(l):((v)>(u)?(u):(v))) #define BIQUAD_TYPE float @@ -195,19 +199,23 @@ rev_t biquad_run(biquad *f, rev_t x) { - rev_t y; + union { + rev_t y; + uint32_t y_int; + } u; - y = f->b0 * x + f->b1 * f->x1 + f->b2 * f->x2 - + f->a1 * f->y1 + f->a2 * f->y2; + u.y = f->b0 * x + f->b1 * f->x1 + f->b2 * f->x2 + + f->a1 * f->y1 + f->a2 * f->y2; #ifdef REVERB_CALC_FLOAT - y = FLUSH_TO_ZERO(y); + if ((u.y_int & 0x7f800000) == 0) + u.y = 0.0f; #endif f->x2 = f->x1; f->x1 = x; f->y2 = f->y1; - f->y1 = y; + f->y1 = u.y; - return y; + return u.y; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tap-plugins-0.7.0/tap_sigmoid.c new/tap-plugins-0.7.1/tap_sigmoid.c --- old/tap-plugins-0.7.0/tap_sigmoid.c 2004-08-17 14:34:43.000000000 +0200 +++ new/tap-plugins-0.7.1/tap_sigmoid.c 2009-08-17 13:10:57.000000000 +0200 @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: tap_sigmoid.c,v 1.1 2004/08/02 18:14:50 tszilagyi Exp $ + $Id: tap_sigmoid.c,v 1.3 2005/08/30 11:19:14 tszilagyi Exp $ */ @@ -40,9 +40,12 @@ #define OUTPUT 3 /* Total number of ports */ +#define PORTCOUNT_MONO 4 -#define PORTCOUNT_MONO 4 +/* The closer this is to 1.0, the slower the input parameter + interpolation will be. */ +#define INTERP 0.99f /* The structure used to hold port connection information and state */ @@ -53,12 +56,14 @@ LADSPA_Data * input; LADSPA_Data * output; + LADSPA_Data pregain_i; + LADSPA_Data postgain_i; + unsigned long sample_rate; LADSPA_Data run_adding_gain; } Sigmoid; - /* Construct a new plugin instance. */ LADSPA_Handle instantiate_Sigmoid(const LADSPA_Descriptor * Descriptor, @@ -76,9 +81,6 @@ } - - - /* Connect a port to a data location. */ void connect_port_Sigmoid(LADSPA_Handle Instance, @@ -90,9 +92,11 @@ switch (Port) { case PREGAIN: ptr->pregain = DataLocation; + ptr->pregain_i = db2lin(LIMIT(*DataLocation,-90.0f,20.0f)); break; case POSTGAIN: ptr->postgain = DataLocation; + ptr->postgain_i = db2lin(LIMIT(*DataLocation,-90.0f,20.0f)); break; case INPUT: ptr->input = DataLocation; @@ -104,7 +108,6 @@ } - void run_Sigmoid(LADSPA_Handle Instance, unsigned long SampleCount) { @@ -114,6 +117,8 @@ LADSPA_Data * output = ptr->output; LADSPA_Data pregain = db2lin(LIMIT(*(ptr->pregain),-90.0f,20.0f)); LADSPA_Data postgain = db2lin(LIMIT(*(ptr->postgain),-90.0f,20.0f)); + LADSPA_Data pregain_i = ptr->pregain_i; + LADSPA_Data postgain_i = ptr->postgain_i; unsigned long sample_index; unsigned long sample_count = SampleCount; @@ -121,19 +126,39 @@ LADSPA_Data in = 0.0f; LADSPA_Data out = 0.0f; + if ((pregain_i != pregain) || (postgain_i != postgain)) { + + for (sample_index = 0; sample_index < sample_count; sample_index++) { + + pregain_i = pregain_i * INTERP + pregain * (1.0f - INTERP); + postgain_i = postgain_i * INTERP + postgain * (1.0f - INTERP); + + in = *(input++) * pregain_i; + + out = 2.0f / (1.0f + exp(-5.0*in)) - 1.0f; + + *(output++) = out * postgain_i; + } + + ptr->pregain_i = pregain_i; + ptr->postgain_i = postgain_i; - for (sample_index = 0; sample_index < sample_count; sample_index++) { + } else { + for (sample_index = 0; sample_index < sample_count; sample_index++) { - in = *(input++) * pregain; + in = *(input++) * pregain_i; - out = 2.0f / (1.0f + exp(-5.0*in)) - 1.0f; + out = 2.0f / (1.0f + exp(-5.0*in)) - 1.0f; - *(output++) = out * postgain; + *(output++) = out * postgain_i; + } + + ptr->pregain_i = pregain_i; + ptr->postgain_i = postgain_i; } } - void set_run_adding_gain_Sigmoid(LADSPA_Handle Instance, LADSPA_Data gain) { @@ -143,7 +168,6 @@ } - void run_adding_Sigmoid(LADSPA_Handle Instance, unsigned long SampleCount) { @@ -153,6 +177,8 @@ LADSPA_Data * output = ptr->output; LADSPA_Data pregain = db2lin(LIMIT(*(ptr->pregain),-90.0f,20.0f)); LADSPA_Data postgain = db2lin(LIMIT(*(ptr->postgain),-90.0f,20.0f)); + LADSPA_Data pregain_i = ptr->pregain_i; + LADSPA_Data postgain_i = ptr->postgain_i; unsigned long sample_index; unsigned long sample_count = SampleCount; @@ -161,17 +187,34 @@ LADSPA_Data out = 0.0f; - for (sample_index = 0; sample_index < sample_count; sample_index++) { + if ((pregain_i != pregain) || (postgain_i != postgain)) { + + for (sample_index = 0; sample_index < sample_count; sample_index++) { - in = *(input++) * pregain; + pregain_i = pregain_i * INTERP + pregain * (1.0f - INTERP); + postgain_i = postgain_i * INTERP + postgain * (1.0f - INTERP); + + in = *(input++) * pregain_i; - out = 2.0f / (1.0f + exp(-5.0*in)) - 1.0f; + out = 2.0f / (1.0f + exp(-5.0*in)) - 1.0f; - *(output++) += out * postgain * ptr->run_adding_gain; - } -} + *(output++) = out * postgain_i * ptr->run_adding_gain; + } + ptr->pregain_i = pregain_i; + ptr->postgain_i = postgain_i; + } else { + for (sample_index = 0; sample_index < sample_count; sample_index++) { + + in = *(input++) * pregain_i; + + out = 2.0f / (1.0f + exp(-5.0*in)) - 1.0f; + + *(output++) = out * postgain_i * ptr->run_adding_gain; + } + } +} /* Throw away a Sigmoid effect instance. */ @@ -182,11 +225,9 @@ } - LADSPA_Descriptor * mono_descriptor = NULL; - /* _init() is called automatically when the plugin library is first loaded. */ void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tap-plugins-0.7.0/tap_utils.h new/tap-plugins-0.7.1/tap_utils.h --- old/tap-plugins-0.7.0/tap_utils.h 2004-08-17 14:34:43.000000000 +0200 +++ new/tap-plugins-0.7.1/tap_utils.h 2009-08-17 13:10:57.000000000 +0200 @@ -17,7 +17,11 @@ $Id: tap_utils.h,v 1.5 2004/02/21 17:33:36 tszilagyi Exp $ */ +#ifndef _ISOC99_SOURCE +#define _ISOC99_SOURCE +#endif +#include <stdint.h> #ifndef M_PI #define M_PI 3.14159265358979323846264338327 @@ -92,7 +96,6 @@ #define LN_2_2 0.34657359f -#define FLUSH_TO_ZERO(x) (((*(unsigned int*)&(x))&0x7f800000)==0)?0.0f:(x) #define LIMIT(v,l,u) ((v)<(l)?(l):((v)>(u)?(u):(v))) #define BIQUAD_TYPE float @@ -246,15 +249,19 @@ bq_t biquad_run(biquad *f, bq_t x) { - bq_t y; + union { + bq_t y; + uint32_t y_int; + } u; - y = f->b0 * x + f->b1 * f->x1 + f->b2 * f->x2 - + f->a1 * f->y1 + f->a2 * f->y2; - y = FLUSH_TO_ZERO(y); + u.y = f->b0 * x + f->b1 * f->x1 + f->b2 * f->x2 + + f->a1 * f->y1 + f->a2 * f->y2; + if ((u.y_int & 0x7f800000) == 0) + u.y = 0.0f; f->x2 = f->x1; f->x1 = x; f->y2 = f->y1; - f->y1 = y; + f->y1 = u.y; - return y; + return u.y; } ++++++ tap-type-punning-fix.dif ++++++ --- /var/tmp/diff_new_pack.RKtF0t/_old 2010-04-03 00:20:44.000000000 +0200 +++ /var/tmp/diff_new_pack.RKtF0t/_new 2010-04-03 00:20:44.000000000 +0200 @@ -1,16 +1,17 @@ ---- tap_utils.h-dist 2004-03-05 15:44:58.000000000 +0100 +Index: tap-plugins-0.7.1/tap_utils.h +=================================================================== +--- tap_utils.h +++ tap_utils.h 2004-03-05 15:45:53.000000000 +0100 -@@ -92,7 +92,14 @@ +@@ -95,6 +95,14 @@ for any bugs or malfunction. */ #define LN_2_2 0.34657359f --#define FLUSH_TO_ZERO(x) (((*(unsigned int*)&(x))&0x7f800000)==0)?0.0f:(x) +static inline float FLUSH_TO_ZERO(float fv) { + union { + float f; + int i; -+ } v; -+ v.f = fv; ++ } v; ++ v.f = fv; + return (v.i & 0x7f800000) == 0 ?0.0f : fv; +} #define LIMIT(v,l,u) ((v)<(l)?(l):((v)>(u)?(u):(v))) ++++++ vocoder-ladspa-0.2.tar.bz2 -> vocoder-ladspa-0.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vocoder-0.2/README new/vocoder-0.3/README --- old/vocoder-0.2/README 2002-09-20 20:08:21.000000000 +0200 +++ new/vocoder-0.3/README 2004-04-27 20:29:37.000000000 +0200 @@ -1,4 +1,7 @@ -LADSPA Vocoder Plugin Release v0.2 +LADSPA Vocoder Plugin Release v0.3 + +Whats new for v0.3: +You can now change the vocoder bands in real time. Whats new for v0.2: Uhh, nothing really, mostly just a documentation update :) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vocoder-0.2/vocoder.c new/vocoder-0.3/vocoder.c --- old/vocoder-0.2/vocoder.c 2002-09-21 02:23:30.000000000 +0200 +++ new/vocoder-0.3/vocoder.c 2004-04-27 20:28:59.000000000 +0200 @@ -1,8 +1,12 @@ /* vocoder.c - Version 0.2 + Version 0.3 LADSPA Unique ID: 1441 + Version 0.3 + Added support for changing bands in real time 2003-12-09 + + Version 0.2 Adapted to LADSPA by Josh Green <jgreen(a)users.sourceforge.net> 15.6.2001 (for the LinuxTag 2001!) @@ -181,24 +185,24 @@ unsigned long SampleCount) { VocoderInstance *vocoder = (VocoderInstance *)Instance; - int i, j; + int i, j, numbands; float a; LADSPA_Data x, c; - j = (int)(*vocoder->ctrlBandCount); - if (j < 1 || j > MAX_BANDS) j = MAX_BANDS; + numbands = (int)(*vocoder->ctrlBandCount); + if (numbands < 1 || numbands > MAX_BANDS) numbands = MAX_BANDS; /* initialize bandpass information if num_bands control has changed, or on first run */ - if (vocoder->num_bands != j) + if (vocoder->num_bands != numbands) { - vocoder->num_bands = j; + vocoder->num_bands = numbands; - for(i=0; i < j; i++) + for(i=0; i < numbands; i++) { memset(&vocoder->bands_formant[i], 0, sizeof(struct bandpass)); - a = 16.0 * i/(double)j; // stretch existing bands + a = 16.0 * i/(double)numbands; // stretch existing bands if (a < 4.0) vocoder->bands_formant[i].freq = 150 + 420 * a / 4.0; @@ -221,6 +225,12 @@ CLAMP (*vocoder->ctrlBandLevels[i], 0.0, 1.0); } } + else /* get current values of band level controls */ + { + for (i = 0; i < numbands; i++) + vocoder->bands_out[i].level = CLAMP (*vocoder->ctrlBandLevels[i], + 0.0, 1.0); + } for (i=0; i < SampleCount; i++) { @@ -230,7 +240,7 @@ vocoder->portFormant[i], vocoder); vocoder->portOutput[i] = 0.0; - for (j=0; j < vocoder->num_bands; j++) + for (j=0; j < numbands; j++) { vocoder->bands_out[j].oldval = vocoder->bands_out[j].oldval + (fabs (vocoder->bands_formant[j].y) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xorg-x11-libX11-ccache for openSUSE:Factory
by root＠Hilbert.suse.de 02 Apr '10

02 Apr '10

Hello community, here is the log from the commit of package xorg-x11-libX11-ccache for openSUSE:Factory checked in at Sat Apr 3 00:20:31 CEST 2010. -------- --- xorg-x11-libX11-ccache/xorg-x11-libX11-ccache.changes 2010-01-17 04:27:30.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-libX11-ccache/xorg-x11-libX11-ccache.changes 2010-04-02 17:56:19.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 2 17:56:02 CEST 2010 - sndirsch(a)suse.de + +- bumped version number to 7.5 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-libX11-ccache.spec ++++++ --- /var/tmp/diff_new_pack.sIfKd3/_old 2010-04-03 00:20:01.000000000 +0200 +++ /var/tmp/diff_new_pack.sIfKd3/_new 2010-04-03 00:20:01.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package xorg-x11-libX11-ccache (Version 7.4) +# spec file for package xorg-x11-libX11-ccache (Version 7.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,8 +22,8 @@ BuildRequires: xorg-x11 xorg-x11-Xvfb xorg-x11-devel xorg-x11-fonts BuildRequires: xkeyboard-config Url: http://xorg.freedesktop.org/ -Version: 7.4 -Release: 4 +Version: 7.5 +Release: 1 License: MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/Libraries ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 virtualbox-ose for openSUSE:Factory
by root＠Hilbert.suse.de 02 Apr '10

02 Apr '10

Hello community, here is the log from the commit of package virtualbox-ose for openSUSE:Factory checked in at Sat Apr 3 00:20:30 CEST 2010. -------- --- virtualbox-ose/virtualbox-ose.changes 2010-03-18 17:06:08.000000000 +0100 +++ /mounts/work_src_done/STABLE/virtualbox-ose/virtualbox-ose.changes 2010-03-31 13:59:17.000000000 +0200 @@ -2 +2 @@ -Thu Mar 18 11:16:17 UTC 2010 - mseben(a)novell.com +Wed Mar 31 11:04:45 UTC 2010 - mseben(a)novell.com @@ -4,2 +4,2 @@ -- added vbox-x_crash.diff to fix X crash caused by guest additions - see:http://www.virtualbox.org/ticket/6198 +- added Obsoletes: virtualbox-ose-kmp to splitted kmp host and + guest packages @@ -8 +8 @@ -Fri Feb 26 17:59:48 UTC 2010 - masterpatricko(a)gmail.com +Fri Mar 26 16:26:05 UTC 2010 - mseben(a)novell.com @@ -10,3 +10,43 @@ -- Use version 1.7 xorg mouse and video drivers on 11.3 -- Build version 1.7 xorg mouse and video drivers against system libraries - (virtualbox-ose-system-xorg17.patch) +- updated to 3.1.6 + * Linux hosts: fixed timing issue on hosts with Linux kernels 2.6.31 or later with certain CPUs (asynchronous timer mode; bug #6250) + * Linux hosts: properly handle host suspend/resume events on Linux kernels 2.6.30 or later (bug #5562) + * Mac OS X hosts: fixed VBoxSVC crash while enumerating the host network interfaces under certain circumstances + * Snapshots: fixed image corruption after snapshot merge under certain circumstances (bug #6023) + * Snapshots: fixed crash with VBoxHeadless / OSE + * VMM: fixed reference counting guru meditation (bug #4940) + * VMM: improved guest SMP stability + * VMM: fixed VT-x hardware debug issues (bugs #477 & #5792) + * VMM: fixed PGMDynMapHCPage guru meditation (Mac OS X; VT-x only; bug #6095) + * VMM: fixed pgmPoolTrackFlushGCPhysPTInt guru meditations (Mac OS X; VT-x only; bugs #6095 & #6125) + * VMM: Fixed host crash when running PAE guests in VT-X mode (Mac OS X only; bug #5771). + * GUI: fix displaying of error message (bug #4345) + * GUI: fix inability to enter seamless mode (bugs #6185, #6188) + * 3D support: fixed assertion and flickering when guest application uses several windows with a single OpenGL context (bug #4598) + * 3D support: fixed host crashes when using GL_EXT_compiled_vertex_array and array element calls (bug #6165) + * 3D support: fixed runtime linker errors with OpenGL guest libs (bug #5297) + * 3D support: fixed OpenGL extension viewer crash on startup (bug #4962) + * NAT: fixed a 3.1.4 regression on Windows hosts where graceful connection termination was broken (bug #6237) + * NAT: alternative network setting was not stored persistent (bug #6176) + * NAT: fixed memory corruption during ICMP traffic under certain circumstances + * Network: allow to switch the host interface or the internal network while a VM is running (bug #5781) + * VHD: fix for images with a block size different than 2MB + * USB: fixed filtered device attach regression (bug #6251) + * USB: fixed crash in OHCI under rare circumstances (bug #3571) + * VRDP: fixed hang under rare circumstances when attaching USB devices + * ACPI: prevent guest freezes when accessing /proc/acpi for determining the state of the host battery and the AC adapter (Linux hosts only; bug #2836) + * PulseAudio: fixed guest freezes under certain conditions (3.1.4 regression; bug #6224) + * BIOS: increased space for DMI strings + * BIOS: fixed interrupt routing problem for certain configurations (I/O-APIC enabled, ACPI not used; bug #6098) + * iSCSI: be more robust when handling the INQUIRY response + * iSCSI: be more robust when handling sense data + * BusLogic: fixed FreeBSD guests + * webservice: vboxwebsrv is now multithreaded + * Solaris Installer: fixed netmask to stay persistent across reboots for Host-only interface (bug #4590) + * Linux installer: removed external dependency to libpng12.so (bug #6243) + * Solaris Additions: fixed superfluous kernel logging (bug #6181) + * Linux Additions: fixed hang when starting the X server in Fedora12 guests and in guests with Linux 2.6.33 or later (bug #6198) + * Linux Additions: support Mandriva speedboot runlevel (bug #5484) + * Linux Additions: fixed SELinux security context of mount.vboxsf (bug #6362) + * Linux Additions: support Ubuntu 10.04 (bug #5737) + * Web service: update PHP bindings to fix problems with enums and collections +- deprecated vbox-x_crash.diff @@ -15 +55 @@ -Fri Feb 26 08:36:48 UTC 2010 - mseben(a)novell.com +Thu Feb 18 10:32:25 UTC 2010 - mseben(a)novell.com @@ -17,3 +57,4 @@ -- fix gcc build issues - use gcc4.3 for build (currently virtualbox - doesn't support gcc4.5 -- added ret-in-nonvoid-fnc.diff to fix post build checks +- rewritten spec file +- split kmp packages to guest and host parts +- added vbox-x_crash.diff to fix X crash caused by guest additions + see:http://www.virtualbox.org/ticket/6198 calling whatdependson for head-i586 Old: ---- 60-vboxadd.rules 60-vboxdrv.rules LocalConfig.kmk README.SUSE VirtualBox-3.1.4-OSE-patched.tar.bz2 default.virtualbox preamble vbox-2.6.25.diff vbox-futex.diff vbox-kbuild_unit_paths.diff vbox-swab_2.6.29_header.diff vbox-x_crash.diff virtualbox-ose-disable-updates.diff virtualbox-ose-init-scripts.diff virtualbox-ose-permissions_warning.diff virtualbox-ose-sudo-tmpdir.diff virtualbox-ose-system-xorg17.patch virtualbox-ose.easy virtualbox-ose.secure virtualbox-patch-source virtualbox-system-yasm.diff virtualbox.desktop New: ---- VirtualBox-3.1.6-OSE-patched.tar.bz2 VirtualBox-3.1.6-OSE.tar.bz2 VirtualBox-3.1.6-UserManual.pdf vbox-disable-updates.diff vbox-permissions_warning.diff vbox-vboxadd-init-script.diff vbox-vboxdrv-init-script.diff virtualbox-ose-3.1.6-rpmlintrc virtualbox-ose-60-vboxdrv.rules virtualbox-ose-60-vboxguest.rules virtualbox-ose-default.virtualbox virtualbox-ose-guest-kmp-files virtualbox-ose-guest-preamble virtualbox-ose-host-kmp-files virtualbox-ose-host-preamble virtualbox-ose-patch-source.sh virtualbox-ose-wrapper.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virtualbox-ose.spec ++++++ ++++ 799 lines (skipped) ++++ between virtualbox-ose/virtualbox-ose.spec ++++ and /mounts/work_src_done/STABLE/virtualbox-ose/virtualbox-ose.spec ++++++ VirtualBox-3.1.4-OSE-patched.tar.bz2 -> VirtualBox-3.1.6-OSE-patched.tar.bz2 ++++++ virtualbox-ose/VirtualBox-3.1.4-OSE-patched.tar.bz2 /mounts/work_src_done/STABLE/virtualbox-ose/VirtualBox-3.1.6-OSE-patched.tar.bz2 differ: char 11, line 1 ++++++ VirtualBox-3.1.4-OSE-patched.tar.bz2 -> VirtualBox-3.1.6-OSE.tar.bz2 ++++++ virtualbox-ose/VirtualBox-3.1.4-OSE-patched.tar.bz2 /mounts/work_src_done/STABLE/virtualbox-ose/VirtualBox-3.1.6-OSE.tar.bz2 differ: char 11, line 1 ++++++ vbox-disable-updates.diff ++++++ Our OS provides superior way of dealing with updates (PackageKit). Let's not bug the user with updates that are not yet packaged. Lubomir Rintel <lkundrak(a)v3.sk> diff -up VirtualBox-3.1.0_OSE/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.cpp.noupdate VirtualBox-3.1.0_OSE/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.cpp --- VirtualBox-3.1.0_OSE/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.cpp.noupdate 2009-11-12 15:25:16.000000000 +0100 +++ VirtualBox-3.1.0_OSE/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.cpp 2009-11-12 15:28:49.000000000 +0100 @@ -186,7 +186,11 @@ void VBoxUpdateData::decode() if (parser.size() > 1) { QDate date = QDate::fromString (parser [1], Qt::ISODate); - mDate = date.isValid() ? date : QDate::currentDate(); + if (date.isValid()) { + mDate = date; + } else { + mPeriodIndex = PeriodNever; + } } /* Parse 'branch' value */ ++++++ vbox-permissions_warning.diff ++++++ diff -uNrp VirtualBox-3.1.2_OSE.orig/src/VBox/Frontends/VirtualBox/Makefile.kmk VirtualBox-3.1.2_OSE/src/VBox/Frontends/VirtualBox/Makefile.kmk --- VirtualBox-3.1.2_OSE.orig/src/VBox/Frontends/VirtualBox/Makefile.kmk 2009-12-17 15:27:56.000000000 +0100 +++ VirtualBox-3.1.2_OSE/src/VBox/Frontends/VirtualBox/Makefile.kmk 2009-12-21 18:39:13.766349383 +0100 @@ -43,7 +43,7 @@ VBOX_WITH_UPDATE_REQUEST := 1 # The targets. # ifdef VBOX_WITH_HARDENING -PROGRAMS += VirtualBoxHardened +PROGRAMS += VirtualBoxHardened VBoxPermissionsMessage DLLS += VirtualBox else PROGRAMS += VirtualBox @@ -132,12 +132,18 @@ include $(PATH_SUB_CURRENT)/VBoxUI.pro USES += qt4 VirtualBox_TEMPLATE := $(if $(VBOX_WITH_HARDENING),VBOXQT4GUI,VBOXQT4GUIEXE) VirtualBox_NAME = VirtualBox + ifndef VBOX_WITH_HARDENING # For the launch trick we need different inode numbers. ifeq ($(KBUILD_TARGET),darwin) ## @todo use .darwin when ticket 36 has been fixed. #VirtualBox_INST.darwin = $(INST_BIN)VirtualBox $(INST_BIN)VirtualBoxVM VirtualBox_INST = $(INST_BIN)VirtualBox $(INST_BIN)VirtualBoxVM endif endif + +VBoxPermissionsMessage_TEMPLATE := $(if $(VBOX_WITH_HARDENING),VBOXQT4GUI,VBOXQT4GUIEXE) +VBoxPermissionsMessage_NAME = VBoxPermissionMessage +VBoxPermissionsMessage_DEFS.linux = VBOX_GUI_USE_QIMAGE VBOX_GUI_USE_SDL + VirtualBox_SDKS.win = WINPSDK DXSDK ifeq ($(filter-out freebsd linux netbsd openbsd os2,$(KBUILD_TARGET)),) # X11 + os2 ## @todo solaris VirtualBox_SDKS += LIBSDL @@ -373,6 +379,9 @@ VirtualBox_QT_MOCSRCS += \ src/extensions/QIFileDialog.cpp endif +VBoxPermissionsMessage_SOURCES = \ + src/VBoxPermissionsMessage.cpp + VirtualBox_SOURCES = \ src/main.cpp \ src/VBoxAboutDlg.cpp \ @@ -521,6 +530,8 @@ endif # (The include directory and lib/framework for each module will be added by the Qt4 unit.) VirtualBox_QT_MODULES = Core Gui Network +VBoxPermissionsMessage_QT_MODULES = Core Gui Network + if defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_GUI_USE_QGL) VirtualBox_QT_MODULES += OpenGL endif @@ -649,6 +660,8 @@ $$(PATH_VirtualBox)/VirtualBox-icon.rc: endif # win +INSTALLS += VBoxPermissionsMessage +VBoxPermissionsMessage_INST = $(INST_VIRTUALBOX) ifeq ($(KBUILD_TARGET),darwin) # diff -uNrp VirtualBox-3.1.2_OSE.orig/src/VBox/Frontends/VirtualBox/src/VBoxPermissionsMessage.cpp VirtualBox-3.1.2_OSE/src/VBox/Frontends/VirtualBox/src/VBoxPermissionsMessage.cpp --- VirtualBox-3.1.2_OSE.orig/src/VBox/Frontends/VirtualBox/src/VBoxPermissionsMessage.cpp 1970-01-01 01:00:00.000000000 +0100 +++ VirtualBox-3.1.2_OSE/src/VBox/Frontends/VirtualBox/src/VBoxPermissionsMessage.cpp 2009-12-21 18:39:13.800468713 +0100 @@ -0,0 +1,12 @@ +#include <QtGui/QApplication> +#include <QtGui/QMessageBox> +int main(int argc, char *argv[]) +{ + QApplication app(argc, argv); + QMessageBox msgBox; + msgBox.setWindowTitle(QObject::tr("Permissions problem !")); + msgBox.setText(QObject::tr("You are not a member of the \"vboxusers\" group. Please add yourself to this group before starting VirtualBox. You could do it using: Yast / Security and Users / User and Group management. Don't forget re-login your user account!")); + int ret = msgBox.exec(); + app.quit(); + return 0; +} \ No newline at end of file ++++++ vbox-vboxadd-init-script.diff ++++++ Index: src/VBox/Additions/linux/installer/vboxadd.sh =================================================================== --- src/VBox/Additions/linux/installer/vboxadd.sh.orig +++ src/VBox/Additions/linux/installer/vboxadd.sh @@ -30,6 +30,7 @@ # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Description: VirtualBox Linux Additions kernel modules +# Short-Description: VirtualBox Linux Additions kernel modules ### END INIT INFO PATH=$PATH:/bin:/sbin:/usr/sbin @@ -168,8 +169,6 @@ fi dev=/dev/vboxguest userdev=/dev/vboxuser -owner=vboxadd -group=1 fail() { @@ -234,12 +233,6 @@ start() fail "Cannot create device $dev with major $maj and minor $min" } fi - chown $owner:$group $dev 2>/dev/null || { - rm -f $dev 2>/dev/null - rm -f $userdev 2>/dev/null - rmmod vboxguest 2>/dev/null - fail "Cannot change owner $owner:$group for device $dev" - } if [ ! -c $userdev ]; then maj=10 @@ -250,17 +243,10 @@ start() rmmod vboxguest 2>/dev/null fail "Cannot create device $userdev with major $maj and minor $min" } - chown $owner:$group $userdev 2>/dev/null || { - rm -f $dev 2>/dev/null - rm -f $userdev 2>/dev/null - rmmod vboxguest 2>/dev/null - fail "Cannot change owner $owner:$group for device $userdev" - } fi fi - if [ -n "$BUILDVBOXVFS" ]; then - running_vboxvfs || { + running_vboxvfs || { $MODPROBE vboxvfs > /dev/null 2>&1 || { if dmesg | grep "vboxConnect failed" > /dev/null 2>&1; then fail_msg @@ -270,8 +256,7 @@ start() fi fail "modprobe vboxvfs failed" } - } - fi + } # Mount all shared folders from /etc/fstab. Normally this is done by some # other startup script but this requires the vboxdrv kernel module loaded. @@ -287,10 +272,8 @@ stop() if ! umount -a -t vboxsf 2>/dev/null; then fail "Cannot unmount vboxsf folders" fi - if [ -n "$BUILDVBOXVFS" ]; then - if running_vboxvfs; then - rmmod vboxvfs 2>/dev/null || fail "Cannot unload module vboxvfs" - fi + if running_vboxvfs; then + rmmod vboxvfs 2>/dev/null || fail "Cannot unload module vboxvfs" fi if running_vboxguest; then rmmod vboxguest 2>/dev/null || fail "Cannot unload module vboxguest" @@ -310,106 +293,8 @@ restart() # setup_script setup() { - # don't stop the old modules here -- they might be in use - if find /lib/modules/`uname -r` -name "vboxvideo\.*" 2>/dev/null|grep -q vboxvideo; then - begin "Removing old VirtualBox vboxvideo kernel module" - find /lib/modules/`uname -r` -name "vboxvideo\.*" 2>/dev/null|xargs rm -f 2>/dev/null - succ_msg - fi - if find /lib/modules/`uname -r` -name "vboxvfs\.*" 2>/dev/null|grep -q vboxvfs; then - begin "Removing old VirtualBox vboxvfs kernel module" - find /lib/modules/`uname -r` -name "vboxvfs\.*" 2>/dev/null|xargs rm -f 2>/dev/null - succ_msg - fi - if find /lib/modules/`uname -r` -name "vboxguest\.*" 2>/dev/null|grep -q vboxguest; then - begin "Removing old VirtualBox vboxguest kernel module" - find /lib/modules/`uname -r` -name "vboxguest\.*" 2>/dev/null|xargs rm -f 2>/dev/null - succ_msg - fi - begin "Building the VirtualBox Guest Additions kernel modules" - if ! sh /usr/share/$PACKAGE/test/build_in_tmp \ - --no-dkms --no-print-directory > $LOG 2>&1; then - fail "`printf "Your system does not seem to be set up to build kernel modules.\nLook at $LOG to find out what went wrong"`" - fi - echo - if ! sh /usr/share/$PACKAGE/test_drm/build_in_tmp \ - --no-dkms --no-print-directory >> $LOG 2>&1; then - printf "\nYour guest system does not seem to have sufficient OpenGL support to enable\naccelerated 3D effects (this requires Linux 2.6.27 or later in the guest\nsystem). This Guest Additions feature will be disabled.\n\n" - BUILDVBOXVIDEO="" - fi - begin "Building the main Guest Additions module" - if ! $BUILDVBOXGUEST \ - --save-module-symvers /tmp/vboxguest-Module.symvers \ - --no-print-directory install >> $LOG 2>&1; then - fail "Look at $LOG to find out what went wrong" - fi - succ_msg - if [ -n "$BUILDVBOXVFS" ]; then - begin "Building the shared folder support module" - if ! $BUILDVBOXVFS \ - --use-module-symvers /tmp/vboxguest-Module.symvers \ - --no-print-directory install >> $LOG 2>&1; then - fail "Look at $LOG to find out what went wrong" - fi - succ_msg - fi - if [ -n "$BUILDVBOXVIDEO" ]; then - begin "Building the OpenGL support module" - if ! $BUILDVBOXVIDEO \ - --use-module-symvers /tmp/vboxguest-Module.symvers \ - --no-print-directory install >> $LOG 2>&1; then - fail "Look at $LOG to find out what went wrong" - fi - succ_msg - fi - depmod - - begin "Doing non-kernel setup of the Guest Additions" - echo "Creating user for the Guest Additions." >> $LOG - # This is the LSB version of useradd and should work on recent - # distributions - useradd -d /var/run/vboxadd -g 1 -r -s /bin/false vboxadd >/dev/null 2>&1 - # And for the others, we choose a UID ourselves - useradd -d /var/run/vboxadd -g 1 -u 501 -o -s /bin/false vboxadd >/dev/null 2>&1 - - # Create udev description file - if [ -d /etc/udev/rules.d ]; then - echo "Creating udev rule for the Guest Additions kernel module." >> $LOG - udev_call="" - udev_app=`which udevadm 2> /dev/null` - if [ $? -eq 0 ]; then - udev_call="${udev_app} version 2> /dev/null" - else - udev_app=`which udevinfo 2> /dev/null` - if [ $? -eq 0 ]; then - udev_call="${udev_app} -V 2> /dev/null" - fi - fi - udev_fix="=" - if [ "${udev_call}" != "" ]; then - udev_out=`${udev_call}` - udev_ver=`expr "$udev_out" : '[^0-9]*$[0-9]*$'` - if [ "$udev_ver" = "" -o "$udev_ver" -lt 55 ]; then - udev_fix="" - fi - fi - ## @todo 60-vboxadd.rules -> 60-vboxguest.rules ? - echo "KERNEL=${udev_fix}\"vboxguest\", NAME=\"vboxguest\", OWNER=\"vboxadd\", MODE=\"0660\"" > /etc/udev/rules.d/60-vboxadd.rules - echo "KERNEL=${udev_fix}\"vboxuser\", NAME=\"vboxuser\", OWNER=\"vboxadd\", MODE=\"0666\"" >> /etc/udev/rules.d/60-vboxadd.rules - fi - - # Put mount.vboxsf in the right place - ln -sf "$lib_path/$PACKAGE/mount.vboxsf" /sbin - # At least Fedora 11 and Fedora 12 demand on the correct security context when - # executing this command from service scripts. Shouldn't hurt for other distributions. - chcon -u system_u -t mount_exec_t "$lib_path/$PACKAGE/mount.vboxsf" > /dev/null 2>&1 - + begin "Recompiling VirtualBox kernel modules, NOT. It has been packaged." succ_msg - if running_vboxguest || running_vboxadd; then - printf "You should restart your guest to make sure the new modules are actually used\n\n" - else - start - fi } # cleanup_script ++++++ vbox-vboxdrv-init-script.diff ++++++ Index: src/VBox/Installer/linux/vboxdrv.sh.in =================================================================== --- src/VBox/Installer/linux/vboxdrv.sh.in.orig +++ src/VBox/Installer/linux/vboxdrv.sh.in @@ -23,19 +23,18 @@ # ### BEGIN INIT INFO # Provides: vboxdrv -# Required-Start: $syslog -# Required-Stop: +# Required-Start: $syslog $remote_fs +# Required-Stop: $syslog $remote_fs # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: VirtualBox Linux kernel module +# Description: VirtualBox Linux kernel module ### END INIT INFO PATH=/sbin:/bin:/usr/sbin:/usr/bin:$PATH DEVICE=/dev/vboxdrv GROUPNAME=vboxusers LOG="/var/log/vbox-install.log" -NOLSB=%NOLSB% -DEBIAN=%DEBIAN% MODPROBE=/sbin/modprobe if $MODPROBE -c | grep -q '^allow_unsupported_modules *0'; then @@ -45,109 +44,30 @@ fi [ -f /lib/lsb/init-functions ] || NOLSB=yes [ -f /etc/vbox/vbox.cfg ] && . /etc/vbox/vbox.cfg -if [ -n "$INSTALL_DIR" ]; then - VBOXMANAGE="$INSTALL_DIR/VBoxManage" - BUILDVBOXDRV="$INSTALL_DIR/src/vboxdrv/build_in_tmp" - BUILDVBOXNETFLT="$INSTALL_DIR/src/vboxnetflt/build_in_tmp" - BUILDVBOXNETADP="$INSTALL_DIR/src/vboxnetadp/build_in_tmp" -else - VBOXMANAGE="/usr/lib/%PACKAGE%/VBoxManage" - BUILDVBOXDRV="/usr/share/%PACKAGE%/src/vboxdrv/build_in_tmp" - BUILDVBOXNETFLT="/usr/share/%PACKAGE%/src/vboxnetflt/build_in_tmp" - BUILDVBOXNETADP="/usr/share/%PACKAGE%/src/vboxnetadp/build_in_tmp" -fi +VBOXMANAGE="$INSTALL_DIR/VBoxManage" -# silently exit if the package was uninstalled but not purged, -# applies to Debian packages only -[ -z "$DEBIAN" -o -x $VBOXMANAGE -a -x $BUILDVBOXDRV ] || exit 0 - -if [ -n "$NOLSB" ]; then - if [ -f /etc/redhat-release ]; then - system=redhat - elif [ -f /etc/SuSE-release ]; then - system=suse - elif [ -f /etc/gentoo-release ]; then - system=gentoo - fi -fi +[ -r /etc/default/virtualbox ] && . /etc/default/virtualbox -[ -r /etc/default/%PACKAGE% ] && . /etc/default/%PACKAGE% +. /etc/rc.status -if [ -z "$NOLSB" ]; then - . /lib/lsb/init-functions - fail_msg() { - echo "" - log_failure_msg "$1" - } - succ_msg() { - log_success_msg " done." - } - begin_msg() { - log_daemon_msg "$@" - } -else - if [ "$system" = "redhat" ]; then - . /etc/init.d/functions - fail_msg() { - echo -n " " - echo_failure - echo - echo " ($1)" - } - succ_msg() { - echo -n " " - echo_success - echo - } - elif [ "$system" = "suse" ]; then - . /etc/rc.status - fail_msg() { - rc_failed 1 - rc_status -v - echo " ($1)" - } - succ_msg() { - rc_reset - rc_status -v - } - elif [ "$system" = "gentoo" ]; then - if [ -f /sbin/functions.sh ]; then - . /sbin/functions.sh - elif [ -f /etc/init.d/functions.sh ]; then - . /etc/init.d/functions.sh - fi - fail_msg() { - eerror "$1" - } - succ_msg() { - eend "$?" - } - begin_msg() { - ebegin "$1" - } - if [ "`which $0`" = "/sbin/rc" ]; then - shift - fi - else - fail_msg() { - echo " ...failed!" - echo " ($1)" - } - succ_msg() { - echo " ...done." - } - fi - if [ "$system" != "gentoo" ]; then - begin_msg() { - [ -z "${1:-}" ] && return 1 - if [ -z "${2:-}" ]; then - echo -n "$1" - else - echo -n "$1: $2" - fi - } - fi -fi +fail_msg() { + rc_failed 1 + rc_status -v + echo " ($1)" +} +succ_msg() { + rc_reset + rc_status -v +} +begin_msg() { + [ -z "${1:-}" ] && return 1 + if [ -z "${2:-}" ]; then + echo -n "$1" + else + + echo -n "$1: $2" + fi +} failure() { @@ -196,13 +116,6 @@ start() failure "Cannot create device $DEVICE with major $MAJOR and minor $MINOR" fi fi - # ensure permissions - if ! chown :$GROUPNAME $DEVICE 2>/dev/null; then - rmmod vboxnetadp 2>/dev/null - rmmod vboxnetflt 2>/dev/null - rmmod vboxdrv 2>/dev/null - failure "Cannot change owner $GROUPNAME for device $DEVICE" - fi if ! $MODPROBE vboxnetflt > /dev/null 2>&1; then failure "modprobe vboxnetflt failed. Please use 'dmesg' to find out why" fi @@ -236,7 +149,7 @@ stop() succ_msg } -# enter the following variables in /etc/default/%PACKAGE%: +# enter the following variables in /etc/default/virtualbox: # SHUTDOWN_USERS="foo bar" # check for running VMs of user foo and user bar # SHUTDOWN=poweroff @@ -285,41 +198,8 @@ stop_vms() setup() { - stop - if find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|grep -q vboxnetadp; then - begin_msg "Removing old VirtualBox netadp kernel module" - find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|xargs rm -f 2>/dev/null - succ_msg - fi - if find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|grep -q vboxnetflt; then - begin_msg "Removing old VirtualBox netflt kernel module" - find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|xargs rm -f 2>/dev/null - succ_msg - fi - if find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|grep -q vboxdrv; then - begin_msg "Removing old VirtualBox kernel module" - find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|xargs rm -f 2>/dev/null - succ_msg - fi - begin_msg "Recompiling VirtualBox kernel module" - if ! $BUILDVBOXDRV \ - --save-module-symvers /tmp/vboxdrv-Module.symvers \ - --no-print-directory install > $LOG 2>&1; then - failure "Look at $LOG to find out what went wrong" - fi - if ! $BUILDVBOXNETFLT \ - --use-module-symvers /tmp/vboxdrv-Module.symvers \ - --no-print-directory install >> $LOG 2>&1; then - failure "Look at $LOG to find out what went wrong" - fi - if ! $BUILDVBOXNETADP \ - --use-module-symvers /tmp/vboxdrv-Module.symvers \ - --no-print-directory install >> $LOG 2>&1; then - failure "Look at $LOG to find out what went wrong" - fi - rm -f /etc/vbox/module_not_compiled + begin_msg "Recompiling VirtualBox kernel modules, NOT. It has been packaged." succ_msg - start } dmnstatus() ++++++ virtualbox-ose-3.1.6-rpmlintrc ++++++ addFilter("incoherent-init-script-name vboxdrv") addFilter("incoherent-init-script-name vboxadd") addFilter("xorg-x11-driver-virtualbox-ose.* shlib-policy-missing-suffix") ++++++ virtualbox-ose-60-vboxdrv.rules ++++++ KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600" ++++++ virtualbox-ose-60-vboxguest.rules ++++++ KERNEL=="vboxguest", NAME="vboxguest", OWNER="root", MODE="0660" KERNEL=="vboxuser", NAME="vboxuser", OWNER="root", MODE="0600", ENV{ACL_MANAGE}="1" ++++++ virtualbox-ose-default.virtualbox ++++++ # /etc/default/virtualbox # # ------------------------------------------------------------------------------------------------- # In the "SHUTDOWN_USERS" list all users for which a check for runnings VMs should be done during # shutdown of "vboxdrv" resp. the server: # SHUTDOWN_USERS="foo bar" # # Set "SHUTDOWN" to one of "poweroff", "acpibutton" or "savestate" depending on which of the # shutdown methods for running VMs are wanted: # SHUTDOWN="poweroff" # SHUTDOWN="acpibutton" # SHUTDOWN="savestate" # ------------------------------------------------------------------------------------------------- # #SHUTDOWN_USERS="foo bar" #SHUTDOWN="savestate" ++++++ virtualbox-ose-guest-kmp-files ++++++ %defattr (-,root,root) %dir /lib/modules/%2-%1/ %dir /lib/modules/%2-%1/updates /lib/modules/%2-%1/updates/vboxvfs.ko /lib/modules/%2-%1/updates/vboxvideo.ko /lib/modules/%2-%1/updates/vboxguest.ko ++++++ virtualbox-ose-guest-preamble ++++++ Requires: kernel-%1 Provides: virtualbox-ose-guest-kmp = %version Provides: virtualbox-ose-kmp Obsoletes: virtualbox-ose-kmp ++++++ virtualbox-ose-host-kmp-files ++++++ %defattr (-,root,root) %dir /lib/modules/%2-%1/ %dir /lib/modules/%2-%1/updates /lib/modules/%2-%1/updates/vboxdrv.ko /lib/modules/%2-%1/updates/vboxnetadp.ko /lib/modules/%2-%1/updates/vboxnetflt.ko ++++++ virtualbox-ose-host-preamble ++++++ Requires: kernel-%1 Provides: virtualbox-ose-host-kmp = %version Provides: virtualbox-ose-kmp Obsoletes: virtualbox-ose-kmp ++++++ virtualbox-ose-patch-source.sh ++++++ #!/bin/bash REMOVE_DIRS=( src/VBox/Additions/WINNT src/VBox/Additions/os2 kBuild/bin kBuild/msgstyles kBuild/tools kBuild/sdks tools/darwin.x86 tools/darwin.amd64 tools/freebsd.x86 tools/os2.x86 tools/solaris.x86 tools/solaris.amd64 tools/win.amd64 tools/win.x86 tools/linux.x86 tools/linux.amd64 ) set -o errexit CMDNAME=${0##*/} SOURCEDIR=${0%$CMDNAME} BASENAME=${1%.tar.bz2} trap "rm -rf \"$BASENAME-patched.tar\" \"$BASENAME-patched.tar.bz2\"" ERR for (( N=0 ; N<${#REMOVE_DIRS[@]} ; N++ )) ; do #REMOVE_DIRS[N]="$BASENAME/${REMOVE_DIRS[N]}" # use a wildcard because VirtualBox-1.6.0-OSE != VirtualBox-1.6.0_OSE REMOVE_DIRS[N]="*/${REMOVE_DIRS[N]}" done cd "$SOURCEDIR" >/dev/null if ! test -f "$BASENAME.tar.bz2" ; then exit 0 fi if test -f "$BASENAME-patched.tar.bz2" ; then if test "$BASENAME.tar.bz2" -ot "$BASENAME-patched.tar.bz2" ; then if test $CMDNAME -ot "$BASENAME-patched.tar.bz2" ; then exit 0 fi fi fi cp -a "$BASENAME.tar.bz2" "$BASENAME-patched.tar.bz2" bunzip2 "$BASENAME-patched.tar.bz2" tar --wildcards --delete -f "$BASENAME-patched.tar" "${REMOVE_DIRS[@]}" bzip2 "$BASENAME-patched.tar" ++++++ virtualbox-ose-wrapper.sh ++++++ #!/bin/bash export QT_NO_KDE_INTEGRATION=1 /usr/bin/id -nG | grep -v -e "root" -e "vboxusers" >/dev/null && /usr/lib/virtualbox/VBoxPermissionMessage && exit LD_LIBRARY_PATH="/usr/lib/virtualbox${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" /usr/lib/virtualbox/VirtualBox $@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 python-distutils-extra for openSUSE:Factory
by root＠Hilbert.suse.de 02 Apr '10

02 Apr '10

Hello community, here is the log from the commit of package python-distutils-extra for openSUSE:Factory checked in at Sat Apr 3 00:19:51 CEST 2010. -------- --- python-distutils-extra/python-distutils-extra.changes 2009-08-25 14:30:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/python-distutils-extra/python-distutils-extra.changes 2010-04-02 03:41:07.000000000 +0200 @@ -1,0 +2,10 @@ +Fri Apr 2 03:40:21 CEST 2010 - vuntz(a)opensuse.org + +- Update to version 2.18. + +------------------------------------------------------------------- +Tue Sep 22 15:34:54 CEST 2009 - jblunck(a)suse.de + +- Update to python-distuils-extra 2.10 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- python-distutils-extra_1.91.2.tar.gz New: ---- python-distutils-extra-2.18.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-distutils-extra.spec ++++++ --- /var/tmp/diff_new_pack.1YvtiZ/_old 2010-04-03 00:19:24.000000000 +0200 +++ /var/tmp/diff_new_pack.1YvtiZ/_new 2010-04-03 00:19:24.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package python-distutils-extra (Version 1.91.2) +# spec file for package python-distutils-extra (Version 2.18) # -# 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 @@ -19,11 +19,11 @@ Name: python-distutils-extra -Version: 1.91.2 +Version: 2.18 Release: 1 Summary: Distutils/Setuptools Adapter -Source: https://launchpadlibrarian.net/12838568/python-distutils-extra_%{version}.t… -Url: https://launchpad.net/ubuntu/intrepid/+source/python-distutils-extra/ +Source: http://launchpad.net/python-distutils-extra/trunk/%{version}/+download/pyth… +Url: https://launchpad.net/python-distutils-extra Group: Development/Libraries/Python License: GNU General Public License version 2 (GPL v2) BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -46,9 +46,9 @@ Sebastian Heinlein <sebi(a)glatzor.de> %prep -%setup -q -c "%{name}-%{version}" -%__rm -rf debian/debian -%__mv debian/* . +%setup -q -n "%{name}-%{version}" +#%__rm -rf debian/debian +#%__mv debian/* . %build %__python ./setup.py build @@ -68,4 +68,5 @@ # mode: rpm-spec # tab-width: 3 # End: + %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

commit simias for openSUSE:Factory
by root＠Hilbert.suse.de 02 Apr '10

02 Apr '10

Hello community, here is the log from the commit of package simias for openSUSE:Factory checked in at Sat Apr 3 00:19:22 CEST 2010. -------- --- simias/simias.changes 2009-10-22 12:09:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/simias/simias.changes 2010-04-02 17:22:47.000000000 +0200 @@ -1,0 +2,26 @@ +Fri Apr 2 14:28:58 UTC 2010 - rkumar(a)novell.com + +- Update to 1.8.3.10090.1, merge change file from factory with 1.8.3 + changes. + +------------------------------------------------------------------- +Mon Feb 22 12:24:38 CET 2010 - ro(a)suse.de +- re-add fixes from may2009 and before + specfile: + - drop buildrequires for compat libraries, which are not + needed when building from source + - build helper binaries soapcpp2 and wsdl2h from source + to allow all platforms. + - simias-fixes.patch: + Fixed the function return warnings. (from may 2006) + - simias-libflaim.patch: + link libflaim dynaimcally (from feb 2006) + - simias-lib64.patch: + fix lib64 hack in configure.in +------------------------------------------------------------------- +Sun Feb 21 23:48:35 MST 2010 - sbipin(a)novell.com + +- Changes done to handle restore ifolder having common name. + redirecting log from bin directory + +------------------------------------------------------------------- @@ -47,0 +74,24 @@ +Wed Sep 30 21:42:48 MDT 2009 - sbipin(a)novell.com + +- Fix for downloading all the missed files while merging iFolder. + +------------------------------------------------------------------- +Wed Sep 23 22:30:59 MDT 2009 - sbipin(a)novell.com + +- Changes are made to handle combination of ports, dns, ip etc during + authentication. If during authentication, at any stage if it fails, + it will revert the authenticated domain. + +------------------------------------------------------------------- +Wed Sep 16 23:05:59 MDT 2009 - sbipin(a)novell.com + +- Changes are done to verify and re-create the missing directory. + Only if node exist. + +------------------------------------------------------------------- +Mon Aug 24 23:46:42 MDT 2009 - sbipin(a)novell.com + +- Changes has been done to not remove item from workarray, in case of + exception while uploading files to server. + +------------------------------------------------------------------- @@ -63,0 +114,22 @@ +Wed Aug 12 23:18:11 MDT 2009 - sbipin(a)novell.com + +- Simias client now listens on loopback ip only. + +------------------------------------------------------------------- +Wed Jul 22 07:30:10 MDT 2009 - sbipin(a)novell.com + +- Showing the enhanced conflict window from every place of conflict + invocation in case the client plugins is installed. +- Connect disconnect now shows correct no of iFolders when more than + one domains are connected. +- Changes done to set proper (5 min) Reschedule time, update UI + (client sync log) with info, for disabled ifolder. Changes done to + update correct un-managed path for Merge ifolder. +- Changes are done to handle, ifolder sync issue, when domain is + disconnected and reconnected and try to sync client +- The change is done inside Simias Client so that the domain sync gets + suspended for a while when setting of passphrase is done. so the + account creation part proceeds +- The fix is such that the client will not give TimeOut while setting + passphrase when server has around 4000 users in the domain. +------------------------------------------------------------------- @@ -228 +299,0 @@ - calling whatdependson for head-i586 Old: ---- Simias.cs.patch simias-fixes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ simias.spec ++++++ --- /var/tmp/diff_new_pack.rQaWhj/_old 2010-04-03 00:16:57.000000000 +0200 +++ /var/tmp/diff_new_pack.rQaWhj/_new 2010-04-03 00:16:57.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package simias (Version 1.8.2.9141.1) +# spec file for package simias (Version 1.8.3.10090.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,8 +19,10 @@ Name: simias + BuildRequires: bison dos2unix e2fsprogs e2fsprogs-devel flex gcc-c++ gcc43 gcc43-c++ gconf2 glib2 glib2-devel libflaim libflaim-devel libxml2 libxml2-devel log4net mono-core mono-data mono-devel mono-web ncurses-devel pkgconfig xsp -%define buildnum 9141 + +%define buildnum 10090 Url: http://www.ifolder.com %define prefix /usr %define sysconfdir /etc @@ -32,18 +34,16 @@ Requires: mono-web >= 1.2.2 Requires: log4net >= 1.2.9 Requires: xsp >= 1.2.5 -#Obsoletes: %{name} < 1.8.2.9141.1 -Version: 1.8.2.9141.1 -Release: 12 +#Obsoletes: %{name} < 1.8.2.10090.1 +Version: 1.8.3.10090.1 +Release: 1 Summary: Collection-Oriented Data Storage Source: simias.tar.gz -Patch: Simias.cs.patch -Patch1: simias-lib64.patch -Patch2: simias-libflaim.patch -Patch3: simias-fixes.patch -Patch4: simias-buildfix.patch -Patch5: simias-make.patch -Patch6: simias-warnings.patch +Patch: simias-lib64.patch +Patch1: simias-libflaim.patch +Patch2: simias-buildfix.patch +Patch3: simias-make.patch +Patch4: simias-warnings.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build #============================================================================= @@ -72,17 +72,11 @@ %prep export BUILDNUM=%{buildnum} %setup -q -n %{name} -%if %{suse_version} > 1110 -%patch -p1 -%endif +%patch %patch1 %patch2 -pushd dependencies/external -%patch3 -p1 -popd +%patch3 %patch4 -%patch5 -%patch6 #============================================================================= %build @@ -93,8 +87,8 @@ export LIBDIR=%{_lib} export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" + ./autogen.sh --prefix=%{prefix} --with-runasclient --sysconfdir=%{sysconfdir} -## re-added from code10 (begin) rm dependencies/external/tools/gsoap/linux-2.7/soapcpp2 rm dependencies/external/tools/gsoap/linux-2.7/wsdl2h pushd dependencies/external/tools/gsoap/linux-2.7 @@ -106,7 +100,6 @@ make -f MakefileSolaris COFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" LIBS="-lnsl" cd .. popd -## re-added from code10 (end) make #make dist #============================================================================= @@ -124,6 +117,7 @@ %clean %{__rm} -rf $RPM_BUILD_ROOT +#============================================================================= %preun if [ -d %{prefix}/%_lib/simias/web/bin/\$\{HOME\}/ ] @@ -148,12 +142,15 @@ %attr(644,root,root) %config %{sysconfdir}/simias/Simias.log4net %attr(644,root,root) %config %{sysconfdir}/simias/defaults.config %attr(644,root,root) %config %{sysconfdir}/simias/SimiasDirectoryMapping +%{prefix}/%_lib/libFlaimWrapper.so %{prefix}/%_lib/libFlaimWrapper.so.0 %{prefix}/%_lib/libFlaimWrapper.so.0.0.0 +%{prefix}/%_lib/libsimias-event.so %{prefix}/%_lib/libsimias-event.so.0 %{prefix}/%_lib/libsimias-event.so.0.0.0 %{prefix}/%_lib/libsimias-manager.so.0 %{prefix}/%_lib/libsimias-manager.so.0.0.0 +%{prefix}/%_lib/libsimias.so %{prefix}/%_lib/libsimias.so.0 %{prefix}/%_lib/libsimias.so.0.0.0 %dir %{prefix}/%_lib/simias ++++++ simias-buildfix.patch ++++++ --- /var/tmp/diff_new_pack.rQaWhj/_old 2010-04-03 00:16:57.000000000 +0200 +++ /var/tmp/diff_new_pack.rQaWhj/_new 2010-04-03 00:16:57.000000000 +0200 @@ -1,33 +1,8 @@ -Index: package/Makefile.am -=================================================================== ---- package/Makefile.am (revision 7082) -+++ package/Makefile.am (working copy) -@@ -22,7 +22,6 @@ - ####################################################################### - SUBDIRS = @SIMIAS_OS@ - --DIST_SUBDIRS = darwin windows - - sdk: - $(MAKE) -C $(SIMIAS_OS) $@ -Index: src/Makefile.am -=================================================================== ---- src/Makefile.am (revision 7082) -+++ src/Makefile.am (working copy) -@@ -2,7 +2,7 @@ - if SIMIAS_AS_CLIENT - SUBDIRS = core client - else --SUBDIRS = core server webservices webaccess admin setup utils -+SUBDIRS = core webservices setup utils - endif - - DIST_SUBDIRS = $(SUBDIRS) Index: configure.in =================================================================== ---- configure.in (revision 7082) +--- configure.in (revision 7330) +++ configure.in (working copy) -@@ -552,24 +552,6 @@ +@@ -600,24 +600,6 @@ esac], [runasclient="FALSE" AC_OUTPUT([ @@ -52,7 +27,7 @@ ]) ] ) -@@ -717,12 +699,6 @@ +@@ -766,12 +748,6 @@ src/client/SimiasDirectoryMapping src/webservices/Makefile src/webservices/AssemblyInfo.cs @@ -65,7 +40,7 @@ src/setup/Makefile src/setup/apache/Makefile src/setup/apache/ifolder_apache.conf -@@ -742,8 +718,6 @@ +@@ -791,8 +767,6 @@ src/utils/usercmd/simias-user src/utils/usercmd/simias-user.cmd package/Makefile @@ -74,3 +49,28 @@ ]) +Index: src/Makefile.am +=================================================================== +--- src/Makefile.am (revision 7330) ++++ src/Makefile.am (working copy) +@@ -2,7 +2,7 @@ + if SIMIAS_AS_CLIENT + SUBDIRS = core client + else +-SUBDIRS = core server webservices webaccess admin setup utils ++SUBDIRS = core webservices setup utils + endif + + DIST_SUBDIRS = $(SUBDIRS) +Index: package/Makefile.am +=================================================================== +--- package/Makefile.am (revision 7330) ++++ package/Makefile.am (working copy) +@@ -22,7 +22,6 @@ + ####################################################################### + SUBDIRS = @SIMIAS_OS@ + +-DIST_SUBDIRS = darwin windows + + sdk: + $(MAKE) -C $(SIMIAS_OS) $@ ++++++ simias-lib64.patch ++++++ --- /var/tmp/diff_new_pack.rQaWhj/_old 2010-04-03 00:16:57.000000000 +0200 +++ /var/tmp/diff_new_pack.rQaWhj/_new 2010-04-03 00:16:57.000000000 +0200 @@ -1,30 +1,36 @@ -diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore configure.in configure.in ---- configure.in 2009-06-02 09:53:09.000000000 +0530 -+++ configure.in 2009-10-15 14:53:53.000000000 +0530 -@@ -61,10 +61,7 @@ +Index: configure.in +=================================================================== +--- configure.in (revision 7330) ++++ configure.in (working copy) +@@ -88,12 +88,9 @@ # Check for a 32 / 64 #HACK ALERT : for libflaim 64bit builds case $host_cpu in - x86_64) -- LIB64='lib64' -- ;; -- amd64) -+ x86_64|amd64|s390x|ppc64|powerpc64) ++ x86_64|amd64|s390x|ppc64|powerpc64) LIB64='lib64' ;; +- amd64) +- LIB64='lib64' +- ;; *) -@@ -298,11 +295,13 @@ - STORELIB_PATH="$EXTERNAL_DIR/sqlite/linux" - LDOUT='-o' - # have to add this check on redhat for some reason -- AC_CHECK_PROG(CXX, g++, g++) + LIB64='lib' + ;; +@@ -302,7 +299,7 @@ + LDOUT='-o ' + AC_PROG_CXX(am__fastdepCXX) + AC_CHECK_PROG(CXX, g++, g++) +- # AC_CHECK_PROG(CXX, g++-3.3, g++-3.3) + AC_CHECK_PROG(CXX, g++-43, g++-43) + # LD='$(CXX) -dynamiclib ' StoreProviderAssembly="SimiasLib.dll" StoreProviderType="Simias.Storage.Provider.Flaim.FlaimProvider" - GSOAP_PATH="$TOOLDIR/gsoap/linux-2.7" - mappingpath="${exec_prefix}/${LIB64}/simias/web/bin/Simias.exe" +@@ -310,6 +307,8 @@ + #StoreProviderType="Simias.Storage.Provider.Sqlite.SqliteProvider" + mappingpath="${exec_prefix}/lib/simias/web/bin/Simias.exe" + GSOAP_PATH="$TOOLDIR/gsoap/macosx-x86-2.7" + CXX=g++-4.3 -+ CXXCPP=g++-4.3 -E ++ CXXCPP=g++-4.3 -E ;; # - # Windows-specific configuration + # Linux-specific configuration ++++++ simias-libflaim.patch ++++++ --- /var/tmp/diff_new_pack.rQaWhj/_old 2010-04-03 00:16:57.000000000 +0200 +++ /var/tmp/diff_new_pack.rQaWhj/_new 2010-04-03 00:16:57.000000000 +0200 @@ -1,5 +1,7 @@ ---- src/core/FlaimProvider/FlaimWrapper/Makefile.am 2009/05/25 14:39:53 1.1 -+++ src/core/FlaimProvider/FlaimWrapper/Makefile.am 2009/05/25 14:40:02 +Index: src/core/FlaimProvider/FlaimWrapper/Makefile.am +=================================================================== +--- src/core/FlaimProvider/FlaimWrapper/Makefile.am (revision 7330) ++++ src/core/FlaimProvider/FlaimWrapper/Makefile.am (working copy) @@ -91,7 +91,7 @@ lib=@LIB64@ ++++++ simias.tar.gz ++++++ simias/simias.tar.gz /mounts/work_src_done/STABLE/simias/simias.tar.gz differ: char 5, 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

1 0

commit fluidsynth for openSUSE:Factory
by root＠Hilbert.suse.de 02 Apr '10

02 Apr '10

Hello community, here is the log from the commit of package fluidsynth for openSUSE:Factory checked in at Sat Apr 3 00:16:52 CEST 2010. -------- --- fluidsynth/fluidsynth.changes 2009-07-27 15:54:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/fluidsynth/fluidsynth.changes 2010-04-02 10:14:36.000000000 +0200 @@ -1,0 +2,12 @@ +Fri Apr 2 08:09:19 UTC 2010 - davejplater(a)gmail.com + +- Updated to version 1.1.1 +- FluidSynth 1.1.1 - "Clarity", see Changes page for details. + http://fluidsynth.resonance.org/trac/wiki/ChangeLog1_1_1 + This is a rather major bug fix release to version 1.1.0. + FluidSynth 1.1.0 - "A More Solid Fluid", see Changes page for details. + http://fluidsynth.resonance.org/trac/wiki/ChangeLog1_1_0 + This is the result of a 6 month development cycle and is the most + significant release since 1.0.0! + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- fluidsynth-1.0.9.tar.bz2 New: ---- fluidsynth-1.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fluidsynth.spec ++++++ --- /var/tmp/diff_new_pack.QOlAWP/_old 2010-04-03 00:16:33.000000000 +0200 +++ /var/tmp/diff_new_pack.QOlAWP/_new 2010-04-03 00:16:33.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package fluidsynth (Version 1.0.9) +# spec file for package fluidsynth (Version 1.1.1) # -# 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 @@ -21,13 +21,13 @@ BuildRequires: alsa-devel ladspa-devel libjack-devel readline-devel BuildRequires: lash-devel pulseaudio-devel Summary: A Real-Time Software Synthesizer That Uses Soundfont(tm) -Version: 1.0.9 +Version: 1.1.1 Release: 1 Group: Productivity/Multimedia/Sound/Midi # Obsoletes: iiwusynth # Provides: iiwusynth AutoReqProv: on -License: LGPL v2.1 or later +License: LGPLv2.1+ Url: http://www.fluidsynth.org/ Source: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -47,7 +47,7 @@ Johnathan Lee %package devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Development package for the fluidsynth library Group: Development/Libraries/C and C++ Requires: libfluidsynth1 = %{version} glibc-devel @@ -65,7 +65,7 @@ Johnathan Lee %package -n libfluidsynth1 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Library for Fluidsynth Group: System/Libraries ++++++ fluidsynth-1.0.9.tar.bz2 -> fluidsynth-1.1.1.tar.bz2 ++++++ ++++ 57052 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

1 0

commit pm-utils for openSUSE:Factory
by root＠Hilbert.suse.de 02 Apr '10

02 Apr '10

Hello community, here is the log from the commit of package pm-utils for openSUSE:Factory checked in at Sat Apr 3 00:16:46 CEST 2010. -------- --- pm-utils/pm-utils.changes 2010-02-16 16:18:50.000000000 +0100 +++ /mounts/work_src_done/STABLE/pm-utils/pm-utils.changes 2010-04-02 10:47:16.000000000 +0200 @@ -1,0 +2,14 @@ +Fri Apr 2 08:45:12 UTC 2010 - mvyskocil(a)suse.cz + +- Updated to 1.3.0: fix bnc#590709 + * pm-utils does not depends on HAL anymore + * import HAL's fdi quirks + * track whether suspend/hibernate succeeded, and handle things as appropriately as we can. + * Native suspend-hybrid method. + * Profile the entire suspend/resume process using PM_PROFILE. +- backport the existing patches, split and sort them +- remove the HAL dependencies from power.d hooks wol and sata-pm +- use explicit dependencies on external tools +- powersave is back - now partially supports upower + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- pm-utils-1.2.6.1-grub.patch pm-utils-1.2.6.1-logging.patch pm-utils-1.2.6.1-on_ac_power-no-dbus-fallback.diff pm-utils-1.2.6.1-smart-uswsusp.patch pm-utils-1.2.6.1.tar.bz2 pm-utils-suse-73f6e713970bff833abf162fd8515e9aaf75cd17.tar.bz2 New: ---- pm-quirks-20100316.tar.bz2 pm-utils-1.3.0-on_ac_power-no-dbus-fallback.diff pm-utils-1.3.0-suse-config.patch pm-utils-1.3.0-suse-drop-import-fdi-quirkdb.patch pm-utils-1.3.0-suse-grub.patch pm-utils-1.3.0-suse-logging.patch pm-utils-1.3.0-suse-smart-uswsusp.patch pm-utils-1.3.0-upower.patch pm-utils-1.3.0.tar.bz2 pm-utils-suse-e0959e450acdef4457208c85692d354118ed2dcf.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pm-utils.spec ++++++ --- /var/tmp/diff_new_pack.vV3APe/_old 2010-04-03 00:15:36.000000000 +0200 +++ /var/tmp/diff_new_pack.vV3APe/_new 2010-04-03 00:15:36.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package pm-utils (Version 1.2.6.1) +# spec file for package pm-utils (Version 1.3.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,30 +18,56 @@ # norootforbuild %define pm_libdir %{_prefix}/lib/%{name}/ +%define pm_quirkdbdir %{pm_libdir}/video-quirks %define pm_sysconfdir %{_sysconfdir}/pm/config.d/ Name: pm-utils -Version: 1.2.6.1 -Release: 2 +Version: 1.3.0 +Release: 1 Summary: Tools to suspend and hibernate computers License: GPLv2+ Group: System/Base Url: http://pm-utils.freedesktop.org/wiki/ Source: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM: upower suport +# http://www.mail-archive.com/pm-utils@lists.freedesktop.org/msg02018.html +# http://cgit.freedesktop.org/pm-utils/commit/?id=e8d0b58a9df080f021d04b4c2d3… +Patch0: pm-utils-1.3.0-upower.patch #PATCH-FIX-OPENSUSE: on_ac_power don't produce veird errors if HAL or D-BUS are broken -Patch1: pm-utils-1.2.6.1-on_ac_power-no-dbus-fallback.diff -#PATCH-FIX-OPENSUSE: backport the smarter swsusp to 1.2.6.1 -Patch2: pm-utils-1.2.6.1-smart-uswsusp.patch +Patch1: pm-utils-1.3.0-on_ac_power-no-dbus-fallback.diff #PATCH-FIX-OPENSUSE: fixes a dbus-send call -Patch3: pm-utils-1.2.6.1-fix-broken-dbus-send.diff +Patch2: pm-utils-1.2.6.1-fix-broken-dbus-send.diff +#PATCH-FIX-OPENSUSE: make the uswsusp module default on SUSE and port the "smart" behavior +Patch3: pm-utils-1.3.0-suse-smart-uswsusp.patch +#PATCH-FIX-OPENSUSE: add some aditional config variables for pm-utils-suse +Patch4: pm-utils-1.3.0-suse-config.patch #PATCH-FIX-OPENSUSE: more SUSE friendly grub handler -Patch4: pm-utils-1.2.6.1-grub.patch +Patch5: pm-utils-1.3.0-suse-grub.patch #PATCH-FIX-OPENSUSE: setup also kernel loglevel to show up the progress bar -Patch5: pm-utils-1.2.6.1-logging.patch +Patch6: pm-utils-1.3.0-suse-logging.patch +#PATCH-FIX-OPENSUSE: drop import-fdi-quirkdb from installation, SUSE has it included +#Note: it will be removed in next release, no needed to ustream +Patch7: pm-utils-1.3.0-suse-drop-import-fdi-quirkdb.patch # http://gitorious.org/opensuse/pm-utils-suse -Source1: pm-utils-suse-73f6e713970bff833abf162fd8515e9aaf75cd17.tar.bz2 +Source1: pm-utils-suse-e0959e450acdef4457208c85692d354118ed2dcf.tar.bz2 +Source2: http://pm-utils.freedesktop.org/releases/pm-quirks-20100316.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: hal + +# hooks requires some external tools +Requires: grep +Requires: sed +Requires: ethtool +Requires: gawk +Requires: coreutils +Requires: module-init-tools + +%if 0%{?suse_version} <= 1120 +Requires: DeviceKit-disks +Requires: DeviceKit-power +%else +Requires: udisks +Requires: upower +%endif %description pm-utils provide simple shell command line tools to suspend and @@ -71,12 +97,15 @@ %prep -%setup -q -b 1 +%setup -q -b 1 -a 2 +%patch0 -p1 -b .upower %patch1 -p1 -b .no-dbus-fallback -%patch2 -p1 -b .smart-swsusp -%patch3 -p1 -b .broken-dbus -%patch4 -p1 -b .grub -%patch5 -p1 -b .logging +%patch2 -p1 -b .broken-dbus +%patch3 -p1 -b .smart-swsusp +%patch4 -p1 -b .suse-config +%patch5 -p1 -b .suse-grub +%patch6 -p1 -b .suse-logging +%patch7 -p1 -b .drop-import-fdi-quirkdb %build %{configure} \ @@ -89,11 +118,16 @@ #FIXME: should be installed by make install %{__install} -m 644 man/*.1 %{buildroot}/%{_mandir}/man1 %{__install} -m 644 man/*.8 %{buildroot}/%{_mandir}/man8 +#quirks +%{__install} -d -m 0755 %{buildroot}%{pm_quirkdbdir} +%{__install} -m 0644 *.quirkdb %{buildroot}%{pm_quirkdbdir} #SUSE hooks pushd ../pm-utils-suse %{__install} -m 0755 hooks/sleep.d/* %{buildroot}/%{pm_libdir}/sleep.d/ %{__install} -m 0755 hooks/power.d/* %{buildroot}/%{pm_libdir}/power.d/ %{__install} -m 0644 hooks/config.d/* %{buildroot}/%{pm_sysconfdir}/ +# powersave command is back +%{__install} -m 0755 bin/powersave %{buildroot}/%{_bindir} popd %{__install} -d -m 0755 %{buildroot}/%{_localstatedir}/log touch %{buildroot}/%{_localstatedir}/log/pm-suspend.log @@ -109,7 +143,7 @@ %files %defattr (-,root,root) %doc README ChangeLog AUTHORS ../pm-utils-suse/doc/README.smart-suspend-to-RAM -%{_bindir}/* +%attr(0755,root,root) %{_bindir}/* %{_sbindir}/* %{_sysconfdir}/pm/ %config(noreplace) %{_sysconfdir}/pm/config.d/rtcwake.config ++++++ pm-utils-1.2.6.1-on_ac_power-no-dbus-fallback.diff -> pm-utils-1.3.0-on_ac_power-no-dbus-fallback.diff ++++++ --- pm-utils/pm-utils-1.2.6.1-on_ac_power-no-dbus-fallback.diff 2009-11-25 13:44:50.000000000 +0100 +++ /mounts/work_src_done/STABLE/pm-utils/pm-utils-1.3.0-on_ac_power-no-dbus-fallback.diff 2010-04-01 16:44:43.000000000 +0200 @@ -1,9 +1,25 @@ -Index: pm-utils-1.2.6.1/src/on_ac_power +Index: pm-utils-1.3.0/src/on_ac_power =================================================================== ---- pm-utils-1.2.6.1.orig/src/on_ac_power 2009-06-14 03:56:09.000000000 +0200 -+++ pm-utils-1.2.6.1/src/on_ac_power 2009-11-19 12:38:03.213061128 +0100 -@@ -31,17 +31,28 @@ - # +--- pm-utils-1.3.0.orig/src/on_ac_power 2010-04-01 12:07:44.679844425 +0200 ++++ pm-utils-1.3.0/src/on_ac_power 2010-04-01 12:09:45.631532099 +0200 +@@ -35,7 +35,7 @@ + --dest=org.freedesktop.UPower \ + /org/freedesktop/UPower \ + org.freedesktop.DBus.Properties.Get \ +- string:org.freedesktop.UPower string:OnBattery)"; then ++ string:org.freedesktop.UPower string:OnBattery 2>/dev/null)"; then + echo "$s" | grep -q 'boolean false' + exit $? + fi +@@ -45,23 +45,34 @@ + --dest=org.freedesktop.DeviceKit.Power \ + /org/freedesktop/DeviceKit/Power \ + org.freedesktop.DBus.Properties.Get \ +- string:org.freedesktop.DeviceKit.Power string:OnBattery)"; then ++ string:org.freedesktop.DeviceKit.Power string:OnBattery 2>/dev/null)"; then + echo "$s" | grep -q 'boolean false' + exit $? + fi # Check for AC/DC/etc adapters -ac_adapters="$(hal-find-by-capability --capability ac_adapter)" @@ -25,7 +41,7 @@ -done + # If any of them are online, then we're done. + for device in $ac_adapters ; do -+ present=$(hal-get-property --udi $device --key ac_adapter.present) ++ present="$(hal-get-property --udi "$device" --key ac_adapter.present 2>/dev/null)" + [ "$present" == "true" ] && exit 0 + done +else # fall back to /sys/.../ac/... parsing... ++++++ pm-utils-1.3.0-suse-config.patch ++++++ --- pm/defaults | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) Index: pm-utils-1.3.0/pm/defaults =================================================================== --- pm-utils-1.3.0.orig/pm/defaults 2010-04-01 12:12:38.903407733 +0200 +++ pm-utils-1.3.0/pm/defaults 2010-04-01 12:33:01.706869112 +0200 @@ -46,6 +46,25 @@ # if S2RAM_OPTS is set, it overrides S2RAM_QUIRKS_SOURCE! S2RAM_QUIRKS_SOURCE="" +# IWL power management +# 6: Radio always on, default AC +# 1-5: BATTERY levels, the higher the value, the more power is saved +# Empty string is meant for not touching any power management features at all +IWL_PM="5" + +# SATA power management +# Possible values are: min_power, medium_power, max_performance +# Empty string is meant for not touching any power management features at all +SATA_PM="medium_power" + +# SOUND power management +# Specifies the timeout after a sound card enters a low power mode +# Empty string is meant for not touching any power management features at all +SOUND_PM="10" + +# the location of the autogenerated s2disk (s2both) config file +S2DISK_CONF="/var/lib/s2disk.conf" + ####################################################################### # These variables will be handled specially when we load files in # /etc/pm/config.d. ++++++ pm-utils-1.3.0-suse-drop-import-fdi-quirkdb.patch ++++++ --- src/Makefile.am | 2 +- src/Makefile.in | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) Index: pm-utils-1.3.0/src/Makefile.am =================================================================== --- pm-utils-1.3.0.orig/src/Makefile.am 2009-12-25 17:41:57.000000000 +0100 +++ pm-utils-1.3.0/src/Makefile.am 2010-04-01 13:39:26.508515181 +0200 @@ -18,7 +18,7 @@ sbin_SCRIPTS = pm-powersave -script_in_files = pm-action.in pm-is-supported.in pm-powersave.in import-fdi-quirkdb.in +script_in_files = pm-action.in pm-is-supported.in pm-powersave.in CLEANFILES = $(script_in_files:.in=) Index: pm-utils-1.3.0/src/Makefile.in =================================================================== --- pm-utils-1.3.0.orig/src/Makefile.in 2010-03-17 04:20:32.000000000 +0100 +++ pm-utils-1.3.0/src/Makefile.in 2010-04-01 13:39:53.423407178 +0200 @@ -187,9 +187,9 @@ pm_reset_swap_SOURCES = pm-reset-swap.c pm_bin_SCRIPTS = pm-action bin_SCRIPTS = pm-is-supported -dist_bin_SCRIPTS = on_ac_power import-fdi-quirkdb +dist_bin_SCRIPTS = on_ac_power sbin_SCRIPTS = pm-powersave -script_in_files = pm-action.in pm-is-supported.in pm-powersave.in import-fdi-quirkdb.in +script_in_files = pm-action.in pm-is-supported.in pm-powersave.in CLEANFILES = $(script_in_files:.in=) EXTRA_DIST = $(script_in_files) do_subst = sed -e 's,[@]PM-UTILS-LIBDIR[@],$(pm_libdir),g' \ ++++++ pm-utils-1.3.0-suse-grub.patch ++++++ Index: pm-utils-1.3.0/pm/sleep.d/01grub =================================================================== --- pm-utils-1.3.0.orig/pm/sleep.d/01grub 2010-03-30 13:01:02.069674802 +0200 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -#!/bin/sh -# Ensure grub will load the correct kernel on resume from hibernate, -# TODO: This is rather redhat specific, and very grub specific. - -default_resume_kernel() -{ - [ "$1" = "suspend" ] && return $NA - case $(uname -m) in - i?86|x86_64|athlon) - ;; - *) # this is only valid for x86 and x86_64 - return $NA - ;; - esac - - [ -x /sbin/grubby -a -x /sbin/grub ] || return $NA - [ -e "/boot/vmlinuz-$(uname -r)" ] || return 1 - out=$(/sbin/grubby --info /boot/vmlinuz-$(uname -r) |grep index) - [ -n "${out}" ] || return 1 - current=${out#index=} - echo "savedefault --default=${current} --once" | \ - /sbin/grub --device-map=/boot/grub/device.map \ - --batch --no-floppy --no-curses >/dev/null - - return 0 -} - -case "$1" in - hibernate|suspend) - default_resume_kernel $2 - ;; - *) exit $NA - ;; -esac Index: pm-utils-1.3.0/pm/sleep.d/99Zgrub =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ pm-utils-1.3.0/pm/sleep.d/99Zgrub 2010-03-30 13:01:16.839798542 +0200 @@ -0,0 +1,193 @@ +#!/bin/bash +# +# Stefan Seyfried, SUSE Linux Products GmbH 2006, GPL v2 +# mostly taken from the powersave project. + +GRUBONCE="/usr/sbin/grubonce" +GRUBDEFAULT="/boot/grub/default" +GRUBDEFSAVE="/var/run/suspend.grubonce.default" + +##################################################################### +# gets a list of available kernels from /boot/grub/menu.lst +# kernels are in the array $KERNELS, output to stdout to be eval-ed. +getkernels() +{ + # DEBUG "Running getkernels()" INFO + local MENU_LST="/boot/grub/menu.lst" + local I DUMMY MNT ROOTDEV + declare -i I=0 J=-1 + + # we need the root partition later to decide if this is the kernel to select + while read ROOTDEV MNT DUMMY; do + [ "$ROOTDEV" = "rootfs" ] && continue # not what we are searching for + if [ "$MNT" = "/" ]; then + break + fi + done < /proc/mounts + + # build an array KERNELS with all the kernels in /boot/grub/menu.lst + # the array MENU_ENTRIES contains the corresponding menu entry numbers + # DEFAULT_BOOT contains the default entry. + while read LINE; do + case $LINE in + title*) + let J++ # increase for every menu entry, even for non-linux + # DEBUG "Found grub menu entry #${J}: '${LINE}'" INFO + ;; + default*) + DUMMY=($LINE) # "default 0 #maybe a comment" + echo "DEFAULT_BOOT=${DUMMY[1]}" # ^^[0]^^ 1 ^^[2]^ 3 ^^[4]^^ + # DEBUG "Default boot entry is '${DUMMY[1]}'" INFO + ;; + kernel*noresume*) + # we probably found the "failsafe" kernel that won't resume... + echo " Skipping grub entry #${J}, because it has the noresume option" >&2 + ;; + kernel*root=*) + local ROOT + ROOT=${LINE#*root=} + DUMMY=($ROOT) + ROOT=${DUMMY[0]} + if [ "$(stat -Lc '%t:%T' $ROOT)" != "$(stat -Lc '%t:%T' $ROOTDEV)" ]; then + echo " Skipping grub entry #${J}, because its root= parameter ($ROOT)" >&2 + echo " does not match the current root device ($ROOTDEV)." >&2 + continue + fi + DUMMY=($LINE) # kernel (hd0,1)/boot/vmlinuz-ABC root=/dev/hda2 + echo "KERNELS[$I]='${DUMMY[1]##*/}'" # vmlinuz-ABC + echo "MENU_ENTRIES[$I]=$J" + # DEBUG "Found kernel entry #${I}: '${DUMMY[1]##*/}'" INFO + let I++ + ;; + kernel*) + # a kernel without "root="? We better skip that one... + echo " Skipping grub entry #${J}, because it has no root= option" >&2 + ;; + *) ;; + esac + done < $MENU_LST +} + +############################################################# +# runs grubonce from the grub package to select which kernel +# to boot on next startup +grub-once() +{ + if [ -x "$GRUBONCE" ]; then + rm -f "$GRUBDEFSAVE" + if [ -e "$GRUBDEFAULT" ]; then + echo " saving original $GRUBDEFAULT" + cp "$GRUBDEFAULT" "$GRUBDEFSAVE" + fi + echo " running '$GRUBONCE $1'" + $GRUBONCE $1 + else + echo "WARNING: $GRUBONCE not found, not preparing bootloader" + fi +} + +############################################################# +# restore grub default after (eventually failed) resume +grub-once-restore() +{ + echo "INFO: running grub-once-restore" + rm -f "$GRUBDEFAULT" + if [ -e "$GRUBDEFSAVE" ]; then + echo " restoring original $GRUBDEFAULT" + mv "$GRUBDEFSAVE" "$GRUBDEFAULT" + fi +} + +############################################################################# +# try to find a kernel image that matches the actually running kernel. +# We need this, if more than one kernel is installed. This works reasonably +# well with grub, if all kernels are named "vmlinuz-`uname -r`" and are +# located in /boot. If they are not, good luck ;-) +find-kernel-entry() +{ + NEXT_BOOT=-1 + ARCH=`uname -m` + declare -i I=0 + # DEBUG "running kernel: $RUNNING" DIAG + while [ -n "${KERNELS[$I]}" ]; do + BOOTING="${KERNELS[$I]}" + if IMAGE=`readlink /boot/$BOOTING` && [ -e "/boot/${IMAGE##*/}" ]; then + # DEBUG "Found kernel symlink $BOOTING => $IMAGE" INFO + BOOTING=$IMAGE + fi + case $ARCH in + ppc*) BOOTING="${BOOTING#*vmlinux-}" ;; + *) BOOTING="${BOOTING#*vmlinuz-}" ;; + esac + if [ "$RUNNING" == "$BOOTING" ]; then + NEXT_BOOT=${MENU_ENTRIES[$I]} + echo " running kernel is grub menu entry $NEXT_BOOT (${KERNELS[$I]})" + break + fi + let I++ + done + # if we have not found a kernel, issue a warning. + # if we have found a kernel, we'll do "grub-once" later, after + # prepare_suspend finished. + if [ $NEXT_BOOT -eq -1 ]; then + echo "WARNING: no kernelfile matching the running kernel found" + fi +} + +############################################################################# +# if we did not find a kernel (or BOOT_LOADER is not GRUB) check, +# if the running kernel is still the one that will (probably) be booted for +# resume (default entry in menu.lst or, if there is none, the kernel file +# /boot/vmlinuz points to.) +# This will only work, if you use "original" SUSE kernels. +# you can always override with the config variable set to "yes" +prepare-grub() +{ + echo "INFO: running prepare-grub" + eval `getkernels` + RUNNING=`uname -r` + find-kernel-entry + + RET=0 + + if [ $NEXT_BOOT -eq -1 ]; then + # which kernel is booted with the default entry? + BOOTING="${KERNELS[$DEFAULT_BOOT]}" + # if there is no default entry (no menu.lst?) we fall back to + # the default of /boot/vmlinuz. + [ -z "$BOOTING" ] && BOOTING="vmlinuz" + if IMAGE=`readlink /boot/$BOOTING` && [ -e "/boot/${IMAGE##*/}" ]; then + BOOTING=$IMAGE + fi + BOOTING="${BOOTING#*vmlinuz-}" + echo "running kernel: '$RUNNING', probably booting kernel: '$BOOTING'" + if [ "$BOOTING" != "$RUNNING" ]; then + echo "ERROR: kernel version mismatch, cannot suspend to disk" + echo "running: $RUNNING booting: $BOOTING" >> $INHIBIT + RET=1 + fi + else + # set the bootloader to the running kernel + echo " preparing boot-loader: selecting entry $NEXT_BOOT, kernel /boot/$BOOTING" + T1=`date +"%s%N"` + sync; sync; sync # this is needed to speed up grub-once on reiserfs + T2=`date +"%s%N"` + echo " grub-once: `grub-once $NEXT_BOOT`" + T3=`date +"%s%N"` + S=$(((T2-T1)/100000000)); S="$((S/10)).${S:0-1}" + G=$(((T3-T2)/100000000)); G="$((G/10)).${G:0-1}" + echo " time needed for sync: $S seconds, time needed for grub: $G seconds." + fi + + return $RET +} + + +###### main() + +if [ "$1" = hibernate ] || [ "$1" = suspend -a "$2" = suspend_hybrid ]; then + prepare-grub +fi +if [ "$1" = thaw ] || [ "$1" = resume -a "$2" = suspend_hybrid ]; then + grub-once-restore +fi Index: pm-utils-1.3.0/pm/sleep.d/Makefile.am =================================================================== --- pm-utils-1.3.0.orig/pm/sleep.d/Makefile.am 2010-03-30 13:01:02.069674802 +0200 +++ pm-utils-1.3.0/pm/sleep.d/Makefile.am 2010-03-30 13:01:16.839798542 +0200 @@ -3,7 +3,7 @@ sleep_SCRIPTS = \ 00logging \ 00powersave \ - 01grub \ + 99Zgrub \ 49bluetooth \ 55NetworkManager \ 75modules \ Index: pm-utils-1.3.0/pm/sleep.d/Makefile.in =================================================================== --- pm-utils-1.3.0.orig/pm/sleep.d/Makefile.in 2010-03-30 13:01:02.069674802 +0200 +++ pm-utils-1.3.0/pm/sleep.d/Makefile.in 2010-03-30 13:01:16.904797911 +0200 @@ -161,7 +161,7 @@ sleep_SCRIPTS = \ 00logging \ 00powersave \ - 01grub \ + 99Zgrub \ 49bluetooth \ 55NetworkManager \ 75modules \ ++++++ pm-utils-1.3.0-suse-logging.patch ++++++ Index: pm-utils-1.2.6.1/pm/sleep.d/00logging =================================================================== --- pm-utils-1.2.6.1.orig/pm/sleep.d/00logging 2009-06-14 03:56:09.000000000 +0200 +++ pm-utils-1.2.6.1/pm/sleep.d/00logging 2009-11-24 09:01:10.010044035 +0100 @@ -1,14 +1,33 @@ #!/bin/sh # Log some extra information at the beginning of a suspend/resume cycle. # TODO: Make this hook only run when PM_DEBUG is true? +# SUSE: setup also kernel loglevel to show a progress bar . "${PM_FUNCTIONS}" case "$1" in hibernate|suspend) [ -n "$PM_LOGFILE" ] || exit 0 - /bin/uname -a - lsmod - free + # save the old loglevel + read KERNEL_LOGLEVEL DUMMY < /proc/sys/kernel/printk + echo "export KERNEL_LOGLEVEL=$KERNEL_LOGLEVEL" >> /var/run/pm-suspend + # set the loglevel so we see the progress bar. + # if the level is higher than needed, we leave it alone. + if [ $KERNEL_LOGLEVEL -lt 5 ]; then + echo 5 > /proc/sys/kernel/printk + fi + echo "$1 initiated: `date`" + echo + echo "`/bin/uname -a`" + echo "kernel command line: '`cat /proc/cmdline`'" + echo "`lsmod`" + echo + echo "`free`" + echo + ;; + thaw|resume) + if [ -n "$KERNEL_LOGLEVEL" ] ; then + echo $KERNEL_LOGLEVEL > /proc/sys/kernel/printk + fi ;; esac ++++++ pm-utils-1.3.0-suse-smart-uswsusp.patch ++++++ --- pm/defaults | 20 +++++++++++++++- pm/module.d/uswsusp | 63 +++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 77 insertions(+), 6 deletions(-) Index: pm-utils-1.3.0/pm/defaults =================================================================== --- pm-utils-1.3.0.orig/pm/defaults 2010-04-01 12:07:40.378407398 +0200 +++ pm-utils-1.3.0/pm/defaults 2010-04-01 12:12:38.903407733 +0200 @@ -27,8 +27,26 @@ # tuxonice If your system has support for tuxonice, use this. # # The system defaults to "kernel" if this is commented out. -# SLEEP_MODULE="kernel" +SLEEP_MODULE="uswsusp" +####################################################################### +# the variables below here are specific to the SUSE package right now +# and are used only if SLEEP_MODULE is uswsusp + +# what options should be passed to s2ram? +# see http://en.opensuse.org/S2ram for more information +# If this option is set, it overrides S2RAM_QUIRKS_SOURCE below +S2RAM_OPTS="" + +# where should pm-utils get the s2ram quirks from? +# s2ram - use the whitelist in s2ram, if the machine is known. +# hal - ignored, exists only for comparibility purposes pm-utils 1.3.0+ has +# HAL quirks built-in +# everything else: try to be smart in figuring out the correct quirks. +# if S2RAM_OPTS is set, it overrides S2RAM_QUIRKS_SOURCE! +S2RAM_QUIRKS_SOURCE="" + +####################################################################### # These variables will be handled specially when we load files in # /etc/pm/config.d. # Multiple declarations of these environment variables will result in Index: pm-utils-1.3.0/pm/module.d/uswsusp =================================================================== --- pm-utils-1.3.0.orig/pm/module.d/uswsusp 2010-04-01 12:07:40.378407398 +0200 +++ pm-utils-1.3.0/pm/module.d/uswsusp 2010-04-01 12:31:10.235228812 +0200 @@ -5,6 +5,7 @@ uswsusp_hooks() { disablehook 99video "disabled by uswsusp" + disablehook 90chvt "disabled by uswsusp" } # Since we disabled 99video, we need to take responsibility for proper @@ -35,8 +36,52 @@ # if we were told to ignore quirks, do so. # This is arguably not the best way to do things, but... [ "$QUIRK_NONE" = "true" ] && OPTS="" + S2RAM_OPTS="$S2RAM_OPTS $OPTS" + echo "INFO: S2RAM_OPTS from HAL quirks: '$S2RAM_OPTS'." } +# this function tries to assemble the best s2ram options from various sources, falling back +# to other methods... +get_s2ram_opts() +{ + # if S2RAM_OPTS is set - then use it. The user told us so. Obey his wish. + if [ -n "$S2RAM_OPTS" ]; then + echo "INFO: using user-supplied options: S2RAM_OPTS='$S2RAM_OPTS' for suspending." + return + fi + + # ... try to use s2ram as a source + if [ "$S2RAM_QUIRKS_SOURCE" = "s2ram" ]; then + if /usr/sbin/s2ram -n >/dev/null; then + echo "INFO: using s2ram built-in database, machine is supported." + return + else + echo "WARN: S2RAM_QUIRKS_SOURCE=s2ram, but machine is unknown, continuing..." + fi + fi + + # ... if is not known or not set as a source, use the built-in database + echo "INFO: using built-in quirks database from HAL." + uswsusp_get_quirks + if [ -n "$S2RAM_OPTS" ]; then + S2RAM_OPTS="--force "$S2RAM_OPTS + fi + + # ... in a case we still don't have any quirk, try s2ram for sure + if [ -z "$S2RAM_OPTS" ]; then + # ... machine could be in s2ram whitelist + if /usr/sbin/s2ram -n >/dev/null; then + echo "INFO: machine is in s2ram database, using it." + return; + else + # if we came here and S2RAM_OPTS is empty, suspend won't work :-( + echo "WARNING: smart uswsusp did not found any appropriate option, suspend probably don't work" + fi + fi + +} + + # Since we disabled 99video, we also need to handle displaying # help info for the quirks we handle. uswsusp_help() @@ -70,8 +115,8 @@ SUSPEND_MODULE="uswsusp" do_suspend() { - uswsusp_get_quirks - s2ram --force $OPTS + get_s2ram_opts + s2ram $S2RAM_OPTS } if [ "$METHOD" = "suspend" ]; then add_before_hooks uswsusp_hooks @@ -87,7 +132,11 @@ HIBERNATE_MODULE="uswsusp" do_hibernate() { - s2disk + if [ -z "${S2DISK_CONF}" ]; then + s2disk + else + s2disk --config $S2DISK_CONF + fi } fi @@ -98,8 +147,12 @@ SUSPEND_HYBRID_MODULE="uswsusp" do_suspend_hybrid() { - uswsusp_get_quirks - s2both --force $OPTS + get_s2ram_opts + if [ -z "${S2DISK_CONF}" ]; then + s2both --force $S2RAM_OPTS + else + s2both --config $S2DISK_CONF $S2RAM_OPTS + fi } if [ "$METHOD" = "suspend_hybrid" ]; then add_before_hooks uswsusp_hooks ++++++ pm-utils-1.3.0-upower.patch ++++++ >From e8d0b58a9df080f021d04b4c2d358003974092f3 Mon Sep 17 00:00:00 2001 From: Michal Schmidt <mschmidt(a)redhat.com> Date: Tue, 23 Feb 2010 13:57:05 +0000 Subject: on_ac_power: support UPower (new name for DeviceKit-power) DeviceKit-power got renamed to UPower and its D-Bus interface changed accordingly. Try UPower first in on_ac_power. If it fails, try DeviceKit-power. It if fails too, try hal. Also update documentation. Signed-off-by: Michael Biebl <mbiebl(a)gmail.com> --- diff --git a/man/pm-action.xml b/man/pm-action.xml index ccb4153..6e9f639 100644 --- a/man/pm-action.xml +++ b/man/pm-action.xml @@ -104,7 +104,7 @@ For some options external programs are needed. </para> <para> - These commands will usually be called by <command>DeviceKit-power</command> + These commands will usually be called by <command>UPower</command> or <command>hald</command> when triggered to do so by a program in a desktop session such as <command>gnome-power-manager</command>. Calling them from the command line is also possible, but it is not diff --git a/man/pm-is-supported.xml b/man/pm-is-supported.xml index 88bb9fd..d07c87d 100644 --- a/man/pm-is-supported.xml +++ b/man/pm-is-supported.xml @@ -89,7 +89,7 @@ <para> The intended purpose of <command>&dhpackage;</command> is to find out which power management modes are supported by the - system. hald(8) will call it to do just that. (Note that DeviceKit-power + system. hald(8) will call it to do just that. (Note that UPower does not use this.) </para> </refsect1> @@ -161,10 +161,6 @@  <para> <citerefentry> - <refentrytitle>DeviceKit-power</refentrytitle> - <manvolnum>7</manvolnum> - </citerefentry>, - <citerefentry> <refentrytitle>hald</refentrytitle> <manvolnum>8</manvolnum> </citerefentry>, @@ -175,6 +171,10 @@ <citerefentry> <refentrytitle>s2both</refentrytitle> <manvolnum>8</manvolnum> + </citerefentry>, + <citerefentry> + <refentrytitle>UPower</refentrytitle> + <manvolnum>7</manvolnum> </citerefentry> </para> </refsect1> diff --git a/src/on_ac_power b/src/on_ac_power index fdbcb36..1f9c59e 100755 --- a/src/on_ac_power +++ b/src/on_ac_power @@ -30,7 +30,17 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# prefer DeviceKit-power if available +# prefer UPower if available +if s="$(dbus-send --system --print-reply \ + --dest=org.freedesktop.UPower \ + /org/freedesktop/UPower \ + org.freedesktop.DBus.Properties.Get \ + string:org.freedesktop.UPower string:OnBattery)"; then + echo "$s" | grep -q 'boolean false' + exit $? +fi + +# try its old name 'DeviceKit-power' too if s="$(dbus-send --system --print-reply \ --dest=org.freedesktop.DeviceKit.Power \ /org/freedesktop/DeviceKit/Power \ -- cgit v0.8.3-6-g21f6 ++++++ pm-utils-1.2.6.1.tar.bz2 -> pm-utils-1.3.0.tar.bz2 ++++++ ++++ 3075 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

1 0