debian/0000755000000000000000000000000012302755332007170 5ustar debian/psychtoolbox-3-lib.links.in0000644000000000000000000000000012260413325014262 0ustar debian/psychtoolbox-3-lib.dirs0000644000000000000000000000002712260413325013507 0ustar usr/lib/psychtoolbox-3 debian/docs0000644000000000000000000000004012260413325010031 0ustar debian/TODO.org debian/upstream debian/psychtoolbox-3-common.dirs0000644000000000000000000000003112260413325014224 0ustar usr/share/psychtoolbox-3 debian/copyright0000644000000000000000000002404312260413325011122 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Psychtoolbox-3 Upstream-Contact: Mario Kleiner Source: http://psychtoolbox-3.googlecode.com/svn Files: * Copyright: 1996-2007, David Brainard 1996-2007, Denis Pelli 1996-2007, Allen Ingling 2005-2013, Mario Kleiner License: Expat Files: Psychtoolbox/PsychRadiometric/PsychISO2007MPE Copyright: 2013, David Brainard License: Expat Files: PsychSourceGL/Source/Common/PsychCV/OpenEyesCVEyeTracker/cvEyeTracker.cc PsychSourceGL/Source/Common/PsychCV/OpenEyesCVEyeTracker/r* Copyright: 2004-2006, Dongheng Li 2004-2006, Derrick Parkhurst 2004-2006, Jason Babcock 2004-2006, David Winfield License: GPL-2+ Files: PsychSourceGL/Source/Common/PsychCV/OpenEyesCVEyeTracker/svd.* Copyright: 2003, Division of Imaging Science and Biomedical Engineering, University of Manchester, UK License: BSD-3 Files: PsychSourceGL/Cohorts/FTGLTextRenderer/OGLFT.* Copyright: 2002, lignum Computing, Inc. 2008, Allen Barnett License: LGPL-2+ Files: PsychSourceGL/Cohorts/PortAudio/pa_* PsychSourceGL/Source/Common/PsychPortAudio/pa_* PsychSourceGL/Source/Common/PsychPortAudio/portaudio.h Copyright: 1999-2006 Ross Bencina, Phil Burk 1999-2000 Robert Marsanyi 1999-2004 Andrew Baldwin 2002 Joshua Haberman 2003 Fred Gleason 2004 Stefan Westerfeld 2004-2006 Arve Knudsen 2005-2006 Ludwig Schwardt 2006 David Viens License: Expat customized Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: . The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. . THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. . The text above constitutes the entire PortAudio license; however, the PortAudio community also makes the following non-binding requests: . Any person wishing to distribute modifications to the Software is requested to send the modifications to the original developer so that they can be incorporated into the canonical version. It is also requested that these non-binding requests be included along with the license above. Comment: PTB-3 requires patched version of portaudio. Patches are yet to be adopted and verified for compatibility with current head of portaudio for submission upstream. Files: PsychSourceGL/Source/Common/PsychHID/PsychHIDKbQueueCreate.c Copyright: 2001-2008, Jens Ayton License: Expat Comment: Origin for embedded copy: https://github.com/Ahruman/KeyNaming Files: Psychtoolbox/PsychOpenGL/MOGL Copyright: 2006, Richard F. Murray 2006-2010, Mario Kleiner License: Expat Files: Psychtoolbox/PsychOpenGL/MOGL/source/headers/glext_edit.h Copyright: 2007-2012 The Khronos Group Inc. License: Expat Files: Psychtoolbox/PsychDemos/OpenGL4MatlabDemos/GLSLDemoShaders Copyright: 2002-2006 3Dlabs Inc. Ltd License: BSD-3 Files: Psychtoolbox/PsychDemos/SoundFiles Copyright: 1999-2007 OpenAl Authors License: LGPL-2+ Comment: Origin: http://www.openal.org Files: Psychtoolbox/PsychContributed/ple.m Copyright: 2006, The MathWorks, Inc. 2006, Mario Kleiner License: BSD-3 Comment: Origin for the source: http://www.mathworks.com/matlabcentral/fileexchange/9525 Files: Psychtoolbox/PsychContributed/read_rle_rgbe.m Copyright: Lawrence A. Taplin License: Expat Comment: Based loosely on the c-code RGBE implementation written by Bruce Walters http://www.graphics.cornell.edu/~bjw/rgbe.html made available under following "license terms": /* THIS CODE CARRIES NO GUARANTEE OF USABILITY OR FITNESS FOR ANY PURPOSE. * WHILE THE AUTHORS HAVE TRIED TO ENSURE THE PROGRAM WORKS CORRECTLY, * IT IS STRICTLY USE AT YOUR OWN RISK. */ Files: Psychtoolbox/PsychHardware/DatapixxToolbox Copyright: 2009, VPixx Technologies http://www.vpixx.com 2009-2010, Mario Kleiner License: GPL-2+ Files: Psychtoolbox/PsychHardware/iViewXToolbox/tcp_udp_ip Copyright: 1998-2003, Peter Rydesäter et al License: GPL-2+ Files: debian/* Copyright: 2010-2013, Yaroslav Halchenko License: Expat License: Expat Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: . The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. . THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. License: GPL-2+ 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, see . . On Debian systems, the complete text of the GNU General Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'. License: LGPL-2+ On Debian systems, the complete text of the GNU Lesser General Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2". License: BSD-3 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: . * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. * Neither the name of the University of Manchester nor the names of any contributors may be used to endorse or promote products derived from this software without specific prior written permission. . THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. License: SGI Free Software License B, Version 1.1 License Applicability. Except to the extent portions of this file are made subject to an alternative license as permitted in the SGI Free Software License B, Version 1.1 (the "License"), the contents of this file are subject only to the provisions of the License. You may not use this file except in compliance with the License. You may obtain a copy of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: . http://oss.sgi.com/projects/FreeB . Note that, as provided in the License, the Software is distributed on an "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. . Original Code. The Original Code is: OpenGL Sample Implementation, Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. Copyright in any portions created by third parties is as indicated elsewhere herein. All Rights Reserved. . Additional Notice Provisions: This software was created using the OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has not been independently verified as being compliant with the OpenGL(R) version 1.2.1 Specification. debian/changelog.upstream0000644000000000000000000016260112260413325012703 0ustar commit 33137e5d18e0e9e2eff174fe7b15d28d618d447a Merge: 57deff9 ef3a282 Author: Mario Kleiner Date: Sat Jul 13 00:18:40 2013 -0700 Merge pull request #155 from Psychtoolbox-3/master PTB BETA RELEASE "Blue skies and empty brains" - SP1 Fix broken 64-Bit Windows support. commit ef3a28287cafcd83facf88ccb95a1d300113e15b Merge: abe3ec8 181c2e0 Author: Mario Kleiner Date: Sat Jul 13 00:16:55 2013 -0700 Merge pull request #154 from kleinerm/master PTB BETA RELEASE "Blue skies and empty brains" - SP1 Fix broken 64-Bit Windows support. commit 91e967595a0fb4f573e2b7b1248e3d421fdd599e Merge: 90f15cf e49ca02 Author: David Brainard Date: Thu Jul 11 21:33:50 2013 -0400 Merge branch 'master' of https://github.com/Psychtoolbox-3/Psychtoolbox-3 commit 7fa70c96965fad10de7fc3f5bc46f7cae21209a4 Merge: 56c8e8b e49ca02 Author: Mario Kleiner Date: Thu Jul 11 10:56:18 2013 -0700 Merge pull request #36 from Psychtoolbox-3/master Pull to resync with PTB 3.0.11 master aka "Blue skies and empty brains". commit 57deff9937e0cd9c38df8fd0998eed9fd9e8106c Merge: aa7e65d e49ca02 Author: Mario Kleiner Date: Thu Jul 11 10:33:48 2013 -0700 Merge pull request #152 from Psychtoolbox-3/master PTB BETA RELEASE "Blue skies and empty brains" Start of the 3.0.11 series: * Removal of support for 32-Bit OSX and OSX 10.4/10.5. * GStreamer robustness and functionality improvements, esp. on OSX and Windows with Gstreamer SDK. * Workarounds for Matlab's broken Java AWT memory leaks. * Linux video refresh calibration precision improvement on FOSS drivers by fixing some mishandled corner case. * Compile fix for gcc-4.8 + Octave, as found by Debian project. * Eyelink and Snd() fixes by Andreas Widmann. * SphereProjectionShader corner-case fix by Ingmar Schneider. * Minor other tweaks and fixes. commit e49ca0230be3a7e716ef3cecb2ef1722c8b00a51 Merge: 898216a 56c8e8b Author: Mario Kleiner Date: Thu Jul 11 10:26:54 2013 -0700 Merge pull request #151 from kleinerm/master PTB BETA RELEASE "Blue skies and empty brains" * Removal of support for 32-Bit OSX and OSX 10.4/10.5. * GStreamer robustness and functionality improvements, esp. on OSX and Windows with Gstreamer SDK. * Workarounds for Matlab's broken Java AWT memory leaks. * Linux video refresh calibration precision improvement on FOSS drivers by fixing some mishandled corner case. * Compile fix for gcc-4.8 + Octave, as found by Debian project. * Eyelink and Snd() fixes by Andreas Widmann. * SphereProjectionShader corner-case fix by Ingmar Schneider. commit 530bc408f0c9fac05252fc46f4726178a2682583 Merge: 81d7a4d 8ad3303 Author: Mario Kleiner Date: Wed Jul 10 13:26:41 2013 -0700 Merge pull request #34 from widmann/feedbackbeep Add option to disable feedback beep commit 81d7a4db6ab7207bdda0d37419f9a4c79539262c Merge: 2d88e00 a198be6 Author: Mario Kleiner Date: Wed Jul 10 13:03:05 2013 -0700 Merge pull request #33 from widmann/keycode Check for keycode vectors in el structure commit 2d88e00c66df21645bccf7b732db63705346527a Merge: f5780ca 7d34a95 Author: Mario Kleiner Date: Wed Jul 10 12:44:59 2013 -0700 Merge pull request #35 from widmann/heuristicfilter Disable hardcoded setting of heuristic filter in old code path commit aa7e65ddf4b9c6f160a8cc5f68ada87cd8d1fdad Merge: 8d2a589 e69c68a Author: Mario Kleiner Date: Tue Jul 2 20:25:26 2013 -0700 Merge pull request #150 from Psychtoolbox-3/master PTB BETA RELEASE "Rainbows, Droids & Compute Hippies!" SP12 Make drawtext plugin on Linux and OSX more robust against weird fonts (non 8bpp fonts). Improve window focus handling for GUI windows on Linux. Don't steal window focus. Enable camerabin2 video capture and recording with GStreamer SDK. Enabe movie writing with GStreamer SDK 2013.6. Enable delay loading of GStreamer SDK dll's on 64-Bit Matlab on Windows to make installation optional. Fix regression in BubbleDemo. Allow sending arbitrary data types in NetStation(). Performance improvements for DaqAInScan et al. Fix GLU toolkit NURBS functions regression, so they can be actually used. Movie demo cleanups for pure GStreamer operation and no more Quicktime. Improvements to radiometric functions by David Brainard. commit e69c68ae70d4f96afa0b6c023352c94d189d4026 Merge: 29d520f f49c0b0 Author: Mario Kleiner Date: Tue Jul 2 20:20:30 2013 -0700 Merge pull request #149 from kleinerm/master PTB BETA RELEASE "Rainbows, Droids & Compute Hippies!" SP12 Make drawtext plugin on Linux and OSX more robust against weird fonts (non 8bpp fonts). Improve window focus handling for GUI windows on Linux. Don't steal window focus. Enable camerabin2 video capture and recording with GStreamer SDK. Enabe movie writing with GStreamer SDK 2013.6. Enable delay loading of GStreamer SDK dll's on 64-Bit Matlab on Windows to make installation optional. Fix regression in BubbleDemo. Allow sending arbitrary data types in NetStation(). Performance improvements for DaqAInScan et al. Fix GLU toolkit NURBS functions regression, so they can be actually used. commit f49c0b0ade5909c64c2848ebb9583c582d7c50bd Merge: c137c06 cd1bc2e Author: Mario Kleiner Date: Tue Jul 2 10:52:55 2013 -0700 Merge pull request #32 from db87/master USB-1208FS excessive memory usage fix commit 8d2a589f7eb11f0e17dd44e462ad706f58344a2c Merge: 684b5d8 0da43f6 Author: Mario Kleiner Date: Mon Jun 17 09:16:52 2013 -0700 Merge pull request #147 from Psychtoolbox-3/master PTB BETA RELEASE "Rainbows, Droids & Compute Hippies!" SP11 * DrawFormattedText: Add sx = 'right' option for right justified text. * Fix regression in DrawFormattedTextDemo which makes it fail on Matlab. commit 0da43f6a144c78a150032724ed4aee49acf1971e Merge: f38edf8 cdb9a0d Author: Mario Kleiner Date: Mon Jun 17 09:15:37 2013 -0700 Merge pull request #146 from kleinerm/master PTB BETA RELEASE "Rainbows, Droids & Compute Hippies!" SP11 * DrawFormattedText: Add sx = 'right' option for right justified text. * Fix regression in DrawFormattedTextDemo which makes it fail on Matlab. commit 66ff9d8b6aa920d429f2ba4f2e93516ecd25d169 Merge: 4c54d56 b9140b1 Author: Mario Kleiner Date: Fri Jun 14 07:10:31 2013 -0700 Merge pull request #29 from kotowicz/master added 'do not use unity' message to PsychtoolboxPostInstallRoutine.m file commit 684b5d86a4961a3766a64f47d4271b2703cd840b Merge: a3168d4 f38edf8 Author: Mario Kleiner Date: Wed Jun 12 12:56:44 2013 -0700 Merge pull request #144 from Psychtoolbox-3/master PTB BETA RELEASE "Rainbows, Droids & Compute Hippies!" SP10 * Fix DaqAIn() which contained race-conditions that could lead to failure on fast machines. * Fix MSAA 3d rendering with imaging pipeline on old GPU's by adding a fallback path for older gpu's, e.g., on OSX 10.5.8 - Only fix Screen() for 32-Bit Matlab on OSX for now. * Improvements to svn path removal by Ben Heasley and David Brainard. * Improvements to color calibration routines by David Brainard. commit f38edf84a0a205666a3aecac512e6831d466398e Merge: 98a5e78 4c54d56 Author: Mario Kleiner Date: Wed Jun 12 12:52:30 2013 -0700 Merge pull request #143 from kleinerm/master PTB BETA RELEASE "Rainbows, Droids & Compute Hippies!" SP10 * Fix DaqAIn() which contained race-conditions. * Fix MSAA rendering with imaging pipeline on old GPU's - for 32-Bit Matlab on OSX. commit 4c54d5693434185145f0f021b115b8980ad27082 Merge: f9ea59e 5aa6627 Author: Mario Kleiner Date: Fri Jun 7 08:19:08 2013 -0700 Merge pull request #28 from Psychtoolbox-3/master Resync with current master of official Psychtoolbox-3 repo. commit a3168d4b15fdb0b81b090913b6f1cab742ef9384 Merge: dbe4cf7 1f9ae98 Author: Mario Kleiner Date: Wed May 22 00:08:49 2013 -0700 Merge pull request #140 from Psychtoolbox-3/master PTB BETA RELEASE "Rainbows, Droids & Compute Hippies!" SP9 Fix regression in imaging pipeline + multisample depth renderbuffer setup. commit 1f9ae98706b6951ea9c15cade9da5609fc710f6b Merge: 3b44b33 9b362b5 Author: Mario Kleiner Date: Wed May 22 00:07:25 2013 -0700 Merge pull request #139 from kleinerm/master PTB BETA RELEASE "Rainbows, Droids & Compute Hippies!" SP9 Fix regression in imaging pipeline + multisample depth renderbuffer setup. commit 3b44b338678d8f886a2034f7196e8153c9c90fda Merge: cb6e6d1 dbe4cf7 Author: Mario Kleiner Date: Mon May 20 02:53:12 2013 -0700 Merge pull request #132 from Psychtoolbox-3/beta Merge pull request #131 from Psychtoolbox-3/master Resync with 3.0.10 final beta update. commit dbe4cf7f5a13daa4371bc31e1d61ded91e63de42 Merge: 637dc8b cb6e6d1 Author: Mario Kleiner Date: Mon May 20 02:35:43 2013 -0700 Merge pull request #131 from Psychtoolbox-3/master PTB BETA RELEASE "Rainbows, Droids & Compute Hippies!" SP8 - Final. Final 3.0.10 series release update: * Reduce verbosity of PsychHID's libusb debug output to "silence" on Linux by default. * Add proper psychtoolbox udev rules for MCC DAQ operations on Linux without root. * Verify Daq toolbox works mostly with MCC USB-DAQ 1408FS, disable obsolete warnings. * Try to make DaqAInScan work with 1408FS on 64-Bit OSX -- unsuccesfull. * Small fixes & improvements to Daq toolbox. * Screen for 32-Bit Matlab on OSX final recompile to sync up with beta. This is the branch point for the 3.0.10 branch. commit cb6e6d177c5818d90290af5343cef2d53dcd486b Merge: f1f4022 f409a34 Author: Mario Kleiner Date: Mon May 20 02:32:02 2013 -0700 Merge pull request #130 from kleinerm/master PTB BETA RELEASE "Rainbows, Droids & Compute Hippies!" SP8 * Reduce verbosity of PsychHID's libusb debug output to "silence" on Linux by default. * Add proper psychtoolbox udev rules for MCC DAQ operations on Linux without root. * Verify Daq toolbox works mostly with MCC USB-DAQ 1408FS, disable obsolete warnings. * Try to make DaqAInScan work with 1408FS on 64-Bit OSX -- unsuccesfull. * Small fixes & improvements to Daq toolbox. * Screen for 32-Bit Matlab on OSX final recompile to sync up with beta. commit f1f402289aba104f7ba308daec68b39b97f6106f Merge: 1bcc167 637dc8b Author: Mario Kleiner Date: Tue May 14 19:04:11 2013 -0700 Merge pull request #128 from Psychtoolbox-3/beta Resync master with final beta for 3.0.10 series. commit 637dc8b4610678d485085f7a1f9dd99b5bc6d08f Merge: 3d95728 1bcc167 Author: Mario Kleiner Date: Tue May 14 16:15:46 2013 -0700 Merge pull request #127 from Psychtoolbox-3/master PTB BETA RELEASE "Rainbows, Droids & Compute Hippies!" SP7 * moglcore build fix for NeuroDebian et al. commit 1bcc1676dfda66b7b4afc28a828200a803523582 Merge: f3ca38f 05349a6 Author: Mario Kleiner Date: Tue May 14 16:10:51 2013 -0700 Merge pull request #126 from kleinerm/master Build fix for moglcore on NeuroDebian et al. commit 3d95728a411eff015ee89cfcca7f691819ed5318 Merge: a5c7fec f3ca38f Author: Mario Kleiner Date: Mon May 13 12:14:25 2013 -0700 Merge pull request #125 from Psychtoolbox-3/master PTB BETA RELEASE "Rainbows, Droids & Compute Hippies!" SP6 * A fix provided by zacklb for a regression introduced in new Java setup code. commit f3ca38ffd858139f70640a449fa0a61c29e11abe Merge: 8fc4548 a44688d Author: Mario Kleiner Date: Mon May 13 12:12:19 2013 -0700 Merge pull request #124 from kleinerm/master Pull for PTB BETA RELEASE "Rainbows, Droids & Compute Hippies!" SP6 commit a44688d10964a8bad4a4067c907d2dbdb5dac32b Merge: 88062b4 be6852b Author: Mario Kleiner Date: Mon May 13 12:11:06 2013 -0700 Merge pull request #27 from zacklb/psychjavatrouble-patch Make classpath text file if it doesn't exist commit a5c7fecc5494579b653b821d3a29f4b06b06a5a2 Merge: 235cfbb 8fc4548 Author: Mario Kleiner Date: Sun May 12 23:44:22 2013 -0700 Merge pull request #123 from Psychtoolbox-3/master PTB BETA RELEASE "Rainbows, Droids & Compute Hippies!" SP5 * Fix octave short-circuit operator warnings by fixing all M-Files. * Factor out Java classpath Matlab setup into one function. * Update a few Datapixx mex files. * Fix a PR-705 toolbox bug (zacklb). * Tiny other stuff. commit 8fc454862955b16d71692f36f9729c869d3825c2 Merge: af41803 88062b4 Author: Mario Kleiner Date: Sun May 12 23:41:51 2013 -0700 Merge pull request #122 from kleinerm/master Pull for PTB BETA RELEASE "Rainbows, Droids & Compute Hippies!" SP5 * Fix octave short-circuit operator warnings by fixing all M-Files. * Factor out Java classpath Matlab setup into one function. * Update a few Datapixx mex files. * Fix a PR-705 toolbox bug (zacklb). * Tiny other stuff. commit 16810d4f4d021687a489d13e1a4ec35f020548e7 Merge: 786f551 84522b7 Author: Mario Kleiner Date: Sun May 12 11:27:22 2013 -0700 Merge pull request #26 from zacklb/pr705-bugfix Make sure the output of `textscan` is type double commit c9aedfcaebe49a1bb00e5dc1514f1ed67a869f4e Merge: 56335e0 af41803 Author: Mario Kleiner Date: Tue May 7 23:40:52 2013 -0700 Merge pull request #25 from Psychtoolbox-3/master Resync with current master of official Psychtoolbox-3 repo. commit 235cfbb779ab18704c5c036e4465289c67e686f9 Merge: e1496e4 af41803 Author: Mario Kleiner Date: Tue May 7 23:37:16 2013 -0700 Merge pull request #120 from Psychtoolbox-3/master PTB BETA RELEASE "Rainbows, Droids & Compute Hippies!" SP4 Small fixes and improvements to BETA: * DAQ toolbox fixes. * Invisible windows for Screen. * Blue line sync stereo setup for mode 11 as well. * Installer fixes. * PR toolbox fixes. * Documentation updates. This is likely the last release for the 3.0.10 series. commit af418035c31d5270dfc68de045b8a54367901c4f Merge: c8b9d37 56335e0 Author: Mario Kleiner Date: Tue May 7 23:30:00 2013 -0700 Merge pull request #119 from kleinerm/master DAQ toolbox fixes. commit c8b9d375433afed27615d162bded0303f8033a4f Merge: 2fb8ae8 76fef0c Author: Mario Kleiner Date: Tue May 7 18:33:40 2013 -0700 Merge pull request #118 from kleinerm/master PTB BETA RELEASE "Rainbows, Droids & Compute Hippies!" SP4 commit e1496e48f94760d30ec101c373fde0432211f7c7 Merge: f2508fd eb28bd2 Author: Mario Kleiner Date: Sat Apr 20 12:03:54 2013 -0700 Merge pull request #117 from Psychtoolbox-3/master PTB BETA RELEASE "Rainbows, Droids & Compute Hippies!" SP3 * Make java path setup in postinstall routine more robust against users doing weird things. [Fix by zacklb] commit 2dae455eb464becf6ebace1821bfd37dfd209c8e Merge: 5284bd6 eb28bd2 Author: Mario Kleiner Date: Sat Apr 20 12:02:25 2013 -0700 Merge pull request #24 from Psychtoolbox-3/master PTB BETA RELEASE "Rainbows, Droids & Compute Hippies!" SP3 * Make java path setup in postinstall routine more robust against users doing weird things. commit eb28bd2e5d5ed047cf4e3f720882de2c71ba2408 Merge: b801644 5284bd6 Author: Mario Kleiner Date: Sat Apr 20 12:00:19 2013 -0700 Merge pull request #116 from kleinerm/master Merge post-install fix for Jave setup from zacklb. commit 5284bd668d14bedc75ee9cf37f0a392a550b1081 Merge: 3c70c7b 47c489f Author: Mario Kleiner Date: Fri Apr 19 11:29:08 2013 -0700 Merge pull request #23 from zacklb/postinstall-fix Parse the java classpaths with a newline delimiter commit f2508fd7903c7fb47ae186a89a0aded4a7374d8f Merge: fa173a2 b801644 Author: Mario Kleiner Date: Thu Apr 18 19:02:13 2013 -0700 Merge pull request #115 from Psychtoolbox-3/master PTB BETA RELEASE "Rainbows, Droids & Compute Hippies!" SP2 Add improved DrawFormattedText() with ability to center text in user-provided rects. commit b8016448b3f6b16fb8889ed013aa57aa751c0320 Merge: bd2304d 3c70c7b Author: Mario Kleiner Date: Thu Apr 18 19:00:58 2013 -0700 Merge pull request #114 from kleinerm/master Pull new DrawFormattedText() improvement. commit fa173a24443251424886987805052189065840a8 Merge: 3d96522 bd2304d Author: Mario Kleiner Date: Wed Apr 17 22:06:12 2013 -0700 Merge pull request #113 from Psychtoolbox-3/master PTB BETA RELEASE "Rainbows, Droids & Compute Hippies!" SP1 * Fix PRxxx support on Linux. * Add missing 64-Bit Radeoncontrol exe on 64-Bit Linux. commit bd2304d36d7935c3432e74a22977837cb11f1de8 Merge: 237bf81 30a71a7 Author: Mario Kleiner Date: Wed Apr 17 22:04:18 2013 -0700 Merge pull request #112 from kleinerm/master PTB BETA RELEASE "Rainbows, Droids & Compute Hippies!" SP1 * Fix PRxxx support on Linux. * Fix missing 64-Bit Radeoncontrol exe on Linux. commit 85a3304ca543507870003d30c9d954e61fb189c6 Merge: 5b54b2c 237bf81 Author: Mario Kleiner Date: Tue Apr 16 21:15:22 2013 -0700 Merge pull request #22 from Psychtoolbox-3/master Resync with current master of official Psychtoolbox-3 repo. Post release of "Rainbows, Droids & Compute Hippies". commit 3d96522a7bd8b287e1fb9dd3992c3b4121d98f3f Merge: cd1face 237bf81 Author: Mario Kleiner Date: Tue Apr 16 21:00:30 2013 -0700 Merge pull request #111 from Psychtoolbox-3/master PTB BETA RELEASE "Rainbows, Droids & Compute Hippies!" * Basic GPGPU compute support via GPUmat. * Linux Nexus-7 / ARM support. * Linux experimental multi display backend support. * CRS Bits# support. * PR-705 support contributed by Zachary Lindbloom-Brown * GeForce-600 series support. * Fixes for OSX Retina and LCD timestamping brokeness and other bugs. * Various smaller fixes and improvements. commit 237bf812e4d970b68a52c821d4267b0a2fbd8b9d Merge: f72e7be 5b54b2c Author: Mario Kleiner Date: Tue Apr 16 20:51:17 2013 -0700 Merge pull request #110 from kleinerm/master Pull for "Rainbows, Droids & Compute Hippies" Basic GPGPU compute support via GPUmat. Nexus-7 / ARM support. Linux multi display backend support. Bits# support. PR-705 support. GeForce-600 series support. Fixes for OSX timestamping brokeness and other bugs. Various smaller fixes and improvements. commit 3dcc18e6ba51198c46d50be9fafa8b37e8682f18 Merge: 0c06803 4bb25a4 Author: Mario Kleiner Date: Tue Apr 9 07:12:34 2013 +0200 Merge branch 'wafflegles' of https://github.com/kleinerm/Psychtoolbox-3 This concludes the first iteration of the new Linux display backend prototype. Support for X11/GLX and X11/EGL display backends fully tested and works. Rudimentary support for GBM/EGL tested, but far from ready. Wayland/EGL ditto. Waffle works well so far, but we only build the embedded/mobile PTB with Waffle backend, not yet the desktop Linux PTB. OpenGL and OpenGL-ES1.x support works well on the embedded version, as tested with a Google Nexus-7 tablet with NVidia-Tegra-3 SoC under Ubuntu Linux 13.04 Raring Ringtail, 32-Bit ARM edition for Nexus-7. All other mex files work well on the tablet, sound, i/o etc., although most demos are not yet touch enabled. Babysteps... All mex files for all platforms have been rebuilt to rule out potential regressions. -> We would be ready for a release, minus some polishing for the GPUMat / GPGPU CUDA stuff. commit ea7d6bb741f13d42d2a2a703e8368986c2db37eb Merge: 1f62068 e2d90b8 Author: Mario Kleiner Date: Mon Apr 8 01:27:33 2013 +0200 Merge branch 'wafflegles' of https://github.com/kleinerm/Psychtoolbox-3 into wafflegles commit 0c0680324cb7bbedb76445b39602acc0cb760969 Merge: 48f02d1 7daa325 Author: Mario Kleiner Date: Tue Mar 26 22:05:28 2013 +0100 Merge branch 'master' of https://github.com/kleinerm/Psychtoolbox-3 commit a3afa145fd3e2805235b7389a4fb31e635ac36b5 Merge: 616aa2d e5d46f9 Author: Diederick C. Niehorster Date: Tue Mar 19 03:24:33 2013 -0700 Merge pull request #107 from dcnieho/master bug in Interleave function commit 49d470795fcf87b6fed07a4c0260bf992d353e56 Merge: f10d5df 616aa2d Author: Diederick C. Niehorster Date: Tue Mar 19 16:54:25 2013 +0800 Merge remote-tracking branch 'refs/remotes/upstream/master' commit 616aa2d2c188f9f864eb5d7abd260df96be68c8b Merge: d69df7a 7daa325 Author: Mario Kleiner Date: Mon Mar 18 10:16:50 2013 -0700 Merge pull request #106 from kleinerm/master Pull for small Bits# improvements, Windows fixes, cosmetic commit d69df7a0803c7c63e635b6bf9ee9070b4443b5f0 Merge: 8cdc158 2530409 Author: Mario Kleiner Date: Wed Mar 13 13:56:31 2013 -0700 Merge pull request #104 from kleinerm/master Pull for basic Bits# support. Also some OSX 10.5 64-Bit compat fixes and PR-705 photometer support. commit 834e13205573d9f1cbd6d11a9a9bdfe1bdfeda6c Merge: a788a09 8af8f51 Author: Mario Kleiner Date: Wed Mar 13 04:58:06 2013 +0100 Merge branch 'master' of https://github.com/kleinerm/Psychtoolbox-3 commit 8556f9907aaf928b2b32374e081e96f07901e04a Merge: 19daef3 92af8a7 Author: Mario Kleiner Date: Sun Mar 10 15:24:10 2013 -0700 Merge pull request #18 from zacklb/pr705 Adding a PR-705 toolbox to PTB-3 commit 19daef35330534692a8d27bfb110a4eb558e28d9 Merge: 949b143 0d68c7b Author: Mario Kleiner Date: Sun Mar 10 15:02:23 2013 -0700 Merge pull request #19 from zacklb/findserial-fix Fixing a redundancy when using a Keyspan USB-serial adapter commit 949b143af796aeeb529dd1f3a6a289835920d7d7 Merge: c07a288 8cdc158 Author: Mario Kleiner Date: Sun Mar 10 15:00:15 2013 -0700 Merge pull request #20 from Psychtoolbox-3/master Resync with current master of official Psychtoolbox-3 repo. commit 8cdc15833e90bc8ee385bc03c832025226cf65f7 Merge: e175dbf c5c687e Author: Mario Kleiner Date: Sun Mar 10 14:43:15 2013 -0700 Merge pull request #102 from simonster/2012b-input-thread Attach thread input in MATLAB 2012b commit ddd3a61a6412aa468ae745ad4eb156adee887176 Merge: 36ca0a5 d519678 Author: Mario Kleiner Date: Wed Feb 6 20:45:47 2013 -0800 Merge pull request #101 from kleinerm/master Pull development snapshot for color space and gpgpu stuff. * First batch of color space conversion stuff. * First batch of GPUmat/CUDA GPGPU stuff. * ColorCal for Octave support. * Use of thread-type parameter for GStreamers multi-threaded video decode. * Various fixes and improvements, but not compiled for all platforms. Both are unfinished wip, just for alpha-testers. commit d3ec589142c927c1ec382a942ce7fe537175c74b Merge: 5dee5d5 9236647 Author: Mario Kleiner Date: Fri Feb 1 18:24:24 2013 +0100 Merge branch 'master' of https://github.com/kleinerm/Psychtoolbox-3 commit 923664726d86f2792edc52bb18210a360b314c6d Merge: 1b465ef 36ca0a5 Author: Mario Kleiner Date: Fri Feb 1 09:23:08 2013 -0800 Merge pull request #17 from Psychtoolbox-3/master Pull context sharing fix for MS-Windows into kleinerm/master. commit 36ca0a574ab1ed6f8df6c977483a8218f3a14a4e Merge: 9c339a2 20bfc21 Author: Mario Kleiner Date: Fri Feb 1 09:21:36 2013 -0800 Merge pull request #99 from simonster/texture-sharing Fix texture sharing on nVidia Windows systems: "Theory" of why it failed and now works with this patch applied: wglShareLists according to doc should reject sharing if the context which is going to share resources already contains any resources. This is not the case in our code. But the context already has sharing enabled with other new context which also don't contain any resources to share yet. So either the NVidia driver has a bug and uses a too sloppy way to detect if context sharing is allowed - implying that a context who shares resources with other contexts must already contain resources, without actually checking if this exclusion criterion is really satisfied - or the Microsoft docu is sloppily written and gives wrong sharing rules. Reordering the code like you do should "fix" both possible cases. commit d087dcfc66d8527ca2fa5bd6dad638588d042cf5 Merge: 7645d63 c1d6147 Author: Mario Kleiner Date: Tue Jan 15 11:42:31 2013 -0800 Merge pull request #15 from iandol/eyelink1 add support for devicenumber parameter in el commit cd1face3a0aec5113ff4d07363cf0da0429ff901 Merge: 8fd0153 9c339a2 Author: Mario Kleiner Date: Sun Jan 13 23:14:25 2013 -0800 Merge pull request #97 from Psychtoolbox-3/master Post-Release update "Aaron Swartz" for PTB BETA RELEASE "The fun in dysfunction" This update is dedicated to Aaron Swartz. Some improvements to M-Files: * Full panelfitter high-level setup support via PsychImaging('AddTask', 'General', 'UsePanelFitter'): Selection of common scaling/fitting modes. Fully compatible with all stereo display modes, high-precision display modes and other PsychImaging tasks. Also fully compatible with RemapMouse() now. * Cleanups to BeampositionTests by Ian A. * Robustness improvements to GStreamer-SDK detection on 64-Bit Windows. * Tiny fixes in moglmorpher() and LoadOBJFile(). * Minor tweaks to some demos. commit 9c339a2d5b35e062ab3ac1b4204ac159ec80be36 Merge: eda4438 4a12f16 Author: Mario Kleiner Date: Sun Jan 13 23:07:01 2013 -0800 Merge pull request #96 from kleinerm/master Post-Release update for PTB BETA RELEASE "The fun in dysfunction" commit f5399913e66ab40a96842501bc2d2eacffcca199 Merge: 28d1555 f8a32b6 Author: Mario Kleiner Date: Mon Jan 14 05:23:06 2013 +0100 Merge branch 'master' of https://github.com/kleinerm/Psychtoolbox-3 commit f8a32b6977071d961142e0ccc6a8f769ccab6829 Merge: 38890cb 53948e5 Author: Mario Kleiner Date: Sun Jan 13 20:22:49 2013 -0800 Merge pull request #13 from iandol/patch-1 Update Psychtoolbox/PsychTests/BeampositionTest.m Beautify it. commit 8fd0153bac8e8bc07001ecdbd7452cd4bc88f897 Merge: 4a2a23c c0aa158 Author: Mario Kleiner Date: Mon Jan 7 18:27:40 2013 -0800 Merge pull request #95 from Psychtoolbox-3/master Post-Release fix for BETA: OSX support for NVidia GeForce 600 Kepler gpu's. * On OSX by updating the PsychtoolboxKernelDriver for 64-Bit kernels. * Also enable experimental support for 4 display heads on Kepler gpus. * Small fixes to PsychDataPixx and panel scaler support for side-by-side stereo. commit c0aa158930105cd6ea490697eae5d1a585a5b78a Merge: de61194 2a875f1 Author: Mario Kleiner Date: Mon Jan 7 18:25:37 2013 -0800 Merge pull request #94 from kleinerm/master Pull: Add support for NV-E0 GeForce-600 series "Kepler" gpu's. commit 4a2a23cdad146a2645215b710494363d50dc27a6 Merge: 89ac3a0 de61194 Author: Mario Kleiner Date: Sun Jan 6 12:19:17 2013 -0800 Merge pull request #93 from Psychtoolbox-3/master Post-Release fix for BETA: Pull fix for OSX on Apple MacBookPro with Retina display. commit de61194601da9d97ce179c4edba000d8987aaf0f Merge: e5c73d3 6555342 Author: Mario Kleiner Date: Sun Jan 6 12:17:07 2013 -0800 Merge pull request #92 from kleinerm/master Pull fix for OSX on Apple MacBookPro with Retina display. commit e5c73d3f33eb0c98b154b27dce504a8d445098ea Merge: b215c88 564e4b3 Author: Mario Kleiner Date: Fri Jan 4 12:35:56 2013 -0800 Merge pull request #11 from Psychtoolbox-3/master Resync with PTB BETA RELEASE "The fun in dysfunction" Up to date as of 4-January-2013. commit 564e4b3c63ea4f5dfd485d723a768459fb47bbe9 Merge: 2db4992 89ac3a0 Author: Mario Kleiner Date: Fri Jan 4 12:29:38 2013 -0800 Merge pull request #91 from Psychtoolbox-3/beta Resync to "The fun in dysfunction" commit 89ac3a065cf2d29f6bdc9ee8e90f81e022c710b7 Merge: 9b5c690 2db4992 Author: Mario Kleiner Date: Fri Jan 4 12:12:41 2013 -0800 Merge pull request #90 from Psychtoolbox-3/master PTB BETA RELEASE "The fun in dysfunction" Support for GStreamer camerabin2 video capture & recording. Support for builtin imaging pipeline panel fitter. Improved Linux support for timestamping, graphics problem detection and desktop compositor handling. Improved support for handling of MS-Windows-8 dektop compositor handling. Bugfixes / Workarounds for various Windows and OSX operating system bugs. Fixes to PsychKinectCore and PsychHID. Various other fixes for small documentation and PTB bugs. Potential multi-threaded decoding improvements for GStreamer movie playback. More fixes and workarounds for handling of slightly broken Intel-DDX graphics drivers on Linux (pre 2.20.16 series). HDMI side-by-side horizontally compressed frame packing format support for stereo displays. Datapixx and Eyelink improvements. CRS OptiCal support. Other stuff i can't remember. commit 2db49924d7d34907755625904b07708c43bbf087 Merge: e78851d b215c88 Author: Mario Kleiner Date: Wed Jan 2 18:26:02 2013 -0800 Merge pull request #89 from kleinerm/master Main pull for "The fun in dysfunction" This is the main pull-request for "The fun in dysfunction", bringing in almost everything (minus potential last minute bits & bytes here and there): Support for GStreamer camerabin2 video capture & recording. Support for builtin imaging pipeline panel fitter. Improved Linux support for timestamping, graphics problem detection and desktop compositor handling. Improved support for handling of MS-Windows-8 dektop compositor handling. Bugfixes / Workarounds for various Windows and OSX operating system bugs. Fixes to PsychKinectCore and PsychHID. Various other fixes for small documentation and PTB bugs. Potential multi-threaded decoding improvements for GStreamer movie playback. More fixes and workarounds for handling of slightly broken Intel-DDX graphics drivers on Linux (pre 2.20.16 series). HDMI side-by-side horizontally compressed frame packing format support for stereo displays. Datapixx and Eyelink improvements. CRS OptiCal support. Other stuff i can't remember. commit e173f45633782bcba08f506ff7ccb36403236b9f Merge: c18bf7e de73188 Author: Mario Kleiner Date: Mon Dec 31 17:11:58 2012 +0100 Merge branch 'master' of https://github.com/kleinerm/Psychtoolbox-3 commit 3fbc6689d0b9b6c50ebecb04b23fd37f699ebc8b Merge: 8a58110 b309900 Author: Mario Kleiner Date: Sun Dec 23 02:04:55 2012 -0800 Merge pull request #9 from iandol/eyelinkfixes Eyelink toolbox: Fix a hardcoded callback function. commit 5675f6d21852ff473d9e43b65591e7030c259aad Merge: e7365d0 8766eff Author: Mario Kleiner Date: Wed Nov 28 21:35:02 2012 +0100 Merge branch 'master' of https://github.com/kleinerm/Psychtoolbox-3 commit 9b5c690196bb818107414eba2fa96f3be2170dd7 Merge: 759f023 76714f3 Author: Mario Kleiner Date: Sun Nov 11 02:29:10 2012 -0800 Merge pull request #83 from Psychtoolbox-3/master BETA RELEASE "Dancersizing, Grey & Hopeless" "Dancersizing, Grey & Hopeless" mostly fixes small bugs, improves small details and improves GetChar support on Windows Vista+, matlab -nojvm and octave. * GetChar, CharAvail, FlushEvents and ListenChar now (ab)use keyboard queue functionality on setups where use of Java based GetChar et al. is ineffective or impossible: This should enable good support for Windows Vista/7/8, matlab in -nojvm mode, and GNU/Octave in CLI and GUI mode. * Minor fixes and improvements to PsychPortAudio, Screen, IOPort, PsychGPUControl and M-Files. * CRS OptiCal support by Andreas Widmann. commit 76714f397801cfbbe326f4b7e779473c0c21e0a9 Merge: d957f9f c7d3ddc Author: Mario Kleiner Date: Sun Nov 11 02:20:20 2012 -0800 Merge pull request #82 from kleinerm/master Pull for the "Dancersizing, Grey & Hopeless" release. commit 92f6a60f10315cf4330e4d057b77e45abb6122f3 Merge: cf78d91 1594e18 Author: Mario Kleiner Date: Fri Nov 2 08:18:46 2012 +0100 Merge branch 'master' of https://github.com/kleinerm/Psychtoolbox-3 Conflicts: Psychtoolbox/PsychBasic/Octave3LinuxFiles64/PsychHID.mex commit 9ff1a9a07b115bd22197508a5e10303dd6fa1f8e Merge: f26d28f b588feb Author: Mario Kleiner Date: Tue Oct 30 06:37:06 2012 +0100 Merge branch 'master' into getcharng Conflicts: Psychtoolbox/PsychBasic/MatlabWindowsFilesR2007a/IOPort.mexw32 Psychtoolbox/PsychBasic/MatlabWindowsFilesR2007a/IOPort.mexw64 commit 759f023b86fb3632b2a7e3959d60e32c6b9df7e5 Merge: cdeaee7 d957f9f Author: Mario Kleiner Date: Mon Oct 8 18:27:55 2012 -0700 Merge pull request #80 from Psychtoolbox-3/master PTB BETA RELEASE "Death by a thousand paper cuts" Release highlights: Speak() command now supported on all operating systems, and made more flexible. Linux support by MK, MS-Windows support by Vishal Shah. Improved correctness tests and wokarounds for graphics driver bugs on Intel gpus under Linux, but also improvements to general graphics driver sync tests. Some warning clutter removed. Make Screen startup more artifact free on Intel gpus on Linux with triple-buffering enabled. Make Linux Screen() compatible to apitrace utility. Bugfixes and enhancements to Screen('Resolution') on Linux and Screen('Resolutions') on 64-Bit OSX. Enhancements to the PsychPortAudio backed Snd() legacy sound command. Some improvements to DKL color functions by David Brainard. commit d957f9f23e2ff2fcb6f07cc65217e36e9236fe3f Merge: bac8dd3 d34a5d2 Author: Mario Kleiner Date: Mon Oct 8 18:16:39 2012 -0700 Merge pull request #79 from kleinerm/master Final tiny fixes for next beta. commit bac8dd3932daf9b178dfc804fcf60f3c02dd6d8e Merge: e11bbea 1041a5c Author: Mario Kleiner Date: Sat Oct 6 21:19:48 2012 -0700 Merge pull request #78 from kleinerm/master New features and paranoia checks, mostly for Linux... commit 708a78b68676daf30bcf294ef2c2cc1996836f56 Merge: 1cbb8c8 cdeaee7 Author: Mario Kleiner Date: Tue Oct 2 17:43:26 2012 -0700 Merge pull request #76 from Psychtoolbox-3/beta Merge pull request #75 from Psychtoolbox-3/master commit cdeaee72cd65c5d82ff3853a723c09bccd3b5cf6 Merge: 0a61dd1 1cbb8c8 Author: Mario Kleiner Date: Tue Oct 2 17:42:50 2012 -0700 Merge pull request #75 from Psychtoolbox-3/master BETA UPDATE: Fix pnet for 64-Bit Matlab on Windows. commit 1cbb8c82df0d0ba0511b0210f484b784a2ef7c7f Merge: aff8c70 39e326e Author: Mario Kleiner Date: Tue Oct 2 17:40:50 2012 -0700 Merge pull request #74 from kleinerm/master pnet bugfix for 64-Bit Windows. commit aff8c704506ad099725bb4be348794c17e5b852f Merge: 6a81066 0a61dd1 Author: Mario Kleiner Date: Mon Oct 1 17:03:09 2012 -0700 Merge pull request #73 from Psychtoolbox-3/beta Merge pull request #72 from Psychtoolbox-3/master commit 0a61dd129d84e7e965a23c75d20d437ded7aac8d Merge: 5962d7b 6a81066 Author: Mario Kleiner Date: Mon Oct 1 17:02:19 2012 -0700 Merge pull request #72 from Psychtoolbox-3/master PTB BETA small update. Make Linux Screen('Framerate') more robust aganst weird drivers. Improve PsychTweak('PrepareForVirtualmachine'); Enable qtkitvideosrc plugin for OSX video capture. commit 6a8106638404952c45200cc758199e44bb26841e Merge: 6d189cf c1731ad Author: Mario Kleiner Date: Mon Oct 1 17:00:04 2012 -0700 Merge pull request #71 from kleinerm/master Bugfix for weird RandR modes on Linux returned by some drivers. commit 6d189cf07b0fe93a49b6f37417c6c74110f375f7 Merge: dd5820b 5962d7b Author: Mario Kleiner Date: Fri Sep 28 11:21:30 2012 -0700 Merge pull request #67 from Psychtoolbox-3/beta Merge pull request #66 from Psychtoolbox-3/master commit 5962d7b5c3a640280a7ddfb24b0a40fa1daef88b Merge: 6a4d05e dd5820b Author: Mario Kleiner Date: Fri Sep 28 11:19:54 2012 -0700 Merge pull request #66 from Psychtoolbox-3/master BETA UPDATE: Fix HideCursor on f$#$@#% MS-Windows. commit dd5820b48ff1f71f51b15b6d580405521e4dbca9 Merge: 9e0d204 18ea261 Author: Mario Kleiner Date: Fri Sep 28 11:18:02 2012 -0700 Merge pull request #65 from kleinerm/master Fix HideCursor() on some Windows setups. commit 6a4d05e3ed8013b20fd3c4face286656e1adf7b7 Merge: fde2c3f 9e0d204 Author: Mario Kleiner Date: Wed Sep 26 17:06:05 2012 -0700 Merge pull request #64 from Psychtoolbox-3/master BETA UPDATE: Compatibility fixes for Matlab, GStreamer on OSX and for OSX HID bugs. OSX Screen's relinked against GStreamer SDK universal runtime binaries 2012.9 to restore compatibility. PsychHID error handling for Apple and 3rd party driver brokeness improved. Matlab compatibility fix by David Brainard for PsychColorimetric/LjgToXYZ. Minor cleanups in demos. commit 9e0d204bbf0fc6103a6f2ef1dc2a22fd0ddfc2ac Merge: 8464d5e 4b143c9 Author: Mario Kleiner Date: Wed Sep 26 17:00:09 2012 -0700 Merge pull request #63 from kleinerm/master Fixes for latest OSX GStreamer SDK 2012.9 and OSX HID bugs. commit f10d5df4c0d5634ba8bb773e0f5045df6cd5a3a6 Merge: 50feeec 8464d5e Author: Diederick C. Niehorster Date: Tue Sep 25 14:47:17 2012 +0800 Merge remote-tracking branch 'upstream/master' commit 50feeec447987c120a28c90df91f943304a8cc12 Merge: 3a0a760 361f146 Author: Diederick C. Niehorster Date: Tue Sep 18 10:45:30 2012 +0800 Merge remote-tracking branch 'upstream/master' commit fde2c3f5e00dabd27fc83356659f8099c78c585f Merge: 98fda1f 361f146 Author: Mario Kleiner Date: Mon Sep 17 11:44:02 2012 -0700 Merge pull request #61 from Psychtoolbox-3/master "Broken Windows" release: Post-Release bugfix for NVidia gpu driver bug. commit 361f146b11cb748a587bc8c397db37af30c14160 Merge: f13cb53 5df1ea3 Author: Mario Kleiner Date: Mon Sep 17 11:41:38 2012 -0700 Merge pull request #60 from kleinerm/master Bugfix for NVidia gpu driver bug. commit 5826d8c8cf1b8394c676b375966b6d344441d096 Merge: 74a42ff f13cb53 Author: Mario Kleiner Date: Sun Sep 16 17:21:53 2012 -0700 Merge pull request #7 from Psychtoolbox-3/master Merge state of Psychtoolbox-3 master after the "Broken Windows" beta release. commit f13cb53d894193272b241a99120f0be867e780aa Merge: 7e56052 98fda1f Author: Mario Kleiner Date: Sun Sep 16 17:19:44 2012 -0700 Merge pull request #58 from Psychtoolbox-3/beta Merge pull request #57 from Psychtoolbox-3/master commit 98fda1fd22bcbde64b987eababe7422f6007cf26 Merge: 92809a3 c365727 Author: Mario Kleiner Date: Sat Sep 15 01:08:42 2012 -0700 Merge pull request #57 from Psychtoolbox-3/master PTB BETA RELEASE "Broken Windows" This is PTB BETA "Broken Windows" Highlights: 64-Bit Matlab support for Microsoft Windows added. 32-Bit Octave support for OSX removed, 64-Bit Octave 3.6 support for OSX added. Octave support for Windows removed. Quicktime support for Windows removed. GStreamer support for 32-Bit Matlab on OSX added. Massive movie playback performance and functionality improvements for GStreamer based movie playback engine. Some perf. improvements for videocapture engine, and basic GeniCam/GigE video capture support. Support for GL_TEXTURE_2D textures as rendertargets (e.g., Offscreen windows and 'TransformTexture' etc.) -- For improved OpenGL interop with 3rd party OpenGL code. Non-power-of-two texture support. Mipmap filtering support and demos for efficient blurring via gpu accelerated resolution pyramids. Linux: Windowed window support and GUI window support brought to same level of functionality and behaviour as on OSX. Various improvements and bug fixes. PsychtoolboxKernelDriver on OSX now supports Intel IGP's as well. Hybrid graphics dual-gpu configs now supported on OSX for our low-level code. commit c3657271d3057c2f9d3ac218e0cea6715a086d98 Merge: 0024746 74a42ff Author: Mario Kleiner Date: Sat Sep 15 00:56:28 2012 -0700 Merge pull request #56 from kleinerm/master Final merge for the "Broken Windows" release. commit 0024746b50401bcfe70578228792a3cdbc2ae99e Merge: 5467b30 09b206c Author: Mario Kleiner Date: Thu Sep 13 20:03:50 2012 -0700 Merge pull request #55 from kleinerm/master Linux and Windows (almost) finalize. commit 5467b30d9c0579ee3e397021881da605b28865f6 Merge: 2ddc46c 2f16cbe Author: Mario Kleiner Date: Tue Sep 11 07:33:39 2012 -0700 Merge pull request #53 from kleinerm/master Update Datapixx support and 32-Bit Matlab support for Windows. commit 2ddc46c588eb23fb17b7f920aca78db338a02cb0 Merge: 6f9dc61 a8e08e7 Author: Mario Kleiner Date: Fri Sep 7 08:58:39 2012 -0700 Merge pull request #52 from kleinerm/master Fix Snd() - Next try. commit 6f9dc61c9d7931d6336e663543b86c15a5ab76cb Merge: 18e3157 a52e4e7 Author: Mario Kleiner Date: Thu Sep 6 10:02:55 2012 -0700 Merge pull request #51 from kleinerm/master Snd() fix, 64-Bit mex files for Octave/Matlab on OSX/Linux rebuilt. 32-Bit Matlab mex files for OSX rebuilt. Add GStreamer support to 32-Bit PTB on OSX. Transition to new build system for 32-Bit PTB: Tiger --> Leopard. commit 18e3157337caf29fe1dab4fed520ec27ad88b32d Merge: 4212c60 77862e1 Author: Mario Kleiner Date: Wed Sep 5 09:03:30 2012 -0700 Merge pull request #50 from kleinerm/master Fix some demos and functions, add 64-Bit Octave on OSX support, render to GL_TEXTURE_2D and NPOT texture support, mip-map image pyramids for blurring, various enhancements to Screen, pnet etc. commit a5d88008b07efb0e5fb3ef3f9196f2f70d5d1ba0 Merge: 0ddf3e1 e32842b Author: Mario Kleiner Date: Sun Aug 19 16:45:41 2012 -0700 Merge pull request #48 from kleinerm/master Fixes to monitor calibration. commit a2526d9b4b59e3413001844d6595f2952e0ee892 Merge: aba9f1d 98c26ef Author: Mario Kleiner Date: Sat Aug 18 11:19:27 2012 -0700 Merge pull request #47 from kleinerm/master Push current state to master for wider exposure commit 641ea08e7ac7134e4fcf1fc679abfa7c3d4ae8c9 Merge: 2a1fc95 12abed4 Author: Mario Kleiner Date: Tue Aug 7 02:08:51 2012 +0200 Merge commit '12abed4' commit 3a0a760068134a84eafbb66434acf601e946a430 Merge: 5f7ad1a aad9eb5 Author: Diederick C. Niehorster Date: Mon Jul 30 20:49:13 2012 +0800 Merge remote-tracking branch 'upstream/master' commit aad9eb5ac59354f235246be2bd3fe52adbf3ffb8 Merge: 3fa7180 2ecd234 Author: Mario Kleiner Date: Thu Jul 26 17:55:55 2012 -0700 Merge pull request #34 from towolf/docs-wikify-fixes Minor fixes to PTB-wikify script commit 3fa71809d33e0d37f724797a8bdf8a598d80737c Merge: 41eba51 c2def97 Author: Mario Kleiner Date: Thu Jul 26 17:52:25 2012 -0700 Merge pull request #43 from dcnieho/remove_legacy removing unnecessary if statement from FindSerialPort commit 41eba51b5cabd96f4b9c633d98d0ee5deba44e41 Merge: 429500c f13d4c5 Author: Mario Kleiner Date: Wed Jul 25 06:58:19 2012 -0700 Merge pull request #41 from dcnieho/remove_legacy Remove legacy commit 429500ca723e9219e6c0f7b2ae7bbcf5a1386fc8 Merge: 49e688d 63f0d48 Author: Mario Kleiner Date: Tue Jul 24 11:15:22 2012 -0700 Merge pull request #42 from kleinerm/master Various Linux multi-display fixes and other enhancements for Screen(), also on OSX. commit 5f7ad1a5b5d028c8112e8f9f2a8247b5d9ebab31 Merge: cd26691 23b05fb Author: Mario Kleiner Date: Sat Jul 21 15:50:06 2012 -0700 Merge pull request #33 from kleinerm/master Pull half-finished stuff into master so everybody is on the same plate. commit 777af64e7bbe05d75b89b29e1b3ca57c6191cd5e Merge: 4222dca 57766c0 Author: Mario Kleiner Date: Wed Jul 11 01:48:52 2012 +0200 Merge branch 'qtwinremoval' commit 1ba96107617eb23e557f22caa912f711de145c9c Merge: 736ae4a 83967bf Author: Mario Kleiner Date: Sun Jul 1 02:28:38 2012 +0200 Merge branch 'master' of https://github.com/Psychtoolbox-3/Psychtoolbox-3 commit 736ae4a8e41485aac73ea81ac440ef4a537aae49 Merge: 41d35bf 2b66162 Author: Mario Kleiner Date: Sat Jun 30 17:19:15 2012 -0700 Merge pull request #5 from kleinerm/gstreameroptimization Merge branch Gstreameroptimization into master commit 83967bfbd6a92193bdb8ffbe4829656bbec968bd Merge: d10083e 06dfd2a Author: Mario Kleiner Date: Fri Jun 29 11:37:07 2012 -0700 Merge pull request #32 from dcnieho/small_enhancements_m added unit tests, other enhancements commit d10083e7f5e96729a58a104b1ccbb03aa02d362b Merge: 388ec8a 0bcc55a Author: Mario Kleiner Date: Fri Jun 29 11:17:39 2012 -0700 Merge pull request #30 from dcnieho/changes_to_core Various edits of core functionality commit 388ec8a3205e4ed0a275b28838478bff962b9347 Merge: 5de8f40 f1576b4 Author: Mario Kleiner Date: Fri Jun 29 11:03:11 2012 -0700 Merge pull request #29 from dcnieho/master shut up line ending issues once and for all commit 5de8f40ade36610c4e7e8d6df4187be8bf62376a Merge: 44d9e78 475e86d Author: Diederick C. Niehorster Date: Tue Jun 5 22:50:36 2012 -0700 Merge pull request #25 from dcnieho/master pull removed unneeded rmpath() commit 44d9e783b17dcd526d455c0a9de1d32672108e25 Merge: 758e1ab da42316 Author: Diederick C. Niehorster Date: Tue Jun 5 22:47:01 2012 -0700 Merge pull request #22 from dcnieho/master more line ending conversions? commit da42316de8bf0632785121d58266b8708e30e059 Merge: 0b11f37 758e1ab Author: Diederick C. Niehorster Date: Wed Jun 6 13:43:57 2012 +0800 Merge remote-tracking branch 'upstream/master' commit 758e1abc8c38e11ff6d9fbad2e4566a4893802e5 Merge: 426494b d134542 Author: Mario Kleiner Date: Tue Jun 5 19:22:58 2012 -0700 Merge pull request #24 from kleinerm/master Screen 32-Bit for Matlab OSX rebuilt. commit 426494ba7d34ee9b76dbf3ab3a4351d0d8e37547 Merge: 44e6cc6 eb14582 Author: Mario Kleiner Date: Tue Jun 5 16:28:47 2012 -0700 Merge pull request #23 from kleinerm/master Fix build directory structure. Add workaround for more osx brokeness commit 2128e3f7caba434d3a879513c145b8513024d997 Merge: 3125eae 44e6cc6 Author: Mario Kleiner Date: Mon Jun 4 22:39:44 2012 +0200 Merge branch 'master' of https://github.com/Psychtoolbox-3/Psychtoolbox-3 commit 44e6cc6be594b1f926bfdffa8207a9bda4e4dd70 Merge: e53d64b a074f0b Author: Mario Kleiner Date: Mon Jun 4 08:47:44 2012 -0700 Merge pull request #21 from dcnieho/master CR+LF to LF conversions for various files with wrong line endings. commit e53d64b2ef6a73a41129fc5a5dfff52ced4f1a93 Merge: 2d1529d e8d61ef Author: Diederick C. Niehorster Date: Sun Jun 3 22:44:29 2012 -0700 Merge pull request #20 from dcnieho/e8d61ef0839e4ae9c984c0b5764acb031376c973 crlf to lf matlab function added commit 2d1529d0662dbc3f2a38537d6921e0fbfbd67022 Merge: a38c619 971a4db Author: Mario Kleiner Date: Sat Jun 2 17:36:33 2012 -0700 Merge pull request #19 from dcnieho/master updated ignores (testing...) commit 3125eaefbabc3254680e7929292bf7760ae93208 Merge: 4cb1a13 a38c619 Author: Mario Kleiner Date: Fri Jun 1 17:07:54 2012 -0700 Merge pull request #4 from Psychtoolbox-3/master Sync with ptb master: Psychtoolbox 3.0.10 commit a38c6190cd0ff03351b3b349f43cea1c70081903 Merge: a82ba99 92809a3 Author: Mario Kleiner Date: Fri Jun 1 17:06:11 2012 -0700 Merge pull request #18 from Psychtoolbox-3/beta Merge pull request #17 from Psychtoolbox-3/master commit 92809a33c1ce0e4149ffc91ea91ec0674172e81e Merge: 679b5d7 a82ba99 Author: Mario Kleiner Date: Fri Jun 1 10:36:45 2012 -0700 Merge pull request #17 from Psychtoolbox-3/master "Rotten Apples" V 3.0.10 release. commit a82ba99c798ec57615607f8fb55ce917be105069 Merge: 27e585d 4cb1a13 Author: Mario Kleiner Date: Fri Jun 1 10:34:58 2012 -0700 Merge pull request #16 from kleinerm/master Last prerelease fixes for 3.0.10. commit db25e3a6eca646fc8c1b92a3d40699afcfaf394d Merge: 5f9ef4a 679b5d7 Author: Mario Kleiner Date: Wed May 30 20:48:23 2012 -0700 Merge pull request #15 from Psychtoolbox-3/beta Merge pull request #14 from Psychtoolbox-3/master commit 679b5d7190627cce90acde2999d9ca1050333be9 Merge: 21ecb66 5f9ef4a Author: Mario Kleiner Date: Wed May 30 20:47:18 2012 -0700 Merge pull request #14 from Psychtoolbox-3/master "Rotten Apples" release, next try. commit 5f9ef4ade055c103be5857b3651b93e8f9b80165 Merge: 6aecf47 7c29841 Author: Mario Kleiner Date: Wed May 30 20:45:34 2012 -0700 Merge pull request #13 from kleinerm/master Fix 10.5 Leopard support for 64-Bit PTB - 1st try. commit 5af7f3938c36fb7bb23eae859ccfc7a7b861aaa3 Merge: 6137ed0 6aecf47 Author: Mario Kleiner Date: Tue May 29 18:23:41 2012 -0700 Merge pull request #3 from Psychtoolbox-3/master Sync kleinerm master to master at initial 3.0.10 "Rotten Apples" release. commit 6aecf47d8b5371c6d5a1beaf62567454b672b0b2 Merge: 518c4ca 21ecb66 Author: Mario Kleiner Date: Tue May 29 18:16:01 2012 -0700 Merge pull request #12 from Psychtoolbox-3/beta Beta -> Master sync. commit 21ecb66c5bd25dfd2f3c20419a9688105bfbc7a8 Merge: 3c4948a 518c4ca Author: Mario Kleiner Date: Tue May 29 17:52:30 2012 -0700 Merge pull request #11 from Psychtoolbox-3/master Psychtoolbox 3.0.10 initial beta release "Rotten Apples" The first beta release, named "Rotten Apples", adds support for 64-Bit Matlab under Apple MacOSX. The minimum required OSX version for the 32-Bit Psychtoolbox is 10.4.11 "Tiger". The minimum required OSX version for the 64-Bit Psychtoolbox is 10.5.8 "Leopard". The recommended OSX version for full functionality with the 64-Bit Psychtoolbox is 10.6 "Snow Leopard". The minimum required Matlab version for all platforms is now V7.4 aka R2007a. Use of Psychtoolbox with MacOSX on Apple PowerPC computers is no longer supported. MS-Windows 2000 is no longer maintained or tested for compatibility. Some legacy features were removed. commit 518c4ca56271266a89dd7f1c274710b56684ac55 Merge: bbd9ff7 6137ed0 Author: Mario Kleiner Date: Tue May 29 16:49:19 2012 -0700 Merge pull request #10 from kleinerm/master Pull legacy downloader and probably last fixes for 3.0.10 release. commit bbd9ff76a98413446438cce36a554020da091219 Merge: 2dc4064 1270454 Author: Mario Kleiner Date: Tue May 29 15:14:38 2012 -0700 Merge pull request #9 from kleinerm/master Pull Davids final commits from 3.0.9 into 3.0.10 commit 127045402e443bfe0c9fce217361590b69e6a174 Merge: 3c29811 5defb37 Author: Mario Kleiner Date: Tue May 29 23:45:39 2012 +0200 Merge branch 'master' of github.com:kleinerm/Psychtoolbox-3 commit 3c4948a10cfa0afab1840961b48f4a2462f70f73 Merge: 958f530 2dc4064 Author: Mario Kleiner Date: Mon May 28 17:31:47 2012 -0700 Merge pull request #8 from Psychtoolbox-3/master Beta update: Update downloader. commit 2dc4064ef4a897968a783cce82312571533d3c1b Merge: 5a85249 5defb37 Author: Mario Kleiner Date: Mon May 28 17:28:31 2012 -0700 Merge pull request #7 from kleinerm/master Pull: Remove downloadmethod parameter from DownloadPsychtoolbox.m commit 958f530abdc395de80a2f5cb4f5b9cc852237093 Merge: 9423880 5a85249 Author: Mario Kleiner Date: Mon May 28 15:22:12 2012 -0700 Merge pull request #6 from Psychtoolbox-3/master V 3.0.10 - Beta test update 1 commit 5a85249c1d8ed5158bb195401ca4ed87a6737ad5 Merge: 9423880 f5ac9f9 Author: Mario Kleiner Date: Mon May 28 15:19:44 2012 -0700 Merge pull request #5 from kleinerm/master Pull the 3.0.10 RC5 with some more removal of old cruft. commit 9423880fb331d20beb91d86788e57e69d9e15426 Merge: 5f82e14 28a6f31 Author: Mario Kleiner Date: Sun May 27 22:41:26 2012 -0700 Merge pull request #4 from kleinerm/master Pull the 3.0.10 RC4 with some Apple brain damage removed. commit 5f82e143cfc72a64c9c8eb4a6edc74e7a070e33a Merge: 2518639 e713cec Author: Mario Kleiner Date: Sun May 27 22:23:16 2012 -0700 Merge pull request #3 from kleinerm/master Pull the 3.0.10 RC3 with some bug fix to PsychJava installation. commit 25186394b2bbdcf08252ac85c57663147b353154 Merge: 3779a4d fc7944e Author: Mario Kleiner Date: Sun May 27 21:53:35 2012 -0700 Merge pull request #2 from kleinerm/master Pull the 3.0.10 RC2 with some critical bug fixes to installation. commit 3779a4da4073c0493fe02a83570c9da0d4aae8a8 Merge: 7a701d5 5239aca Author: Mario Kleiner Date: Sun May 27 19:37:13 2012 -0700 Merge pull request #1 from kleinerm/master Pull the 3.0.10 RC1 with 64-Bit OSX support and removed legacy Matlab and PowerPC support. commit fee85f6e3592a2ed4703d1c0d48e55d2a5373b77 Merge: 7a701d5 10dfbdc Author: Mario Kleiner Date: Sun May 27 22:19:35 2012 +0200 Merge branch 'osx64bit' debian/changelog0000644000000000000000000002336212302755332011050 0ustar psychtoolbox-3 (3.0.11.20131230.dfsg1-1build1) trusty; urgency=medium * Rebuild for octave 3.8. -- Matthias Klose Mon, 24 Feb 2014 23:50:50 +0000 psychtoolbox-3 (3.0.11.20131230.dfsg1-1) unstable; urgency=low * New upstream release: - detect location of (recently moved) FreeType-2 header files (Closes: #733402) - improved low-level support of the latest AMD gpu's - fix for key-events handling under XFCE-4 (no new workspaces should now get created upon exit) - general improvements to video capture and video recording - various other fixes -- Yaroslav Halchenko Mon, 30 Dec 2013 19:52:29 -0500 psychtoolbox-3 (3.0.11.20131017.dfsg1-3) unstable; urgency=low * Upload to unstable since fresh glew has arrived to sid! -- Yaroslav Halchenko Tue, 19 Nov 2013 23:34:50 -0500 psychtoolbox-3 (3.0.11.20131017.dfsg1-2) neurodebian; urgency=low * debian/control - Also adding a conflict for libglew-dev (= 1.9.0.is.1.8.0-0ubuntu2) in saucy - Adding gnuplot-nox|gnuplot to build-depends and gnuplot to suggests of -common package - libusb-1.0-0-dev 1.0.9 (even rc) should be good enough according to Mario. So downgrading this versioned dependency so it could build for squeeze and precise now * debian/rules - exclude test PTBAndIsetbioColorimetryTest since requires isetbio cmdline -- Yaroslav Halchenko Fri, 18 Oct 2013 22:30:02 -0400 psychtoolbox-3 (3.0.11.20131017.dfsg1-1) experimental; urgency=low * Fresh bugfix release resolving discovered issues with 3.0.11.20131003, e.g. segfaults upon exit -- Yaroslav Halchenko Wed, 16 Oct 2013 22:09:21 -0400 psychtoolbox-3 (3.0.11.20131003.dfsg1-1) experimental; urgency=low * Fresh upstream primarily bugfix release - addresses an issue with PsychHID('Devices') breaking sub-second timing of WaitSecs (Thanks Mario for the detailed report on new release). * debian/patches - refreshed to address renaming of the build .m script * debian/control - boost build-depends on libusb-1.0-0-dev >= 2:1.0.11 -- Yaroslav Halchenko Fri, 11 Oct 2013 15:18:39 -0400 psychtoolbox-3 (3.0.11.20130711.dfsg1-1) experimental; urgency=low * New upstream release - resolves FTBFS with gcc-4.8 (Closes: #701342) * debian/control - moved all gst-plugins collecttions to Recommends per upstream recommendation -- Yaroslav Halchenko Mon, 15 Jul 2013 11:28:09 -0400 psychtoolbox-3 (3.0.10.20130612.dfsg1-1) neurodebian; urgency=low * New upstream snapshot release -- Yaroslav Halchenko Fri, 14 Jun 2013 12:03:25 -0400 psychtoolbox-3 (3.0.10.20130522.dfsg1-1) UNRELEASED; urgency=low * New upstream snapshot release - upload only to NeuroDebian due to unresolved #705485 (liboctave-dev & GCC 4.8) * debian/rules - run selected collection of Demos and Tests at build-time to validate correct operation (xvfb, xauth, xdotool, gstreamer, etc to B-D). Failures are ignored for now -- Yaroslav Halchenko Fri, 14 Jun 2013 11:09:19 -0400 psychtoolbox-3 (3.0.10.20130420.dfsg1-1) UNRELEASED; urgency=low * New upstream release * debian/rules, debian/dfsg-upstream - adjusted for new binary blobs (libwaffle etc) -- Yaroslav Halchenko Tue, 07 May 2013 09:30:06 -0400 psychtoolbox-3 (3.0.10.20130114.dfsg1-1) experimental; urgency=low * New upstream bugfix release -- Yaroslav Halchenko Tue, 15 Jan 2013 22:13:23 -0500 psychtoolbox-3 (3.0.10.20130108.dfsg1-1) experimental; urgency=low * Fresh upstream release * debian/patches - deb_use_system_GLEW -- refreshed - deb_psychtoolboxversion -- fixed to compare correctly for paths of both Octave and Matlab * debian/upstream - provides references and other information -- Yaroslav Halchenko Tue, 08 Jan 2013 09:09:40 -0500 psychtoolbox-3 (3.0.10.20121111.dfsg1-1) neurodebian-devel; urgency=low * Long over-due fresh always-beta snapshot release of 3.0.10 - upstream switched entirely over to GIT, packaging repository is rebased on top of that GIT repository - debian/dfsg-upstream adjusted for new archives/binary blobs to be removed * debian/control - boost glew build-depends to 1.9 (soversioned backport -dev packages provided by NeuroDebian) - build-depend on libxfixes-dev -- Yaroslav Halchenko Tue, 11 Dec 2012 13:08:23 -0500 psychtoolbox-3 (3.0.9+svn2579.dfsg1-1) unstable; urgency=low * Fresh always-beta always 3.0.9 release - addresses portaudio issues on amd64 platform - 1 new entry for debian/copyright -- Yaroslav Halchenko Wed, 23 May 2012 13:25:28 -0400 psychtoolbox-3 (3.0.9+svn2539.dfsg1-1) unstable; urgency=low * Fresh beta release: - resolved outstanding copyright/license issue with glext_edit.h - Initial upload to unstable (Closes: #606557) * debian/control: - -common: recommend subversion for DownloadAdditions functionality * debian/copyright: - updated to reflect upstream changes and some outstanding missing entries * debian/TODO, debian/rules: - cleanup -- Yaroslav Halchenko Mon, 02 Apr 2012 11:12:15 -0400 psychtoolbox-3 (3.0.9+svn2514.dfsg1-1) neurodebian; urgency=low * Fresh beta release: Many improvements to realtime scheduling and movie playback, a bit of gpu based random number noise generation (perlin noise) on modern gpus, etc. * Refreshed patches * Updated copyright (years, URLs, license) * Boosted policy to 3.9.3 -- no changes * Added upstream changelog as a GIT/SVN log of the upstream beta branch which carries release summaries * "Manually" generate octave:Depends due to deprecation of octave-depends helper in favor of unversioned octave package. -- Yaroslav Halchenko Thu, 22 Mar 2012 22:19:03 -0400 psychtoolbox-3 (3.0.9+svn2458.dfsg1-1) neurodebian; urgency=low * New upstream snapshot (no chages in sources), necessary to assure correct fetching of binary extensions upon demand -- Yaroslav Halchenko Sun, 19 Feb 2012 21:00:54 -0500 psychtoolbox-3 (3.0.9+svn2456.dfsg1-1) neurodebian; urgency=low * New upstream snapshot (no chages in sources), necessary to assure correct fetching of binary extensions upon demand * To please Ubuntu's --as-needed placed -l's for libptbdrawtext_ftgl.so.1 build at the end of the build cmd (should fix incorrect building on Ubuntu's >= 11.04) -- Yaroslav Halchenko Fri, 17 Feb 2012 21:59:12 -0500 psychtoolbox-3 (3.0.9+svn2455.dfsg1-1) neurodebian; urgency=low * New upstream snapshot - upstream dropped direct build dependency on libraw1394-dev - compatible with freenect 0.1.2 * Refreshed patches: deb_no_static_bindings_with-fPIC, deb_see_README.Debian, deb_use_system_GLEW -- Yaroslav Halchenko Sun, 12 Feb 2012 18:29:24 -0500 psychtoolbox-3 (3.0.9+svn2380.dfsg1-1) neurodebian; urgency=low * New upstream snapshot addressing XRandR support etc * Upstream moved to a new SVN hosting, git-svn linkage was updated * deb_see_README.Debian patch refreshed * Boosted policy to 3.9.2 -- no changes -- Yaroslav Halchenko Thu, 01 Dec 2011 00:19:52 -0500 psychtoolbox-3 (3.0.9+svn2351.dfsg1-1) neurodebian; urgency=low * New upstream point release * Adjusted debian/cleanup.sh (thanks Mario for heads up) * Renamed debian/cleanup.sh into debian/dfsg-upstream * libxrandr-dev into Build-Depends -- Yaroslav Halchenko Mon, 07 Nov 2011 22:02:20 -0500 psychtoolbox-3 (3.0.9+svn2265.dfsg1-1) neurodebian; urgency=low * New upstream point release * gfortran into build-depends to assure noise-less operation of mkoctfile * libxi-dev into Build-Depends due to use of libXi * Enabled building of moalcore.mex and PsychHID.mex for octave (libopenal-dev into build-Depends) * Build-Depend on 1.6 (instead of 1.5) version of GLEW to enable OML_sync_control extension -- Yaroslav Halchenko Tue, 09 Aug 2011 14:25:00 -0400 psychtoolbox-3 (3.0.9+svn2167.dfsg1-1) neurodebian; urgency=low * New upstream point release (aiming at becoming a beta): - core is now distributed under MIT license * Removed BIG FAT WARNING * Added Recommends and Suggests on some octave toolboxes, and gstreamer plugins sets (base, good, bad, ugly) * Provide include paths for glib-2.0 from pkg-config -- necessary for build on systems with multiarch support -- Yaroslav Halchenko Mon, 27 Jun 2011 22:55:34 -0400 psychtoolbox-3 (3.0.9+svn2078.dfsg1-1) neurodebian; urgency=low * New upstream point release -- Yaroslav Halchenko Tue, 17 May 2011 18:00:28 -0400 psychtoolbox-3 (3.0.8+svn1934.dfsg1-1~pre2) neurodebian; urgency=low * New patch up_portaudio_patches to consolidate upstream's linux-relevant patches for portaudio -- fixes problem with missing symbol PaUtil_SetDebugPrintFunction * README.Debian: - notes on setting up real-time scheduling and memory locking - hint on 'sca' function for restoring the display * New patch deb_psychtoolboxversion to enable reporting PTB version in the packaged version of PTB * Added a big fat warning to descriptions of all the packages -- Yaroslav Halchenko Thu, 20 Jan 2011 12:17:42 -0500 psychtoolbox-3 (3.0.8+svn1934.dfsg1-1~pre1) neurodebian; urgency=low * Initial Debian packaging -- Yaroslav Halchenko Fri, 17 Dec 2010 00:01:44 -0500 debian/upstream0000644000000000000000000000200412260413325010743 0ustar Bugs: https://github.com/Psychtoolbox-3/Psychtoolbox-3/issues Contact: http://psychtoolbox.org/PsychtoolboxForum FAQ: http://psychtoolbox.org/PsychtoolboxFaq Repository: git://github.com/Psychtoolbox-3/Psychtoolbox-3.git Repository-Browse: https://github.com/Psychtoolbox-3/Psychtoolbox-3 Reference: - Author: David H. Brainard Title: The Psychophysics Toolbox Journal: Spatial Vision Volume: 10 Number: 4 Pages: 443-446 Year: 1997 DOI: 10.1163/156856897X00357 - Author: D.G. Pelli Title: "The VideoToolbox software for visual psychophysics: Transforming numbers into movies" Journal: Spatial Vision Volume: 10 Number: 4 Pages: 437-442 Year: 1997 DOI: 10.1163/156856897X00366 PMID: 9176953 Acknowledgment: If you want to acknowledge use of this software when you publish your research, you might say something like this, "We wrote our experiments in Octave (or Matlab), using the Psychophysics Toolbox extensions (Brainard, 1997; Pelli, 1997)." Tags: - field::neuroscience:psychophysics debian/dfsg-upstream0000755000000000000000000001167412260413325011704 0ustar #!/bin/bash #emacs: -*- mode: shell-script; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- #ex: set sts=4 ts=4 sw=4 noet: set -eu RM="git rm --ignore-unmatch" FINDREGEX="find -regextype posix-egrep -regex" { $FINDREGEX '.*\.(o|dll.*|exe|mex.*|dylib|class)' -print0; \ $FINDREGEX '.*\.(old|bak).*' -print0; } | xargs -0 --no-run-if-empty $RM -rf $FINDREGEX '.*((|Mac)OSX|Octave3OSXFiles|Windows|.bundle|.FBCLockFolder)' -print0| xargs -0 --no-run-if-empty $RM -rf # more of non-Linux OS specifics $RM -rf PsychSourceGL/Cohorts/libusb1-win32 # HID_Utilities_64Bit # Seems to be used only for OSX ATM # Copy of them is shipped within pd-hid package (recent) # So, for now removing for Debian builds $RM -rf PsychSourceGL/Cohorts/{PsychtoolboxOSXKernelDriver,HID?Utilities*,IOWarrior} $RM -rf Psychtoolbox/PsychContributed/WinTab # Some binary kernels/tools for OSX $RM -rf Psychtoolbox/*/PsychtoolboxKernelDriver*.kext* $RM -rf Psychtoolbox/*/PsychtoolboxKernelDriverUserClientTool* # Test and its data (input? output?) $RM -f Psychtoolbox/PsychTests/StandaloneTimingProgram Psychtoolbox/.FBCIndex # ??? # Psychtoolbox/PsychTests/StandaloneTimingTest.m refers StandaloneTimingTest.c which is N/A # some additional externals: use system ones $RM -f ./PsychSourceGL/Cohorts/Kinect-* \ ./Psychtoolbox/PsychContributed/Kinect-*-Windows* # Binary built against ATI/AMD SDK with questionable # redistributability $RM -f Psychtoolbox/PsychContributed/ATIRadeonperf_Linux* # libwaffle -- for now only in binary form -- will ship in octave.*-nonfree for now $RM -f ./Psychtoolbox/PsychContributed/ArmArch/libwaffle*_glxegl \ ./PsychSourceGL/Cohorts/libwaffle/libwaffle*_* # __TODO: # http://docs.psychtoolbox.org/DrawTextPlugin # BDepends: libfontconfig1-dev, libfreetype6-dev # uses http://sourceforge.net/projects/oglft/ with last release from 2003 :-/ # not pruning for now # built for i386 so needs following Depends ATM: # ia32-libs, lib32gcc1, lib32z1, libc6-i386, zlib1g $RM -f ./Psychtoolbox/PsychBasic/PsychPlugins/libptbdrawtext_ftgl*.* $RM -rf ./PsychSourceGL/Cohorts/FTGLTextRenderer/libftgles_*.a # libftgl-dev -- check ver # BDepends: libfontconfig1-dev, libfreetype6-dev # g++ -g -I. -I/usr/include/ -I/usr/include/freetype2/ -L/usr/lib -l GL -l GLU -l fontconfig -l freetype -pie -shared -fPIC -o libptbdrawtext_ftgl.so.1 libptbdrawtext_ftgl.cpp qstringqcharemulation.cpp OGLFT.cpp # Windows only $RM -rf Psychtoolbox/PsychContributed/macidpascalsource # Docs without sources... may be into non-free? $RM -f ./Psychtoolbox/PsychDocumentation/{ECVP2010Poster,Psychtoolbox3-Slides}*.pdf # _TODO: # Remove things which are said to be superseeded and NA for Linux # See Psychtoolbox/PsychDocumentation/ExperimentalStuff.m # ??? PsychSound # ??? ./Psychtoolbox/PsychHardware/EyelinkToolbox -- N/A used under Linux ## EXTERNALS # prune some externals present in Debian: $RM -rf ./PsychSourceGL/Cohorts/libDC1394 # libdc1394-22-dev -- check content # prune copies of GLEW $RM -f ./Psychtoolbox/PsychOpenGL/MOGL/source/*gl*ew.* $RM -f ./PsychSourceGL/Source/Common/Screen/gl*ew*.* $RM -f ./PsychSourceGL/Cohorts/freeglut-MSVC-2.8.0-1.mp.zip # TODO: # portaudio has to be patched - keep original pristine tarball and patched sources # remove the rest $RM -f ./PsychSourceGL/Cohorts/PortAudio/libportaudio.a # anyway alien arch $RM -f ./PsychSourceGL/Cohorts/PortAudio/portaudio_unpatched_except4OSX.zip # we will use pristine source tarball $RM -f ./PsychSourceGL/Cohorts/PortAudio/Portaudio_OSX_64Bit.zip $RM -f ./PsychSourceGL/Cohorts/PortAudio/portaudio_msvc2010_buildconfig.zip $RM -f ./PsychSourceGL/Cohorts/PortAudio/*.lib $RM -f ./PsychSourceGL/Cohorts/PortAudio/*.a $RM -rf ./PsychSourceGL/Source/Common/PsychSound/StaticOpenALLib # libopenal-dev -- check # artoolkit (RFP - #452233) -- needed only on OSX/Windows $RM -rf PsychSourceGL/Cohorts/ARToolkit $RM -rf PsychSourceGL/Projects/Linux/ARToolkit $RM -rf Psychtoolbox/PsychDemos/ARToolkitDemo* # _TODO: # Conside packaging MOGL: MOGL OpenGL for Matlab support # $RM -rf ./Psychtoolbox/PsychOpenGL/MOGL # TODO: # IViewXToolbox: ./Psychtoolbox/PsychHardware/iViewXToolbox # uses tcp_udp_ip toolbox # Strip copy of 1.0 version of the toolbox $RM -rf ./Psychtoolbox/PsychHardware/iViewXToolbox/tcp_udp_ip/tcpip* ## Additional Dependencies: ## OSX: Cocoa/Cocoa.h used in StoreBitLib_Prefix.pch ## Check more on compatibility with Linux of components under Psychtoolbox/PsychHardware # # Some final look # # to find more of non-sources and report them: echo "I: Various non-sources/data" find -regextype posix-egrep -type f ! -regex '.*\.(m(|at)|dat|c(|c|pp)|h|java|sh|txt|in|rtf|py|php|wav|bmp|png|jpg|JPG|tiff|html|mov|xml)' -ls | grep -v -e '\.git' -e '\.pc' # Look among executables: echo "I: Suspecious executables left" find -perm /+x ! -type d -print0 | xargs -0 file | grep -v -e ASCII -e '\.git' -e 'shell' -e text -e JPEG -e 'Rich Text' echo "I: Leftout archives" $FINDREGEX '.*\.(zip|rar)' echo "I: Leftout static libs" find -iname lib*.a debian/compat0000644000000000000000000000000212260413325010362 0ustar 7 debian/blends0000644000000000000000000000034112260413325010354 0ustar Format: extended Recommends: octave-psychtoolbox-3 Tasks: debian-science/psychophysics Author: Mario Kleiner Language: Matlab/Octave, C Pkg-URL: http://neuro.debian.net/pkgs/%(Pkg-Name)s.html debian/patches/0000755000000000000000000000000012260413325010613 5ustar debian/patches/up_portaudio_patches0000644000000000000000000002144312260413325014763 0ustar --- /dev/null +++ b/PsychSourceGL/Cohorts/PortAudio/patches/common_timeinfo_currenttime @@ -0,0 +1,15 @@ +From: Mario Kleiner +Subject: disable resetting of timeInfo->currentTime +Origin: PTB-3 + +--- a/portaudio/src/common/pa_process.c ++++ b/portaudio/src/common/pa_process.c +@@ -683,7 +683,7 @@ void PaUtil_BeginBufferProcessing( PaUti + + bp->timeInfo->inputBufferAdcTime -= bp->framesInTempInputBuffer * bp->samplePeriod; + +- bp->timeInfo->currentTime = 0; /** FIXME: @todo time info currentTime not implemented */ ++ // MARIO MK CHANGED PTB: bp->timeInfo->currentTime = 0; /** FIXME: @todo time info currentTime not implemented */ + + /* the first streamCallback will be called to generate samples which will be + outputted after the frames currently in the output buffer have been --- /dev/null +++ b/PsychSourceGL/Cohorts/PortAudio/patches/common_unique_DebugPrint @@ -0,0 +1,36 @@ +From: Mario Kleiner +Subject: avoid PaUtil_DebugPrint defined in multiple locations -- reuse pa_debugprint.o +Origin: PTB-3 + + +--- a/portaudio/Makefile.in ++++ b/portaudio/Makefile.in +@@ -49,6 +49,7 @@ COMMON_OBJS = \ + src/common/pa_cpuload.o \ + src/common/pa_dither.o \ + src/common/pa_front.o \ ++ src/common/pa_debugprint.o \ + src/common/pa_process.o \ + src/common/pa_skeleton.o \ + src/common/pa_stream.o \ +--- a/portaudio/src/common/pa_front.c ++++ b/portaudio/src/common/pa_front.c +@@ -158,7 +158,8 @@ void PaUtil_SetLastHostErrorInfo( PaHost + strncpy( lastHostErrorText_, errorText, PA_LAST_HOST_ERROR_TEXT_LENGTH_ ); + } + +- ++/* ++MK CHANGED PTB - Already defined in pa_debugprint + void PaUtil_DebugPrint( const char *format, ... ) + { + va_list ap; +@@ -169,7 +170,7 @@ void PaUtil_DebugPrint( const char *form + + fflush( stderr ); + } +- ++*/ + + static PaUtilHostApiRepresentation **hostApis_ = 0; + static int hostApisCount_ = 0; --- /dev/null +++ b/PsychSourceGL/Cohorts/PortAudio/patches/linux_sched_rt @@ -0,0 +1,58 @@ +From: Mario Kleiner +Subject: enforce (when possible) SCHED_RR on Linux systems +Origin: PTB-3 + + + +--- a/portaudio/src/os/unix/pa_unix_util.c ++++ b/portaudio/src/os/unix/pa_unix_util.c +@@ -224,9 +224,18 @@ PaError PaUnixThread_Initialize( PaUnixT + } + #endif + ++// MK: Enable Psychtoolbox specific Realtime scheduling setup code for RT scheduling the audio callback thread. ++#define MK_PSYCH_RTSCHED 1 ++ + PaError PaUnixThread_New( PaUnixThread* self, void* (*threadFunc)( void* ), void* threadArg, PaTime waitForChild ) + { +- PaError result = paNoError; ++#ifdef MK_PSYCH_RTSCHED ++ // MK: New code, not in original. Unconditionally try to boost callback threads priority ++ // to RT_FIFO realtime scheduling with given realtime priority. See below for rest. ++ struct sched_param spm = { 0 }; ++ int policy; ++#endif ++ PaError result = paNoError; + pthread_attr_t attr; + int started = 0; + +@@ -260,6 +269,29 @@ PaError PaUnixThread_New( PaUnixThread* + PA_UNLESS( !pthread_create( &self->thread, &attr, threadFunc, threadArg ), paInternalError ); + started = 1; + ++#ifdef MK_PSYCH_RTSCHED ++ // MK: New code, not in original. Unconditionally try to boost callback threads priority ++ // to RT_FIFO realtime scheduling with given realtime priority. ++ ++ // Query parent threads policy and priority: ++ pthread_getschedparam(pthread_self(), &policy, &spm); ++ ++ // If not RT policy, assign a base priority of minimum SCHED_FIFO. Otherwise use RT priority of parent as baseline: ++ if ((policy != SCHED_FIFO ) && (policy != SCHED_RR)) spm.sched_priority = sched_get_priority_min( SCHED_FIFO ); ++ ++ // Set audio callback threads RT priority to parents baseline + 4, so it gets quite a boost wrt. its parent. ++ // Clamp to allowable maximum though: ++ spm.sched_priority = PA_MIN( spm.sched_priority + 4 , sched_get_priority_max( SCHED_FIFO ) ); ++ ++ // Try to switch callback thread to SCHED_FIFO Realtime scheduling with proper realtime priority, ++ // but don't be pissed if it doesn't work. No all too big deal: ++ if( pthread_setschedparam(self->thread, SCHED_FIFO, &spm) != 0 ) ++ { ++ PA_DEBUG(( "WARNING: Failed bumping audio callback thread to realtime priority!\n" )); ++ } ++ ++#endif ++ + #if 0 + if( th->rtSched ) + { --- /dev/null +++ b/PsychSourceGL/Cohorts/PortAudio/patches/series @@ -0,0 +1,4 @@ +common_unique_DebugPrint +common_timeinfo_currenttime +linux_sched_rt +dither_amd64_fixes --- /dev/null +++ b/PsychSourceGL/Cohorts/PortAudio/patches/dither_amd64_fixes @@ -0,0 +1,124 @@ +--- a/portaudio/src/common/pa_dither.c ++++ b/portaudio/src/common/pa_dither.c +@@ -1,5 +1,5 @@ + /* +- * $Id: pa_dither.c 1097 2006-08-26 08:27:53Z rossb $ ++ * $Id$ + * Portable Audio I/O Library triangular dither generator + * + * Based on the Open Source API proposed by Ross Bencina +@@ -42,9 +42,14 @@ + @brief Functions for generating dither noise + */ + +- +-#include "pa_dither.h" + #include "pa_types.h" ++#include "pa_dither.h" ++ ++ ++/* Note that the linear congruential algorithm requires 32 bit integers ++ * because it uses arithmetic overflow. So use PaUint32 instead of ++ * unsigned long so it will work on 64 bit systems. ++ */ + + #define PA_DITHER_BITS_ (15) + +@@ -57,9 +62,9 @@ void PaUtil_InitializeTriangularDitherSt + } + + +-signed long PaUtil_Generate16BitTriangularDither( PaUtilTriangularDitherGenerator *state ) ++PaInt32 PaUtil_Generate16BitTriangularDither( PaUtilTriangularDitherGenerator *state ) + { +- signed long current, highPass; ++ PaInt32 current, highPass; + + /* Generate two random numbers. */ + state->randSeed1 = (state->randSeed1 * 196314165) + 907633515; +@@ -69,9 +74,10 @@ signed long PaUtil_Generate16BitTriangul + * Shift before adding to prevent overflow which would skew the distribution. + * Also shift an extra bit for the high pass filter. + */ +-#define DITHER_SHIFT_ ((SIZEOF_LONG*8 - PA_DITHER_BITS_) + 1) +- current = (((signed long)state->randSeed1)>>DITHER_SHIFT_) + +- (((signed long)state->randSeed2)>>DITHER_SHIFT_); ++#define DITHER_SHIFT_ ((sizeof(PaInt32)*8 - PA_DITHER_BITS_) + 1) ++ ++ current = (((PaInt32)state->randSeed1)>>DITHER_SHIFT_) + ++ (((PaInt32)state->randSeed2)>>DITHER_SHIFT_); + + /* High pass filter to reduce audibility. */ + highPass = current - state->previous; +@@ -86,7 +92,7 @@ static const float const_float_dither_sc + + float PaUtil_GenerateFloatTriangularDither( PaUtilTriangularDitherGenerator *state ) + { +- signed long current, highPass; ++ PaInt32 current, highPass; + + /* Generate two random numbers. */ + state->randSeed1 = (state->randSeed1 * 196314165) + 907633515; +@@ -96,9 +102,8 @@ float PaUtil_GenerateFloatTriangularDith + * Shift before adding to prevent overflow which would skew the distribution. + * Also shift an extra bit for the high pass filter. + */ +-#define DITHER_SHIFT_ ((SIZEOF_LONG*8 - PA_DITHER_BITS_) + 1) +- current = (((signed long)state->randSeed1)>>DITHER_SHIFT_) + +- (((signed long)state->randSeed2)>>DITHER_SHIFT_); ++ current = (((PaInt32)state->randSeed1)>>DITHER_SHIFT_) + ++ (((PaInt32)state->randSeed2)>>DITHER_SHIFT_); + + /* High pass filter to reduce audibility. */ + highPass = current - state->previous; +--- a/portaudio/src/common/pa_dither.h ++++ b/portaudio/src/common/pa_dither.h +@@ -1,7 +1,7 @@ + #ifndef PA_DITHER_H + #define PA_DITHER_H + /* +- * $Id: pa_dither.h 1097 2006-08-26 08:27:53Z rossb $ ++ * $Id$ + * Portable Audio I/O Library triangular dither generator + * + * Based on the Open Source API proposed by Ross Bencina +@@ -44,18 +44,24 @@ + @brief Functions for generating dither noise + */ + ++#include "pa_types.h" ++ + + #ifdef __cplusplus + extern "C" + { + #endif /* __cplusplus */ + ++/* Note that the linear congruential algorithm requires 32 bit integers ++ * because it uses arithmetic overflow. So use PaUint32 instead of ++ * unsigned long so it will work on 64 bit systems. ++ */ + + /** @brief State needed to generate a dither signal */ + typedef struct PaUtilTriangularDitherGenerator{ +- unsigned long previous; +- unsigned long randSeed1; +- unsigned long randSeed2; ++ PaUint32 previous; ++ PaUint32 randSeed1; ++ PaUint32 randSeed2; + } PaUtilTriangularDitherGenerator; + + +@@ -73,9 +79,9 @@ void PaUtil_InitializeTriangularDitherSt + signed short out = (signed short)(((in>>1) + dither) >> 15); + + @return +- A signed long with a range of +32767 to -32768 ++ A signed 32-bit integer with a range of +32767 to -32768 + */ +-signed long PaUtil_Generate16BitTriangularDither( PaUtilTriangularDitherGenerator *ditherState ); ++PaInt32 PaUtil_Generate16BitTriangularDither( PaUtilTriangularDitherGenerator *ditherState ); + + + /** debian/patches/deb_portaudio_Makefile0000644000000000000000000000255112260413325015156 0ustar --- /dev/null +++ b/PsychSourceGL/Cohorts/PortAudio/Makefile @@ -0,0 +1,34 @@ +# PIC should be enabled to allow mixin while building resultant .mex +CFLAGS+=-fPIC + +all: patch-stamp build + +configure-stamp: + cd portaudio; mkdir -p lib; \ + CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-shared --without-jack --without-asiodir + $(MAKE) -C portaudio clean || : + touch $@ + +build: configure-stamp + make -C portaudio || : + : # It is "ok" to fail for full build -- we just need a static library + : # So it is important that file is present -- if not -- fail + cp -p portaudio/lib/.libs/libportaudio.a . + +patch-stamp: portaudio-stamp + # Propagate patched files into the tree + # cp -p pa_unix_util.c portaudio/src/os/unix/pa_unix_util.c + # cp -p pa_process.c portaudio/src/common/pa_process.c + # cp -p pa_front_linux.c portaudio/src/common/pa_front.c + #: Use patches without relying on quilt patch-queue manager + cat patches/series | while read pname; do patch -p1 < patches/$$pname; done + touch $@ + +portaudio-stamp: + #unzip portaudio_unpatched_except4OSX.zip \ + # 'portaudio/*' -x 'portaudio/bin/*' -x 'portaudio/lib/*' -x '*.o' + tar -xzvf pa_stable_v19_061121.tar.gz + touch $@ + +clean: + rm -rf portaudio *-stamp libportaudio.a debian/patches/deb_consistent_octave_outdir0000644000000000000000000000077112260413325016475 0ustar --- a/PsychSourceGL/Source/linuxmakeitoctave3.m +++ b/PsychSourceGL/Source/linuxmakeitoctave3.m @@ -12,12 +12,7 @@ end; fprintf('Building plugin type %i ...\n\n', mode); -% Target folder depends if this is a 64 bit or 32 bit runtime: -if ~isempty(findstr(computer, '_64')) - target = 'PsychBasic/Octave3LinuxFiles64/'; -else - target = 'PsychBasic/Octave3LinuxFiles/'; -end +target = 'PsychBasic/Octave3LinuxFiles/'; % Special folder for ARM binaries: if ~isempty(findstr(computer, 'arm')) debian/patches/deb_no_static_bindings_with-fPIC0000644000000000000000000000461312260413325017026 0ustar --- a/PsychSourceGL/Source/linuxmakeitoctave3.m +++ b/PsychSourceGL/Source/linuxmakeitoctave3.m @@ -20,7 +20,7 @@ fprintf('Building plugin type %i ...\n\n if mode==0 % Build Screen.mex: - mex -v -g --output ../Projects/Linux/build/Screen.mex -DPTB_USE_GSTREAMER -DPTBVIDEOCAPTURE_LIBDC -DPTBOCTAVE3MEX -I/usr/X11R6/include -I/usr/include/gstreamer-0.10 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -ICommon/Base -ICommon/Screen -ILinux/Base -ILinux/Screen -L/usr/X11R6/lib Common/Base/*.cc Linux/Base/*.c Linux/Screen/*.c Common/Screen/*.c Common/Base/*.c -lc -lrt -lGL -lGLU -lX11 -lXext -lgstreamer-0.10 -lgstbase-0.10 -lgstapp-0.10 -lgobject-2.0 -lgmodule-2.0 -lxml2 -lgthread-2.0 -lglib-2.0 /usr/lib/libXxf86vm.a /usr/lib/libdc1394.a /usr/lib/libraw1394.a + mex -v -g --output ../Projects/Linux/build/Screen.mex -DPTB_USE_GSTREAMER -DPTBVIDEOCAPTURE_LIBDC -DPTBOCTAVE3MEX -I/usr/X11R6/include -I/usr/include/gstreamer-0.10 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/libxml2 -ICommon/Base -ICommon/Screen -ILinux/Base -ILinux/Screen -L/usr/X11R6/lib Common/Base/*.cc Linux/Base/*.c Linux/Screen/*.c Common/Screen/*.c Common/Base/*.c -lc -lrt -lGL -lGLU -lX11 -lXext -lgstreamer-0.10 -lgstbase-0.10 -lgstapp-0.10 -lgobject-2.0 -lgmodule-2.0 -lxml2 -lgthread-2.0 -lglib-2.0 -lXxf86vm -lGLU -ldc1394 -lusb-1.0 unix(['mv ../Projects/Linux/build/Screen.mex ' PsychtoolboxRoot 'PsychBasic/Octave3LinuxFiles/']); striplibsfrommexfile([PsychtoolboxRoot 'PsychBasic/Octave3LinuxFiles/Screen.mex']); end; @@ -41,7 +41,7 @@ end; if mode==3 % Build PsychPortAudio.mex: - mex -v -g --output ../Projects/Linux/build/PsychPortAudio.mex -DPTBMODULE_PsychPortAudio -DPTBOCTAVE3MEX -ICommon/Base -ILinux/Base -ICommon/PsychPortAudio -ICommon/Screen Common/Base/*.cc Linux/Base/*.c Common/Base/*.c Common/PsychPortAudio/*.c /usr/local/lib/libportaudio.a -lc -lrt -lasound + mex -v -g --output ../Projects/Linux/build/PsychPortAudio.mex -DPTBMODULE_PsychPortAudio -DPTBOCTAVE3MEX -ICommon/Base -ILinux/Base -ICommon/PsychPortAudio -ICommon/Screen Common/Base/*.cc Linux/Base/*.c Common/Base/*.c Common/PsychPortAudio/*.c -lportaudio -lc -lrt -lasound unix(['mv ../Projects/Linux/build/PsychPortAudio.mex ' PsychtoolboxRoot 'PsychBasic/Octave3LinuxFiles/']); striplibsfrommexfile([PsychtoolboxRoot 'PsychBasic/Octave3LinuxFiles/PsychPortAudio.mex']); end debian/patches/deb_see_README.Debian0000644000000000000000000000451312260413325014325 0ustar --- a/PsychSourceGL/Source/Common/Screen/SCREENGetMouseHelper.c +++ b/PsychSourceGL/Source/Common/Screen/SCREENGetMouseHelper.c @@ -928,6 +928,7 @@ PsychError SCREENGetMouseHelper(void) printf("PTB-ERROR: Failed to enable realtime-scheduling with Priority(%i) [%s]!\n", schedulingparam.sched_priority, strerror(errno)); if (errno==EPERM) { printf("PTB-ERROR: You need to run Matlab/Octave with root-privileges, or run the script PsychLinuxConfiguration once for this to work.\n"); + printf("PTB-ERROR: See /usr/share/doc/psychtoolbox-3-common/README.Debian to make this work.\n"); } } errno=0; @@ -954,6 +955,7 @@ PsychError SCREENGetMouseHelper(void) printf("PTB-ERROR: Failed to disable realtime-scheduling with Priority(%i) [%s]!\n", schedulingparam.sched_priority, strerror(errno)); if (errno==EPERM) { printf("PTB-ERROR: You need to run Matlab/Octave with root-privileges, or run the script PsychLinuxConfiguration once for this to work.\n"); + printf("PTB-ERROR: See /usr/share/doc/psychtoolbox-3-common/README.Debian to make this work.\n"); } } errno=0; --- a/PsychSourceGL/Source/Linux/Screen/PsychWindowGlue.c +++ b/PsychSourceGL/Source/Linux/Screen/PsychWindowGlue.c @@ -110,6 +110,7 @@ psych_bool PsychRealtimePriority(psych_b printf("PTB-INFO: Failed to enable realtime-scheduling [%s]!\n", strerror(errno)); if (errno==EPERM) { printf("PTB-INFO: You need to run Matlab or Octave with root-privileges, or run the script PsychLinuxConfiguration once for this to work.\n"); + printf("PTB-INFO: See /usr/share/doc/psychtoolbox-3-common/README.Debian to make this work.\n"); } } errno=0; @@ -127,6 +128,7 @@ psych_bool PsychRealtimePriority(psych_b printf("PTB-INFO: Failed to disable realtime-scheduling [%s]!\n", strerror(errno)); if (errno==EPERM) { printf("PTB-INFO: You need to run Matlab or Octave with root-privileges or run the script PsychLinuxConfiguration once for this to work.\n"); + printf("PTB-INFO: See /usr/share/doc/psychtoolbox-3-common/README.Debian to make this work.\n"); } } errno=0; debian/patches/deb_psychtoolboxversion0000644000000000000000000000313612260413325015516 0ustar --- a/Psychtoolbox/PsychBasic/PsychtoolboxVersion.m +++ b/Psychtoolbox/PsychBasic/PsychtoolboxVersion.m @@ -93,7 +93,22 @@ if ~isfield(Psychtoolbox,'version') Psychtoolbox.version.major=cvv(1); Psychtoolbox.version.minor=cvv(2); Psychtoolbox.version.point=cvv(3); - + + if any(strcmp(PsychtoolboxRoot, {'/usr/share/octave/site/m/psychtoolbox-3/', '/usr/share/matlab/site/m/psychtoolbox-3/'})) + % It is a Debian version of the package + Psychtoolbox.version.flavor = 'Debian package'; + [status, result] = system('zcat /usr/share/doc/psychtoolbox-3-common/changelog.Debian.gz| head -1 | sed -e "s/).*/)/g"'); + if status == 0 + Psychtoolbox.version.revstring = result(1:end-1); + else + Psychtoolbox.version.revstring = 'WARNING: failed to obtain Debian revision'; + end + + % Build final version string: + Psychtoolbox.version.string = sprintf('%d.%d.%d - Flavor: %s - %s\nFor more info visit:\n%s', Psychtoolbox.version.major, Psychtoolbox.version.minor, Psychtoolbox.version.point, ... + Psychtoolbox.version.flavor, Psychtoolbox.version.revstring, 'http://neuro.debian.net/pkgs/octave-psychtoolbox-3.html'); + + else % Additional parser code for SVN information. This is slooow! svncmdpath = GetSubversionPath; @@ -179,6 +194,7 @@ if ~isfield(Psychtoolbox,'version') ss=s(n:end); Psychtoolbox.date=ss(min(find(ss-' ')):end); %#ok end + end end versionString=Psychtoolbox.version.string; versionStructure=Psychtoolbox.version; debian/patches/deb_no_special_arm0000644000000000000000000000070712260413325014327 0ustar --- a/PsychSourceGL/Source/linuxmakeitoctave3.m +++ b/PsychSourceGL/Source/linuxmakeitoctave3.m @@ -15,9 +15,11 @@ fprintf('Building plugin type %i ...\n\n target = 'PsychBasic/Octave3LinuxFiles/'; % Special folder for ARM binaries: +if 0 % for now no special builds on ARM on Debian's if ~isempty(findstr(computer, 'arm')) target = 'PsychBasic/Octave3LinuxFilesARM/'; end +end if mode==0 % Build Screen.mex: debian/patches/deb_portaudio_usebuilt_a0000644000000000000000000000165112260413325015575 0ustar --- a/PsychSourceGL/Source/linuxmakeitoctave3.m +++ b/PsychSourceGL/Source/linuxmakeitoctave3.m @@ -82,7 +82,7 @@ end; if mode==3 % Build PsychPortAudio.mex: - mex -v -g --output ../Projects/Linux/build/PsychPortAudio.mex -DPTBMODULE_PsychPortAudio -DPTBOCTAVE3MEX -ICommon/Base -ILinux/Base -ICommon/PsychPortAudio -ICommon/Screen Common/Base/*.cc Linux/Base/*.c Common/Base/*.c Common/PsychPortAudio/*.c /usr/local/lib/libportaudio.a -lc -lrt -lasound + mex -v -g --output ../Projects/Linux/build/PsychPortAudio.mex -DPTBMODULE_PsychPortAudio -DPTBOCTAVE3MEX -ICommon/Base -ILinux/Base -ICommon/PsychPortAudio -ICommon/Screen Common/Base/*.cc Linux/Base/*.c Common/Base/*.c Common/PsychPortAudio/*.c ../Cohorts/PortAudio/libportaudio.a -lc -lrt -lasound unix(['mv ../Projects/Linux/build/PsychPortAudio.mex ' PsychtoolboxRoot target]); striplibsfrommexfile([PsychtoolboxRoot target 'PsychPortAudio.mex']); end debian/patches/series0000644000000000000000000000034512260413325012032 0ustar up_portaudio_patches deb_fail_if_mex_doesnotexists_while_stripping deb_use_system_GLEW deb_portaudio_Makefile deb_portaudio_usebuilt_a deb_see_README.Debian deb_psychtoolboxversion deb_consistent_octave_outdir deb_no_special_arm debian/patches/deb_fail_if_mex_doesnotexists_while_stripping0000644000000000000000000000065012260413325022075 0ustar --- a/PsychSourceGL/Source/striplibsfrommexfile.m +++ b/PsychSourceGL/Source/striplibsfrommexfile.m @@ -54,7 +54,8 @@ if exist(filename, 'file') fprintf('MEX file %s stripped from superfluous libraries.\n', filename); else - fprintf('WARNING! MEX file %s does not exist! Can''t strip it!\n', filename); + fprintf('ERROR! MEX file %s does not exist! Can''t strip it!\n', filename); + exit(1); end return debian/patches/deb_use_system_GLEW0000644000000000000000000000776312260413325014403 0ustar --- a/PsychSourceGL/Source/Common/Base/PsychIncludes.h +++ b/PsychSourceGL/Source/Common/Base/PsychIncludes.h @@ -47,7 +47,7 @@ typedef __CHAR16_TYPE__ char16_t; // for all OpenGL definitions and functions, currently up to // OpenGL 2.1: #if defined(PTBMODULE_Screen) || defined(PTBMODULE_FontInfo) -#include "../Screen/glew.h" +#include #endif //platform dependent includes stage 1 @@ -63,7 +63,7 @@ typedef __CHAR16_TYPE__ char16_t; // This is the new glew include for GLX extension support: #if defined(PTBMODULE_Screen) - #include "../Screen/glxew.h" + #include #endif #include --- a/Psychtoolbox/PsychOpenGL/MOGL/source/mogltypes.h +++ b/Psychtoolbox/PsychOpenGL/MOGL/source/mogltypes.h @@ -32,7 +32,7 @@ /* glew.h is part of GLEW library for automatic detection and binding of OpenGL core functionality and extensions. */ -#include "glew.h" +#include /* Includes specific to MacOS-X version of mogl: */ #ifdef MACOSX @@ -57,7 +57,7 @@ #include #include #include -#include "glxew.h" +#include #include #include #include --- a/Psychtoolbox/PsychOpenGL/MOGL/source/mogl_rebinder.c +++ b/Psychtoolbox/PsychOpenGL/MOGL/source/mogl_rebinder.c @@ -4,7 +4,7 @@ * */ -#include "glew.h" +#include // Dynamic extension rebinding: This is in an extra file mogl_rebinder.c and defined // with explicit C linkage. Reason: For the Octave version, we need to compile all --- a/PsychSourceGL/Source/linuxmakeitoctave3.m +++ b/PsychSourceGL/Source/linuxmakeitoctave3.m @@ -41,7 +41,7 @@ if mode==0 else % Build against system installed GStreamer, backwards compatible to % old Linux distros. This is the default for production builds: - mex -v -g "-W -std=gnu99" --output ../Projects/Linux/build/Screen.mex -DPTBMODULE_Screen -DPTB_USE_GSTREAMER -DPTBVIDEOCAPTURE_LIBDC -DPTBOCTAVE3MEX -D_GNU_SOURCE -I/usr/X11R6/include -I/usr/include/gstreamer-0.10 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/libxml2 -ICommon/Base -ICommon/Screen -ILinux/Base -ILinux/Screen -L/usr/X11R6/lib Common/Base/*.cc Linux/Base/*.c Linux/Screen/*.c Common/Screen/*.c Common/Base/*.c -lc -ldl -lrt -lGL -lGLU -lX11 -lXext -lgstreamer-0.10 -lgstbase-0.10 -lgstapp-0.10 -lgstinterfaces-0.10 -lgobject-2.0 -lgmodule-2.0 -lxml2 -lgthread-2.0 -lglib-2.0 -lXxf86vm -ldc1394 -lusb-1.0 -lpciaccess -lXi -lXrandr -lXfixes + mex -v -g "-W -std=gnu99" --output ../Projects/Linux/build/Screen.mex -DPTBMODULE_Screen -DPTB_USE_GSTREAMER -DPTBVIDEOCAPTURE_LIBDC -DPTBOCTAVE3MEX -D_GNU_SOURCE -I/usr/X11R6/include -I/usr/include/gstreamer-0.10 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/libxml2 -ICommon/Base -ICommon/Screen -ILinux/Base -ILinux/Screen -L/usr/X11R6/lib Common/Base/*.cc Linux/Base/*.c Linux/Screen/*.c Common/Screen/*.c Common/Base/*.c -lc -ldl -lrt -lGL -lGLU -lX11 -lXext -lgstreamer-0.10 -lgstbase-0.10 -lgstapp-0.10 -lgstinterfaces-0.10 -lgobject-2.0 -lgmodule-2.0 -lxml2 -lgthread-2.0 -lglib-2.0 -lXxf86vm -ldc1394 -lusb-1.0 -lpciaccess -lGLEW -lXi -lXrandr -lXfixes end unix(['mv ../Projects/Linux/build/Screen.mex ' PsychtoolboxRoot target]); @@ -106,7 +106,7 @@ if mode==6 curdir = pwd; cd('../../Psychtoolbox/PsychOpenGL/MOGL/source/') try - mex -v -g --output moglcore.mex -DLINUX -DGLEW_STATIC -DPTBOCTAVE3MEX -I/usr/X11R6/include -L/usr/X11R6/lib -lc -lGL -lGLU -lglut moglcore.c gl_auto.c gl_manual.c glew.c mogl_rebinder.c ftglesGlue.c + mex -v -g --output moglcore.mex -DLINUX -DPTBOCTAVE3MEX -I/usr/X11R6/include -L/usr/X11R6/lib -lc -lGL -lGLU -lglut -lGLEW moglcore.c gl_auto.c gl_manual.c mogl_rebinder.c ftglesGlue.c catch end unix(['mv moglcore.mex ' PsychtoolboxRoot target]); debian/patches/deb_local_PsychtoolboxRoot0000644000000000000000000000043712260413325016067 0ustar --- a/PsychSourceGL/Source/linuxmakeitoctave3.m +++ b/PsychSourceGL/Source/linuxmakeitoctave3.m @@ -13,6 +13,9 @@ if nargin < 1 mode = 0; end; +% In-source-tree building +PsychtoolboxRoot = '../../Psychtoolbox/' + fprintf('Building plugin type %i ...\n\n', mode); if mode==0 debian/run_tests0000755000000000000000000001002512260413325011136 0ustar #!/bin/bash #emacs: -*- mode: shell-script; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- #ex: set sts=4 ts=4 sw=4 noet: #-------------------------- =+- Shell script -+= -------------------------- # # @file run_tests.sh # @date Tue Aug 9 19:18:57 2011 # @brief # # # Yaroslav Halchenko Dartmouth # web: http://www.onerussian.com College # e-mail: yoh@onerussian.com ICQ#: 60653192 # # DESCRIPTION (NOTES): # # Little helper script to check either tests/demos # # COPYRIGHT: Yaroslav Halchenko 2011 # # LICENSE: MIT # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal # in the Software without restriction, including without limitation the rights # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell # copies of the Software, and to permit persons to whom the Software is # furnished to do so, subject to the following conditions: # # The above copyright notice and this permission notice shall be included in # all copies or substantial portions of the Software. # # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. # #-----------------\____________________________________/------------------ set -u verbose=1 out=build/tests_output_`date +"20%y%m%d%H%M%S"` mkdir -p "$out" echo "I: Storing logs and output under $out" basedir=$PWD out=$PWD/$out # make it full path XVFB_OPTS="-screen 0 1024x768x24 -ac +extension GLX +render -noreset" PATH_CMDS="addpath (genpath ('$PWD/Psychtoolbox')); addpath('$PWD/Psychtoolbox/PsychBasic/Octave3LinuxFiles/');" failed= { for f in "$@"; do # Set time limit depending on either it is a test or a demo [[ $f =~ PsychTests ]] && timelimit=30 || timelimit=15 timeescape=$(($timelimit - 5)) timelimitkill=$(($timelimit + 5)) echo -n "I: $f: "; fbase=$(basename $f) fdir=$(dirname $f) outlog="$out/${fbase%.*}.log" # if it is a function -- eval it, otherwise run the script if true; then # grep -v '^[% ]*$' $f | head -1 | grep -q -e '^ *function'; then test="${fbase%.m}" # Some tests/demos might like to have initial kick to # start them, so let's press Enter if script contains # KbStrokeWait anywhere if grep -q KbStrokeWait $f; then keypress="( sleep 2; xdotool key Return ) &" else keypress= fi # cd to the test's directory since it might needs some of # local files there cd $fdir xvfb-run --auto-servernum --server-num=20 -s "$XVFB_OPTS" \ bash -c "$keypress ( sleep $timeescape; xdotool key Escape Escape Escape Escape Escape Escape Escape 2>/dev/null 1>&2; ) & \ timeout --kill-after=$timelimitkill $timelimit \ octave -q --eval \"$PATH_CMDS; PsychTweak('PrepareForVirtualMachine'); $test\" >| $outlog 2>&1" rv=$? cd "$basedir" else # just run it then # XXX -- TODO #timeout --kill-after=$timelimitkill $timelimit \ # octave -q $f >| $outlog 2>&1 echo -n "I: Skipping since it is not a function " rv=123 fi # time to kill our xdotool #kill %1 &>/dev/null || : if [ $rv = 124 ]; then st='TIMEOUT'; elif [ $rv = 123 ]; then st='SKIPPED'; elif [ $rv = 0 ]; then st='OK'; else fout="`grep -v octave-core $outlog | tail -1`"; st="E: FAILED $fout"; [ x"$verbose" = x ] || { echo; sed -e 's,^, D: ,g' $outlog; } echo $f >> $out/failed.log fi echo $st done; } | tee $out.log if [ -e $out/failed.log ]; then echo "I: We are failing since following tests failed:" cat $out/failed.log echo "I: see full log at $out.log" exit 1 fi debian/README.Debian0000644000000000000000000000273612260413325011235 0ustar psychtoolbox-3 for Debian ------------------------- Real-time scheduling and memory locking priorities ================================================== For better control over timing, PTB tries to use real-time scheduling policy for the running process and perform memory locking of necessary memory resources. To allow for such operations to be performed there are few alternative solutions limits.conf ~~~~~~~~~~~ System administrator must allow users running PTB to set RT scheduling and memory locking for their tasks but adding following entries to /etc/security/limits.conf :: username - rtprio 95 username - memlock 1500000 where username should be the login or a @somegroup, if created, where user belongs (e.g. addgroup ptb; adduser username ptb; and then use @ptb in the lines above) Linux capabilities ~~~~~~~~~~~~~~~~~~ as root: setcap cap_sys_nice=eip `readlink -f /usr/bin/octave` to allow control over the scheduler for the octave, and setcap cap_sys_nice= `readlink -f /usr/bin/octave` to disallow later on Root execution ~~~~~~~~~~~~~~ Least recommended -- run octave as root. Stale GL window =============== In case of execution failure, opened window might remain occupying the screen while interactive session already switched back to Octave/Matlab. To resolve -- either exit Octave/Matlab altogether by blindly entering a command sca and hitting ENTER -- Yaroslav Halchenko , Thu, 20 Jan 2011 12:13:49 -0500 debian/psychtoolbox-3.doc-base0000644000000000000000000000112012260413325013452 0ustar Document: psychtoolbox-3 Title: Debian psychtoolbox-3 Manual Author: Abstract: This manual describes what psychtoolbox-3 is and how it can be used to manage online manuals on Debian systems. Section: unknown Format: debiandoc-sgml Files: /usr/share/doc/psychtoolbox-3/psychtoolbox-3.sgml.gz Format: postscript Files: /usr/share/doc/psychtoolbox-3/psychtoolbox-3.ps.gz Format: text Files: /usr/share/doc/psychtoolbox-3/psychtoolbox-3.text.gz Format: HTML Index: /usr/share/doc/psychtoolbox-3/html/index.html Files: /usr/share/doc/psychtoolbox-3/html/*.html debian/octave-psychtoolbox-3.links.in0000644000000000000000000000010212260413325015000 0ustar /usr/share/psychtoolbox-3 /usr/share/octave/site/m/psychtoolbox-3 debian/control0000644000000000000000000002006712260413325010574 0ustar Source: psychtoolbox-3 Section: science Priority: extra Maintainer: NeuroDebian Team Uploaders: Yaroslav Halchenko , Michael Hanke Build-Depends: debhelper (>= 7.0.50~), rsync, matlab-support-dev, octave-pkg-dev (>= 0.5.7), gfortran, libpciaccess-dev, libxml2-dev, libglib2.0-dev, libxxf86vm-dev, libglu1-mesa-dev, libxext-dev, libxfixes-dev, libxi-dev, libxrandr-dev, libglew-dev (>= 1.9.0~) | libglew1.9-dev, freeglut3-dev, libgstreamer-plugins-base0.10-dev, libdc1394-22-dev, libusb-1.0-0-dev (>= 2:1.0.9~), libfreenect-dev (>= 0.1.2), libfontconfig1-dev, libfreetype6-dev, libasound2-dev, libopenal-dev, xvfb, xauth, libgl1-mesa-dri, xdotool, pulseaudio-utils, octave-image, gstreamer0.10-plugins-base, gstreamer0.10-plugins-good, gnuplot-nox | gnuplot, Build-Conflicts: libglew-dev (= 1.9.0.is.1.8.0-0ubuntu1), libglew-dev (= 1.9.0.is.1.8.0-0ubuntu2) Standards-Version: 3.9.3 Homepage: http://psychtoolbox.org Vcs-Browser: http://git.debian.org/?p=pkg-exppsy/psychtoolbox-3.git Vcs-Git: git://git.debian.org/git/pkg-exppsy/psychtoolbox-3.git Package: psychtoolbox-3-common Architecture: all Depends: ${misc:Depends} Recommends: subversion Suggests: gnuplot Description: toolbox for vision research -- arch/interpreter independent part Psychophysics Toolbox Version 3 (PTB-3) is a free set of Matlab and GNU/Octave functions for vision research. It makes it easy to synthesize and show accurately controlled visual and auditory stimuli and interact with the observer. . The Psychophysics Toolbox interfaces between Matlab or Octave and the computer hardware. The Psychtoolbox's core routines provide access to the display frame buffer and color lookup table, allow synchronization with the vertical retrace, support millisecond timing, allow access to OpenGL commands, and facilitate the collection of observer responses. Ancillary routines support common needs like color space transformations and the QUEST threshold seeking algorithm. . This package contains architecture independent files (such as .m scripts) Package: psychtoolbox-3-lib Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: gstreamer0.10-plugins-base, gstreamer0.10-plugins-good, gstreamer0.10-plugins-bad, gstreamer0.10-plugins-ugly, Description: toolbox for vision research -- arch-specific parts Psychophysics Toolbox Version 3 (PTB-3) is a free set of Matlab and GNU/Octave functions for vision research. It makes it easy to synthesize and show accurately controlled visual and auditory stimuli and interact with the observer. . The Psychophysics Toolbox interfaces between Matlab or Octave and the computer hardware. The Psychtoolbox's core routines provide access to the display frame buffer and color lookup table, allow synchronization with the vertical retrace, support millisecond timing, allow access to OpenGL commands, and facilitate the collection of observer responses. Ancillary routines support common needs like color space transformations and the QUEST threshold seeking algorithm. . This package contains additional binaries (tools/dynamic libraries) used by both Octave and Matlab frontends. Package: octave-psychtoolbox-3 Architecture: any Depends: ${octave:Depends}, ${shlibs:Depends}, ${misc:Depends}, psychtoolbox-3-common (= ${source:Version}), psychtoolbox-3-lib (= ${binary:Version}), Recommends: octave-audio, octave-image, octave-optim, octave-signal, octave-statistics, Provides: psychtoolbox, psychtoolbox-3 Description: toolbox for vision research -- Octave bindings Psychophysics Toolbox Version 3 (PTB-3) is a free set of Matlab and GNU/Octave functions for vision research. It makes it easy to synthesize and show accurately controlled visual and auditory stimuli and interact with the observer. . The Psychophysics Toolbox interfaces between Matlab or Octave and the computer hardware. The Psychtoolbox's core routines provide access to the display frame buffer and color lookup table, allow synchronization with the vertical retrace, support millisecond timing, allow access to OpenGL commands, and facilitate the collection of observer responses. Ancillary routines support common needs like color space transformations and the QUEST threshold seeking algorithm. . See also http://www.psychtoolbox.org/UsingPsychtoolboxOnUbuntu for additional information about systems tune-up and initial configuration. . This package contains bindings for Octave. Package: psychtoolbox-3-dbg Section: debug Architecture: any Depends: ${misc:Depends}, octave-psychtoolbox-3 (= ${binary:Version}) Description: toolbox for vision research -- debug symbols for binaries Psychophysics Toolbox Version 3 (PTB-3) is a free set of Matlab and GNU/Octave functions for vision research. It makes it easy to synthesize and show accurately controlled visual and auditory stimuli and interact with the observer. . The Psychophysics Toolbox interfaces between Matlab or Octave and the computer hardware. The Psychtoolbox's core routines provide access to the display frame buffer and color lookup table, allow synchronization with the vertical retrace, support millisecond timing, allow access to OpenGL commands, and facilitate the collection of observer responses. Ancillary routines support common needs like color space transformations and the QUEST threshold seeking algorithm. . To ease debugging and troubleshooting this package contains debug symbols for Octave bindings and other binaries. #Package: matlab-psychtoolbox-3 #Section: contrib/science #Architecture: all #Provides: psychtoolbox, psychtoolbox-3 #Depends: ${octave:Depends}, ${shlibs:Depends}, ${misc:Depends}, # matlab-support, # psychtoolbox-3-common (= ${source:Version}), #Description: toolbox for vision research -- Matlab bindings # Psychophysics Toolbox Version 3 (PTB-3) is a free set of Matlab and # GNU/Octave functions for vision research. It makes it easy to # synthesize and show accurately controlled visual and auditory stimuli # and interact with the observer. # . # The Psychophysics Toolbox interfaces between Matlab or Octave and the # computer hardware. The Psychtoolbox's core routines provide access to # the display frame buffer and color lookup table, allow # synchronization with the vertical retrace, support millisecond # timing, allow access to OpenGL commands, and facilitate the # collection of observer responses. Ancillary routines support common # needs like color space transformations and the QUEST threshold # seeking algorithm. # . # This package contains sources of low-level implementations which get # build for use with Matlab during installation. Note that this # package depends on Matlab -- a commercial software that needs to be # obtain and installed separately. #Package: psychtoolbox-3-doc #Section: doc #Architecture: all #Depends: ${misc:Depends}, #Description: toolbox for vision research -- documentation # Psychophysics Toolbox Version 3 (PTB-3) is a free set of Matlab and # GNU/Octave functions for vision research. It makes it easy to # synthesize and show accurately controlled visual and auditory stimuli # and interact with the observer. # . # The Psychophysics Toolbox interfaces between Matlab or Octave and the # computer hardware. The Psychtoolbox's core routines provide access to # the display frame buffer and color lookup table, allow # synchronization with the vertical retrace, support millisecond # timing, allow access to OpenGL commands, and facilitate the # collection of observer responses. Ancillary routines support common # needs like color space transformations and the QUEST threshold # seeking algorithm. # . # This package contains documentation files. debian/octave-psychtoolbox-3.dirs0000644000000000000000000000004212260413325014217 0ustar usr/lib/psychtoolbox-3/PsychBasic debian/rules0000755000000000000000000002205512260413325010250 0ustar #!/usr/bin/make -f # -*- makefile -*- # get Octave paths include /usr/share/octave/debian/defs.make # get Matlab paths include /usr/share/matlab/debian/defs.make srcpkg = $(shell LC_ALL=C dpkg-parsechangelog | grep '^Source:' | cut -d ' ' -f 2,2) debver = $(shell LC_ALL=C dpkg-parsechangelog | grep '^Version:' | cut -d ' ' -f 2,2 ) uver = $(shell echo $(debver) | sed -e 's,-[^-]*$$,,g' ) uver_nondfsg = $(shell echo $(uver) | sed -e 's,.dfsg[0-9]*,,g') # Directories which are created/populated/cleanedup BDIRS=Psychtoolbox/PsychBasic/Octave3LinuxFiles Psychtoolbox/PsychBasic/PsychPlugins OCT_SHAREDDIR=debian/psychtoolbox-3-common/usr/share/psychtoolbox-3 OCT_LIBDIR=debian/octave-psychtoolbox-3/usr/lib/psychtoolbox-3 export LDFLAGS=-Wl,--as-needed # Critical for building on machines with multiarch support # (e.g. ubuntu 11.04) GLIB_INCLUDES=$(shell pkg-config --cflags glib-2.0) # Upstream advises to build without optimization at the moment export CXXFLAGS=-Wall -g -O0 export CFLAGS=-Wall -g -O0 -std=gnu99 $(GLIB_INCLUDES) # Let's use "advanced" bash patterns export SHELL=/bin/bash %: dh $@ override_dh_auto_build: build-stamp build-stamp: mkdir -p $(BDIRS) : # Build patched version of portaudio : # dependent on patch deb_portaudio_Makefile $(MAKE) -C PsychSourceGL/Cohorts/PortAudio : # Build all extensions, but: : # 3 dependent on portaudio above : # 4 libeyelink -- non-distributable binary blob with open-sourced API cd PsychSourceGL/Source/; \ for mode in 0 1 2 3 5 6 7 8 9; do \ octave -p $(CURDIR)/Psychtoolbox/PsychOneliners -q --eval "linuxmakeitoctave3($$mode)" || exit 1; \ done : # Manually build OpenGL text renderer extension cd PsychSourceGL/Cohorts/FTGLTextRenderer; \ $(CXX) $(CXXFLAGS) -I. -I/usr/include/ -I/usr/include/freetype2/ \ -L/usr/lib -pie -shared -fPIC \ -Wl,-Bsymbolic -Wl,-Bsymbolic-functions \ -Wl,--version-script=linuxexportlist.txt \ -o libptbdrawtext_ftgl.so.1 \ libptbdrawtext_ftgl.cpp qstringqcharemulation.cpp OGLFT.cpp \ -lGL -lGLU -lfontconfig -lfreetype : # Manually build tcp_udp_ip toolbox's extension cd ./Psychtoolbox/PsychHardware/iViewXToolbox/tcp_udp_ip; \ octave -q --eval "mex pnet.c"; [ -f pnet.mex ] install --mode=0644 PsychSourceGL/Cohorts/FTGLTextRenderer/libptbdrawtext_ftgl.so.1 \ Psychtoolbox/PsychBasic/PsychPlugins touch $@ override_dh_auto_test: ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) : # Smoke test some Demos and Tests -- some are excluded for various reasons : # image would be needed for one of the demos cd Psychtoolbox/PsychDemos/PsychTutorials/; ln -sf ../konijntjes1024x768*.jpg . cd Psychtoolbox/PsychTests/; ln -sf ../PsychDemos/konijntjes1024x768*.jpg . find Psychtoolbox/PsychDemos Psychtoolbox/PsychTests -type f -iname *.m \ | grep -v -e "FAILURES DUE TO ABSENT FUNCTIONALITY IN TEST ENVIRONMENT" \ -e Contents -e Stereo -e Serial -e PsychCV \ -e Cedrus -e BitsPlus -e Kinect -e GPGPU -e DualHeads -e DaqTest \ -e Matlab -e FitCumNormYNTest -e OSAUCSTest -e FitGammaPow -e FitGammaDemo \ -e DirectInputMonitoringTest \ -e OldNewReco -e AlphaImageDemo/[^A] \ -e ClutAnimDemo -e MinimumMotionExp -e AdditiveBlendingForLinearSuperpositionTutorial \ -e ImagingVideoCaptureDemo -e AudioTunnel3DDemo \ -e DetectionRTInVideoDemo \ -e VideoRecordingDemo -e PlayMoviesDemo -e PlayInterlacedMovieDemo \ -e ErrorCatchDemo -e MovieDemo\.m -e VideoTextureExtractionDemo \ -e VideoCapture \ -e DatarecordingFromISCANDemo -e PsychRTBoxDemo \ -e BlurredMipmapDemo \ -e Tests.*Timing -e HIDIntervalTest \ -e HighPrecisionLuminanceOutputDrivers -e HIDTest \ -e SyncedCLUTUpdateTest -e GetSecsTest -e ConvolutionKernelTest \ -e OSSchedulingAccuracyTest -e PTBAndVSETColorimetryTest \ -e LoadGenerator \ | grep -v -e "REQUIRE SOUND I/O (more in above list)" \ -e Sound -e Audio -e BasicAMAndMixScheduleDemo -e SimpleVoiceTriggerDemo \ -e KeyboardLatencyTest \ -e LoadMovieIntoTexturesDemo -e PlayMoviesWithoutGapDemo2 \ | grep -v -e "REQUIRE USER INPUT (more in the first list (TODO))" \ -e RenderDemo -e CalDemo -e KbDemo -e KbQueueDemo \ | grep -v -e "REQUIRE TOO LONG TO COMPLETE (and otherwise doesn't exit)" \ -e QuestTest \ | grep -v -e "KNOWN FAILURES TO BE FIXED (more in the first list (TODO))" \ -e PlayMoviesWithoutGapDemo1 \ -e FitWeibull.*Test -e DeinterlacerTest -e FitConeFundamentalsTest \ -e AlphaMultiplicationTest -e MinExpEntStairDemo \ | grep -v -e "REQUIRE SOME ADDITIONAL CMDLINE TOOLS AND SPECIAL HW" \ -e PTBAndIsetbioColorimetryTest \ | xargs debian/run_tests || echo "TESTS FAILED" # -e MovieDemos \ : # Cleanup find -iname MLIexpSubj11.txt -delete else : # Skip unittests due to nocheck endif override_dh_auto_install: dh_auto_install : # to guarantee -common existance for arch-dep builds only: mkdir -p $(OCT_SHAREDDIR) rsync -a --exclude=*.o ./Psychtoolbox/ $(OCT_SHAREDDIR) : # Move .mex to reside alongside with .m to gain easy help in octave mv $(OCT_SHAREDDIR)/PsychBasic/Octave3LinuxFiles/* $(OCT_SHAREDDIR)/PsychBasic : # But PsychHID must go into PsychHardware alongside with .m mv $(OCT_SHAREDDIR)/PsychBasic/PsychHID.mex $(OCT_SHAREDDIR)/PsychHardware rmdir $(OCT_SHAREDDIR)/PsychBasic/Octave3LinuxFiles : # Move .mex binaries under /usr/lib and create symlinks file to point back mkdir -p $(OCT_LIBDIR) cp debian/octave-psychtoolbox-3.links.in debian/octave-psychtoolbox-3.links find $(OCT_SHAREDDIR)/ -iname \*.mex | while read f; do \ fn=$$(basename $$f); ds=$$(dirname $$f); \ dl=$$(echo $$ds | sed -e 's,psychtoolbox-3-common,octave-psychtoolbox-3,g' -e 's,/share/,/lib/,g'); \ echo "I: Moving $$f under $$dl"; \ mkdir -p $$dl; \ mv $$f $$dl; \ echo "/usr/lib$${f#*usr/share} /usr$${f#*usr}" >> debian/octave-psychtoolbox-3.links; \ done cp debian/psychtoolbox-3-lib.links.in debian/psychtoolbox-3-lib.links find $(OCT_SHAREDDIR)/ -iname \*.so* -o -iname \*.a | while read f; do \ fn=$$(basename $$f); ds=$$(dirname $$f); \ dl=$$(echo $$ds | sed -e 's,psychtoolbox-3-common,psychtoolbox-3-lib,g' -e 's,/share/,/lib/,g'); \ echo "I: Moving $$f under $$dl"; \ mkdir -p $$dl; \ mv $$f $$dl; \ echo "/usr/lib$${f#*usr/share} /usr$${f#*usr}" >> debian/psychtoolbox-3-lib.links; \ done : # Filter out duplicate licenses etc find debian/ -iname 3Dlabs-License.txt -o \ -iname COPYING -o \ -iname *license.txt | xargs -r rm : # Filter out some scripts which aren't pertitent to Debian systems find debian/ -iname simplepsychtoolboxsetup.sh -o -iname setupdate.sh | xargs -r rm find debian/ -regextype posix-egrep -regex '.*/(Update|Setup|Download)Psychtoolbox\..*' -delete override_dh_makeshlibs: dh_makeshlibs : # Provide Octave:Depends [ -e /usr/bin/octave-depends ] \ && octave-depends \ || echo 'octave:Depends=octave (>= 3.4.3-1~)' >> debian/octave-psychtoolbox-3.substvars #override_dh_fixperms: # dh_fixperms override_dh_strip: dh_strip --dbg-package=psychtoolbox-3-dbg override_dh_shlibdeps: @: # octave will take care of proper deps for extensions -- no need to scan @: # them and warn all the time dh_shlibdeps -l$(shell octave-config --print OCTLIBDIR) : # Manually remove executable bit for everything not to be executed (e.g. .mex .m .so.*) @: # needs to be done post dh_strip,dh_shlibdeps so that .mex are found by dh_strip, dh_shlibdeps # find debian/ -regextype posix-egrep \ # -regex '.*\.(c|jpg|vert|frag|xml|html|hiro|kanji|mat|m|txt|mex|so(|\..*))' \ # -perm /+x -print0 \ @: # strip from all files since we do not have any real executable there find debian/ -ipath '*psych*/usr/*' -perm /+x -type f ! -iname ATIRadeonperf_Linux -print0 \ | xargs -0 --no-run-if-empty chmod a-x override_dh_installchangelogs: dh_installchangelogs debian/changelog.upstream override_dh_clean: dh_clean rm -rf build-stamp build : # Manually remove additional trash find Psych* -regextype posix-egrep -regex '.*\.(o|mex|so(|\..*))' -delete -rmdir $(BDIRS) : # Prune some Debian generated files rm -f debian/octave-psychtoolbox-3.links debian/psychtoolbox-3-lib.links $(MAKE) -C PsychSourceGL/Cohorts/PortAudio clean debian/changelog.upstream: git log --merges remotes/origin/beta >| $@ get-orig-source: debian/changelog.upstream @echo "I: Exporting free portion of `git describe dfsg`"; \ git archive --format=tar --prefix=$(srcpkg)-$(uver)/ dfsg | \ gzip -9 > $(srcpkg)_$(uver).orig.tar.gz # Fetch all those binary blobs to go into non-free binaries packages get-orig-source-nonfree: @beta_merge_base=$$(git merge-base origin/beta HEAD); \ echo "I: Exporting non-free portion of `git describe $$beta_merge_base`"; \ git archive --format=tar --prefix=$(srcpkg)-nonfree-$(uver_nondfsg)/ $$beta_merge_base -- \ ./Psychtoolbox/PsychBasic/*.mex{a64,glx} \ ./Psychtoolbox/PsychJava/GetCharJava.class \ ./PsychSourceGL/Cohorts/libwaffle/libwaffle*_glxegl \ ./Psychtoolbox/PsychBasic/Octave3LinuxFiles{,64}/{Eyelink,Datapixx}.mex \ ./Psychtoolbox/PsychHardware/iViewXToolbox/tcp_udp_ip/pnet.mex{a64,glx} \ | gzip -9 > $(srcpkg)-nonfree_$(uver_nondfsg).orig.tar.gz debian/source/0000755000000000000000000000000012260413325010464 5ustar debian/source/format0000644000000000000000000000001412260413325011672 0ustar 3.0 (quilt) debian/README.source0000644000000000000000000000031512260413325011342 0ustar psychtoolbox-3 for Debian ----------------------- debian/gbp.conf0000644000000000000000000000105012260413325010577 0ustar [DEFAULT] # the default branch for upstream sources: upstream-branch = dfsg # the default branch for the debian patch: debian-branch = debian # the default tag formats used: upstream-tag = %(version)s debian-tag = debian/%(version)s # Options only affecting git-buildpackage [git-buildpackage] # ignore some any non-gitted files ignore-new = True #upstream-branch = dfsgclean # uncomment this to automatically GPG sign tags sign-tags = True # use this for more svn-buildpackage like bahaviour: export-dir = ../build-area/ tarball-dir = ../tarballs/ debian/watch0000644000000000000000000000026312260413325010216 0ustar version=3 # at least lets monitor possible SVN tags opts="versionmangle=s/-//,dversionmangle=s/.dfsg.*$//" \ http://svn.berlios.de/svnroot/repos/osxptb Psychtoolbox-([^-]*)-*.* debian/TODO.org0000644000000000000000000001244712260413325010452 0ustar * kfreebsd builds > If the missing libdc1394 on the FreeBSD and Hurd targets (these are > just the kernels right?), is the only problem, that would be easy to > solve: Just remove this define in the CFLAGS: > -DPTBVIDEOCAPTURE_LIBDC and corresponding linker flags for -ldc1394 > for those targets. That would remove the high-performance firewire > video capture support, but should impose no other restrictions. * DownloadAdditions ** TODO Target directory must exist ** TODO calls savepath? * Installation ** TODO "Proper" "contrib" Matlab package ** TODO ptb3-matlab (and others) manpage ** TODO .desktop file ** TODO "Fancy" custom initial banner with NeuroDebian * libwaffle ** for some reason git archive even fails to include it if there is other stuff as well... bizzare -- no time ATM * TODO Portaudio -- upstream yet to forward them pa-upstream portaudio_unpatched_except4OSX.zip contained originals pa_front.c:#define PA_VERSION_ 1899 pa_front.c:#define PA_VERSION_TEXT_ "PortAudio V19-devel WITH-DIM" $Id: pa_asio.cpp 1097 2006-08-26 08:27:53Z rossb $ Upon inspection: pa_asio.cpp - patched, new function and tune-up pa_unix_util.c -- patch , conditioning on MK_PSYCH_RTSCHED pa_front.c, pa_process.c - pristine In Debian we have: - libportaudio0 18.1-7.1 (that is from 2005 or so) - libportaudio2 19+svn20071022-3+b1 upstream SVN is alive with 1-2 commits a month https://www.portaudio.com/repos/portaudio/trunk/ the latest "stable" snapshot seems to be from 20071207 while there exist additional snapshots after on http://www.portaudio.com/archives There was intent to upload a newer snapshot, but somehow it didn't happen http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560111 I followed up... Ubuntu adopted the packaging patches from SVN and progressed forward to freshier snapsh * Building ** TODO Consider building for excluded to be built externals: 4 libeyelink -- non-distributable binary blob with open-sourced API -- can't be redistributed, thus can't be enabled out of the box TODO: make easy to build eyelink support if library is available (during install time, similar to Matlab stuff) IViewXToolbox -- needs pnet.mex being built ... 1.0 version of tcpip toolbox (subdir and .zip) is stripped since not used ** TODO: Package Datapixx TB/lib, and build Datapixx.mex -- Datapixx is FOSS now under LGPL (? check if not changed) Native Datapixx bindings are different from Mario's contact: Peter April ** TODO Consider building PsychCV extension ** TODO Testing *** TODO Tests under Psychtoolbox/PsychTests { for f in *Test.m; do echo -n "TEST $f: "; octave -q $f 2>&1 && echo "OK" || echo "FAILED"; done; } | tee tests_output_`mdate`.log *** TODO Running demos: **** deprecation and failure: octave:3> IsomerizationsInDishDemo warning: function name `FIllInPhotoreceptors' does not agree with function file name `/home/yoh/deb/perspect/psychtoolbox/psychtoolbox.gitsvn/Psychtoolbox/PsychColorimetricData/FillInPhotoreceptors.m' warning: isstr is obsolete and will be removed from a future version of Octave, please use ischar instead warning: load: file found in load path error: `radiometer' undefined near line 39 column 40 error: evaluating argument list element number 1 error: evaluating argument list element number 1 error: called from: error: /home/yoh/deb/perspect/psychtoolbox/psychtoolbox.gitsvn/Psychtoolbox/PsychColorimetric/WattsToRetIrradiance.m at line 39, column 1 error: /home/yoh/deb/perspect/psychtoolbox/psychtoolbox.gitsvn/Psychtoolbox/PsychDemos/IsomerizationsInDishDemo.m at line 42, column 32 **** Times font Computed RGB: [0.597239 0.481301 0.501372] PTB-INFO: Using GLEW version 1.5.3 for automatic detection of OpenGL extensions... PTB-WARNING: Your graphics driver doesn't allow me to control syncing wrt. vertical retrace! PTB-WARNING: Please update your display graphics driver as soon as possible to fix this. PTB-WARNING: Until then, you can manually enable syncing to VBL somehow in a manner that is PTB-WARNING: dependent on the type of gfx-card and driver. Google is your friend... Failed to load X11 font with name Times. Available X11 fonts are: ** TODO -- ship PsychSourceGL/Cohorts/PortAudio/libportaudio.a in -lib to be used by Matlab builder * Running ** Helper package Mario's words of wisdom: Ja, ideally installing the psychtoolox package - or some optional "psychtoolbox-tuning" package - on debian or ubuntu should probably perform some tuning on the system. --> You install ptb, the system auto-tunes for optimal performance. E.g., 1. set the rtprio and memlock limits. 2. Create a "ptb" user group. 3. Maybe define special udev rules so the pci resources of gpu's get read/write memory mapping permissions for users in the "ptb" group. 4. Make sure that permissions on the firewire devices /dev/dc1394 (iirc) are so that "ptb" users can directly use them. 5. Automatically (as a dependency?) install a linux realtime kernel. 6. One could even pull in some dependencies on some diagnostic tools for troubleshooting, e.g., latencytop, powertop, intel gpu tools and such. 7. Configure system powermanagement, screensavers and desktop compositor to get out of the way. ... Some of this stuff would be useful for other (python'esque) toolkits as well. * Defects