cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable check for SNDCTL_DSP_GETBLKSIZE value since it doesn't make any

Browse Source 
sense and don't work with our uaudio driver. Problem reported and fixed
by Laurence Tratt <laurie@tratt.net>.
Regen patches and bump PKGNAME.
This commit is contained in:
grange 2007-05-02 17:51:16 +00:00
parent e137319740
commit e2cbd05872
4 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
audio/hydrogen/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.2 2006/10/08 16:41:59 grange Exp $
# $OpenBSD: Makefile,v 1.3 2007/05/02 17:51:16 grange Exp $
COMMENT= "software drum machine"
DISTNAME= hydrogen-0.9.3
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}p1
CATEGORIES= audio
HOMEPAGE= http://www.hydrogen-music.org/
MAINTAINER= Alexander Yurchenko <grange@openbsd.org>

8
audio/hydrogen/patches/patch-Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2006/09/25 18:56:00 grange Exp $
--- Makefile.in.orig Mon Sep 25 00:27:37 2006
+++ Makefile.in Mon Sep 25 00:28:00 2006
@@ -219,13 +219,12 @@ hydrogenCUI: hydrogenCUI.mak $(hydrogen_
$OpenBSD: patch-Makefile_in,v 1.2 2007/05/02 17:51:16 grange Exp $
--- Makefile.in.orig Thu Nov 10 21:00:08 2005
+++ Makefile.in Wed May 2 21:23:27 2007
@@ -219,13 +219,12 @@ hydrogenCUI: hydrogenCUI.mak $(hydrogen_headers) $(hyd
@make -f hydrogenCUI.mak hydrogenCUI
install:

20
audio/hydrogen/patches/patch-src_lib_drivers_OssDriver_cpp
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_lib_drivers_OssDriver_cpp,v 1.1.1.1 2006/09/25 18:56:00 grange Exp $
$OpenBSD: patch-src_lib_drivers_OssDriver_cpp,v 1.2 2007/05/02 17:51:16 grange Exp $
--- src/lib/drivers/OssDriver.cpp.orig Tue Oct 18 02:32:04 2005
+++ src/lib/drivers/OssDriver.cpp Mon Sep 25 00:10:41 2006
+++ src/lib/drivers/OssDriver.cpp Wed May 2 21:36:46 2007
@@ -41,6 +41,7 @@ unsigned nNextFrames = 0;
void* ossDriver_processCaller(void* param)
@ -9,7 +9,7 @@ $OpenBSD: patch-src_lib_drivers_OssDriver_cpp,v 1.1.1.1 2006/09/25 18:56:00 gran
// stolen from amSynth
struct sched_param sched;
sched.sched_priority = 50;
@@ -50,6 +51,7 @@ void* ossDriver_processCaller(void* para
@@ -50,6 +51,7 @@ void* ossDriver_processCaller(void* param)
m_pOssDriverInstance->warningLog("Can't set realtime scheduling for OSS Driver");
}
m_pOssDriverInstance->infoLog( "Scheduling priority = " + toString( sched.sched_priority ) );
@ -26,3 +26,17 @@ $OpenBSD: patch-src_lib_drivers_OssDriver_cpp,v 1.1.1.1 2006/09/25 18:56:00 gran
audioDevice = "/dev/audio";
#else
audioDevice = preferencesMng->m_sOSSDevice;
@@ -178,11 +180,13 @@ int OssDriver::connect() {
infoLog( "Blocksize audio = " + toString( bs ) );
+#ifndef __OpenBSD__
if (bs != ( 1 << bufferBits) ){
errorLog("ERROR_IOCTL: unable to set BlockSize");
close(fd);
return 1;
}
+#endif
int format = AFMT_S16_LE;
if (ioctl(fd, SNDCTL_DSP_SETFMT, &format) == -1) {

8
audio/hydrogen/patches/patch-src_lib_fx_LadspaFX_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_lib_fx_LadspaFX_cpp,v 1.1 2006/10/08 16:41:59 grange Exp $
--- src/lib/fx/LadspaFX.cpp.orig Sun Oct 8 20:22:06 2006
+++ src/lib/fx/LadspaFX.cpp Sun Oct 8 20:22:22 2006
@@ -449,7 +449,7 @@ vector<LadspaFXInfo*> LadspaFX::getPlugi
$OpenBSD: patch-src_lib_fx_LadspaFX_cpp,v 1.2 2007/05/02 17:51:16 grange Exp $
--- src/lib/fx/LadspaFX.cpp.orig Wed Nov 23 01:57:34 2005
+++ src/lib/fx/LadspaFX.cpp Wed May 2 21:23:27 2007
@@ -449,7 +449,7 @@ vector<LadspaFXInfo*> LadspaFX::getPluginList()
QDir dir( QString( sPluginDir.c_str() ) );
if (!dir.exists()) {
//Logger::getInstance()->log( "[LadspaFX::getPluginList] directory " + sPluginDir + " not found" );