non-sndio ports

classic Classic list List threaded Threaded
38 messages Options
12
Reply | Threaded
Open this post in threaded view
|

non-sndio ports

j4nKy

here's an update on what non-sndio using ports are left.  this may be
missing a few that also have sndio support.  currently xmms and jack
build audio(4) backends, but they will both be gone soon.  if you
know of a port that uses audio(4) or ossaudio(3) and isn't listed here,
let me know.

if you have tested or would like to test any of the "patches sent" or
WIPs let me know too.

audio(4) users:
port notes
-----------------------+--------------------------------------
audio/audacious-plugins also has sndio backend
audio/gqmpeg mixer only
audio/tracker patches sent to MAINTAINER
audio/xmms-fmradio mixer only
comms/gmfsk patches sent to ports@
emulators/frodo patches sent to MAINTAINER
emulators/fuse patches to use libao sent to ports@
emulators/snes9x patches sent to ports@
emulators/uae patches to use SDL sent to ports@
emulators/xmame WIP
games/crossfire-client patches sent to ports@ (we don't ship the sound files)
graphics/xanim
lang/squeak
net/bluetooth-tools uses O_ASYNC & libevent signal handling
net/ices2 WIP
net/ntp exposes device fd; ulaw only; currently inaccurate wrt latency
sysutils/xstatbar mixer only
x11/emiclock patches sent to ports@
x11/kde/multimedia3 mpeglib, not sure if it's actually used or not


ossaudio(3) users:
port notes
-----------------------+--------------------------------------
audio/ac3dec example player
audio/aumix mixer only
audio/cmu-sphinx3
audio/cmu-sphinxbase
audio/festival/core
audio/liba52 example player
audio/libdca example player
audio/mixer.app mixer only
audio/mppenc example player
audio/nosefart
audio/shell-fm also builds libao support
audio/sidplay
audio/tosha
audio/waveplay will be removed?
audio/wmix mixer
audio/wmmixer mixer
audio/xmix mixer
audio/xmmix mixer
comms/gpsk31
comms/tlf
devel/jdk/1.5 exposes device filehandle
devel/jdk/1.6 patches sent to MAINTAINER
editors/emacs21
editors/emacs22
emulators/qemu
emulators/wine
games/allegro patches sent to ports@
games/quake2 also builds SDL support
graphics/ffmpeg
graphics/flash
graphics/fxtv
graphics/synaesthesia
math/freemat
multimedia/avidemux
multimedia/gstreamer-0.10/plugins-good mixer?
multimedia/libquicktime example player
multimedia/recordmydesktop/base
sysutils/cdrtools example player: cdda2wav can output to audio device
sysutils/conky
sysutils/gkrellm/plugins/volume mixer
sysutils/tpb
x11/kde/multimedia3 mixer only
x11/kde4/multimedia
x11/kmplayer port marked as BROKEN
x11/wxWidgets
x11/xawtv

"example player" - basic player to demonstrate/test decoding library
"mixer only" - only uses mixer elements of audio(4) or ossaudio(3)

--
[hidden email]
SDF Public Access UNIX System - http://sdf.lonestar.org

Reply | Threaded
Open this post in threaded view
|

Re: non-sndio ports

Antoine Jacoutot-7
On Mon, 19 Apr 2010, Jacob Meuser wrote:
<...>
> multimedia/gstreamer-0.10/plugins-good mixer?

Yes, oss support is enabled only because we need mixer capability.


> multimedia/libquicktime example player
> multimedia/recordmydesktop/base
> sysutils/cdrtools example player: cdda2wav can output to audio device
> sysutils/conky
> sysutils/gkrellm/plugins/volume mixer
> sysutils/tpb
> x11/kde/multimedia3 mixer only
> x11/kde4/multimedia
> x11/kmplayer port marked as BROKEN
> x11/wxWidgets
> x11/xawtv
>
> "example player" - basic player to demonstrate/test decoding library
> "mixer only" - only uses mixer elements of audio(4) or ossaudio(3)
>
>

--
Antoine

Reply | Threaded
Open this post in threaded view
|

Re: non-sndio ports

j4nKy
In reply to this post by j4nKy
On Mon, Apr 19, 2010 at 09:51:01AM +0000, Jacob Meuser wrote:
>
> here's an update on what non-sndio using ports are left.  this may be
> missing a few that also have sndio support.  currently xmms and jack
> build audio(4) backends, but they will both be gone soon.  if you
> know of a port that uses audio(4) or ossaudio(3) and isn't listed here,
> let me know.
>
> if you have tested or would like to test any of the "patches sent" or
> WIPs let me know too.

and if you plan on updating any of the ports, let me know *NOW* before
I spend *HOURS* to make them work, only to have that work be worthless.
thanks.


> audio(4) users:
> port notes
> -----------------------+--------------------------------------
> audio/audacious-plugins also has sndio backend
> audio/gqmpeg mixer only
> audio/tracker patches sent to MAINTAINER
> audio/xmms-fmradio mixer only
> comms/gmfsk patches sent to ports@
> emulators/frodo patches sent to MAINTAINER
> emulators/fuse patches to use libao sent to ports@
> emulators/snes9x patches sent to ports@
> emulators/uae patches to use SDL sent to ports@
> emulators/xmame WIP
> games/crossfire-client patches sent to ports@ (we don't ship the sound files)
> graphics/xanim
> lang/squeak
> net/bluetooth-tools uses O_ASYNC & libevent signal handling
> net/ices2 WIP
> net/ntp exposes device fd; ulaw only; currently inaccurate wrt latency
> sysutils/xstatbar mixer only
> x11/emiclock patches sent to ports@
> x11/kde/multimedia3 mpeglib, not sure if it's actually used or not
>
>
> ossaudio(3) users:
> port notes
> -----------------------+--------------------------------------
> audio/ac3dec example player
> audio/aumix mixer only
> audio/cmu-sphinx3
> audio/cmu-sphinxbase
> audio/festival/core
> audio/liba52 example player
> audio/libdca example player
> audio/mixer.app mixer only
> audio/mppenc example player
> audio/nosefart
> audio/shell-fm also builds libao support
> audio/sidplay
> audio/tosha
> audio/waveplay will be removed?
> audio/wmix mixer
> audio/wmmixer mixer
> audio/xmix mixer
> audio/xmmix mixer
> comms/gpsk31
> comms/tlf
> devel/jdk/1.5 exposes device filehandle
> devel/jdk/1.6 patches sent to MAINTAINER
> editors/emacs21
> editors/emacs22
> emulators/qemu
> emulators/wine
> games/allegro patches sent to ports@
> games/quake2 also builds SDL support
> graphics/ffmpeg
> graphics/flash
> graphics/fxtv
> graphics/synaesthesia
> math/freemat
> multimedia/avidemux
> multimedia/gstreamer-0.10/plugins-good mixer?
> multimedia/libquicktime example player
> multimedia/recordmydesktop/base
> sysutils/cdrtools example player: cdda2wav can output to audio device
> sysutils/conky
> sysutils/gkrellm/plugins/volume mixer
> sysutils/tpb
> x11/kde/multimedia3 mixer only
> x11/kde4/multimedia
> x11/kmplayer port marked as BROKEN
> x11/wxWidgets
> x11/xawtv
>
> "example player" - basic player to demonstrate/test decoding library
> "mixer only" - only uses mixer elements of audio(4) or ossaudio(3)
>
> --
> [hidden email]
> SDF Public Access UNIX System - http://sdf.lonestar.org

--
[hidden email]
SDF Public Access UNIX System - http://sdf.lonestar.org

Reply | Threaded
Open this post in threaded view
|

Re: non-sndio ports

f.holop
In reply to this post by j4nKy
re aucat et al, i was wondering,
will it ever make /etc/rc.conf?

for me, the ocassional music listener
plus movie watcher, what are the
obvious reasons i should be running the
aucat sound server?

there has been tons of changes since
aucat graduated into the source tree,
someone knowledgeable might do a nice
writeup (maybe on undeadly?) what advanced
audio scenarios have now became available
because of this technology.

perhaps this seems like a stupid mail,
but i am not really an audio person outside
the simple audio(4) consuming but i have
been making circles around aucat for a while now
not really sure how could i take advantage of it.

help us poor audio illiterates to appreciate
aucat in its fullest potential :]

-f
--
jury: a group chosen to decide who has the best lawyer.

Reply | Threaded
Open this post in threaded view
|

Re: non-sndio ports

Floor Terra
On Tue, Apr 20, 2010 at 9:34 PM, frantisek holop <[hidden email]> wrote:

> re aucat et al, i was wondering,
> will it ever make /etc/rc.conf?
>

As far as I know, aucat doesn't work for multi-user (yet?).
Just put the following line in your .profile:
pgrep -x aucat > /dev/null || aucat -l -v 103


>
> for me, the ocassional music listener
> plus movie watcher, what are the
> obvious reasons i should be running the
> aucat sound server?
>

Nice mixing of multiple audio streams.

Floor


--
Floor Terra <[hidden email]>
www: http://brobding.mine.nu/
Reply | Threaded
Open this post in threaded view
|

Re: non-sndio ports

Alexander Shadchin
In reply to this post by j4nKy
On Mon, Apr 19, 2010 at 15:51:01 +0600, Jacob Meuser wrote:

> audio/waveplay will be removed?

It is high time to remove :) aucat does same.

> math/freemat

FreeMat uses audio/portaudio-svn, portaudio-svn uses sndio.
Simply forgot to remove ossaudio. Patch attached.

In Ports there is a whole branch that uses ossaudio - lang/python.
If I find time, then try to convert Python on sndio.

--
Alexandr Shadchin

freemat.diff (1K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: non-sndio ports

Edd Barrett
In reply to this post by Floor Terra
On Tue, Apr 20, 2010 at 09:52:19PM +0200, Floor Terra wrote:
> On Tue, Apr 20, 2010 at 9:34 PM, frantisek holop <[hidden email]> wrote:
> As far as I know, aucat doesn't work for multi-user (yet?).

You can share the socket by setting permissions and then symlinking one for each
user that needs it.

--
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk

Reply | Threaded
Open this post in threaded view
|

Re: non-sndio ports

j4nKy
In reply to this post by f.holop
On Tue, Apr 20, 2010 at 09:34:22PM +0200, frantisek holop wrote:
> re aucat et al, i was wondering,
> will it ever make /etc/rc.conf?

yes.

> for me, the ocassional music listener
> plus movie watcher, what are the
> obvious reasons i should be running the
> aucat sound server?

it's the only way to really support hardware.  seriously.  there
are some conversion routines in the kernel to help when hardware
does not support parameters a program wants to use, but it is
an incomplete set, and it is buggy.  the conversions were added
on as an afterthought.  well, I don't know how else to explain
the fact that recording conversions were not actually used and the
multiple places where the conversion factor needed to be taken into
account but wasn't.  most of that has been straightened out, but
therer can still be issues, especially with OSS applications,
because of the OSS spec says to set the block/buffer size first.
this means the block size gets set before the final expansion
factor is known.  couple that with the fact that drivers on
OpenBSD used to always default to mono mulaw, which in any cases
needs an expansion factor, and it is impossible to set/know the
blocksize, which can lead to hard to understand (much less fix)
problems.

imo, the in-kernel conversions are the #1 reason OpenBSD audio
feel into disrepair.  they allowed people to do
'cat file.au > /dev/audio' but broke many, many applications.

> there has been tons of changes since
> aucat graduated into the source tree,
> someone knowledgeable might do a nice
> writeup (maybe on undeadly?) what advanced
> audio scenarios have now became available
> because of this technology.
>
> perhaps this seems like a stupid mail,
> but i am not really an audio person outside
> the simple audio(4) consuming but i have
> been making circles around aucat for a while now
> not really sure how could i take advantage of it.
>
> help us poor audio illiterates to appreciate
> aucat in its fullest potential :]
>
> -f
> --
> jury: a group chosen to decide who has the best lawyer.

--
[hidden email]
SDF Public Access UNIX System - http://sdf.lonestar.org

Reply | Threaded
Open this post in threaded view
|

Re: non-sndio ports

j4nKy
In reply to this post by Alexander Shadchin
On Wed, Apr 21, 2010 at 02:05:42AM +0600, Alexandr Shadchin wrote:

> On Mon, Apr 19, 2010 at 15:51:01 +0600, Jacob Meuser wrote:
>
> > audio/waveplay will be removed?
>
> It is high time to remove :) aucat does same.
>
> > math/freemat
>
> FreeMat uses audio/portaudio-svn, portaudio-svn uses sndio.
> Simply forgot to remove ossaudio. Patch attached.

cool :)

> In Ports there is a whole branch that uses ossaudio - lang/python.

*sigh*  guess I should be using sqlports instead of grep.

> If I find time, then try to convert Python on sndio.

that would be grand!

--
[hidden email]
SDF Public Access UNIX System - http://sdf.lonestar.org

Reply | Threaded
Open this post in threaded view
|

Re: non-sndio ports

Alexandre Ratchov-2
In reply to this post by f.holop
On Tue, Apr 20, 2010 at 09:34:22PM +0200, frantisek holop wrote:
> re aucat et al, i was wondering,
> will it ever make /etc/rc.conf?
>

that's the long term plan, but it's not ready yet. First, it
should be able to handle all attached devices (including
hotplugged uaudio's).

> for me, the ocassional music listener
> plus movie watcher, what are the
> obvious reasons i should be running the
> aucat sound server?

It depends on your device, if you want to only listen a
single 16-bit stereo at 44.1kHz, on a device that supports
this particular format, you won't need aucat. If the
application you use and your device don't support a common
format, you may have to use the sound server.

> there has been tons of changes since
> aucat graduated into the source tree,
> someone knowledgeable might do a nice
> writeup (maybe on undeadly?) what advanced
> audio scenarios have now became available
> because of this technology.
>
> perhaps this seems like a stupid mail,
> but i am not really an audio person outside
> the simple audio(4) consuming but i have
> been making circles around aucat for a while now
> not really sure how could i take advantage of it.

The main goal of aucat is to make any program work on any
device we support at any time; what's what we call ``audio
just works''.

The other goal of aucat is to allow simple audio
applications to work together to achieve a more "complex"
behaviour. I mean if you don't have a big program that has
all the features you need, you could use multiple small
programs that do one thing, but that work together to
achieve what the big program would do.

-- Alexandre

Reply | Threaded
Open this post in threaded view
|

Re: non-sndio ports

Alexandre Ratchov-2
In reply to this post by j4nKy
On Mon, Apr 19, 2010 at 09:51:01AM +0000, Jacob Meuser wrote:
>
> here's an update on what non-sndio using ports are left.  this may be
> missing a few that also have sndio support.  currently xmms and jack
> build audio(4) backends, but they will both be gone soon.  if you
> know of a port that uses audio(4) or ossaudio(3) and isn't listed here,
> let me know.
>

Just a quick remark:

The purpose of porting these applications to sndio is not to
just make them work with aucat. I mean, having few rare
applications not working with aucat may not look as a huge
usablility problem.

Of course having them work with aucat would be very nice!
But, the real problem is that as long as we have code
depending on sun and oss kernel APIs (or alike), prevents us
from changing/improving kernel bits, which possibly impacts
quality of all audio programs, including those using sndio.

-- Alexandre

Reply | Threaded
Open this post in threaded view
|

Re: non-sndio ports

David Coppa
In reply to this post by j4nKy
On Mon, 19 Apr 2010, Jacob Meuser wrote:

> On Mon, Apr 19, 2010 at 09:51:01AM +0000, Jacob Meuser wrote:
> >
> > here's an update on what non-sndio using ports are left.  this may be
> > missing a few that also have sndio support.  currently xmms and jack
> > build audio(4) backends, but they will both be gone soon.  if you
> > know of a port that uses audio(4) or ossaudio(3) and isn't listed here,
> > let me know.
> >
> > if you have tested or would like to test any of the "patches sent" or
> > WIPs let me know too.
>
> and if you plan on updating any of the ports, let me know *NOW* before
> I spend *HOURS* to make them work, only to have that work be worthless.
> thanks.

Hi,

here's an update for audio/shell-fm.

I've removed ossaudio dep and updated it to the latest version (0.7).

Tested on i386 by listening to many tunes ;)

ciao
david


Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/shell-fm/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile 6 Mar 2009 21:24:52 -0000 1.2
+++ Makefile 21 Apr 2010 09:47:21 -0000
@@ -1,31 +1,39 @@
 # $OpenBSD: Makefile,v 1.2 2009/03/06 21:24:52 jasper Exp $
 
-COMMENT= console based player for last.fm radio streams
+COMMENT = console based player for last.fm radio streams
 
-DISTNAME= shell-fm-0.6
-PKGNAME= ${DISTNAME}p0
-CATEGORIES= audio
-EXTRACT_SUFX= .tar.bz2
+V = 0.7
+DISTNAME = jkramer-shell-fm-v${V}-0-gc274aa5
+PKGNAME = shell-fm-${V}
+CATEGORIES = audio
 
-HOMEPAGE= http://nex.scrapping.cc/code/shell-fm/
+HOMEPAGE = http://nex.scrapping.cc/shell-fm/
 
-MAINTAINER= Guillaume Pinot <[hidden email]>
+MAINTAINER = Guillaume Pinot <[hidden email]>
 
 # GPLv2
-PERMIT_PACKAGE_CDROM= Yes
-PERMIT_PACKAGE_FTP= Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP= Yes
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP = Yes
 
-MASTER_SITES= ${HOMEPAGE}/downloads/
+MASTER_SITES = http://github.com/jkramer/shell-fm/tarball/v${V}/
 
-LIB_DEPENDS= ao::audio/libao \
- mad::audio/libmad
-WANTLIB= c m ossaudio
+LIB_DEPENDS = ao::audio/libao \
+ mad::audio/libmad \
+ tag,tag_c::audio/taglib
 
-USE_GMAKE= yes
-FAKE_FLAGS= DESTDIR="${WRKINST}${PREFIX}"
+WANTLIB = c m
 
-NO_REGRESS= yes
+USE_GMAKE = yes
+
+NO_REGRESS = yes
+
+pre-configure:
+ ${SUBST_CMD} ${WRKSRC}/Makefile
+
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/source/shell-fm ${PREFIX}/bin/
+ ${INSTALL_MAN} ${WRKSRC}/manual/shell-fm.1 ${PREFIX}/man/man1/
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/shell-fm/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 21 Sep 2008 22:27:31 -0000 1.1.1.1
+++ distinfo 21 Apr 2010 09:47:21 -0000
@@ -1,5 +1,5 @@
-MD5 (shell-fm-0.6.tar.bz2) = 3Isf/t+T31ZfQm8mlDhCqw==
-RMD160 (shell-fm-0.6.tar.bz2) = N0XRXNVm1YoLS7jktD1PlXXwlGc=
-SHA1 (shell-fm-0.6.tar.bz2) = qemimOcLKIXl6b+5+qq9Wv72O5g=
-SHA256 (shell-fm-0.6.tar.bz2) = tm3FG5WzI7MBmMjpWvE2sjK9Piquiz7EDAfK4Ac618c=
-SIZE (shell-fm-0.6.tar.bz2) = 35422
+MD5 (jkramer-shell-fm-v0.7-0-gc274aa5.tar.gz) = sYYVyoaciFZpk4UTGWNaLA==
+RMD160 (jkramer-shell-fm-v0.7-0-gc274aa5.tar.gz) = 8/xtw6YB1VrKtnGIeaKRYsJq+28=
+SHA1 (jkramer-shell-fm-v0.7-0-gc274aa5.tar.gz) = hn/OpOJYneCQpwgIkiYaCnWRNVI=
+SHA256 (jkramer-shell-fm-v0.7-0-gc274aa5.tar.gz) = 56gNyr+hP1uTZh9ZGSV74QZLr/c0lGs9xZGPreBB+XY=
+SIZE (jkramer-shell-fm-v0.7-0-gc274aa5.tar.gz) = 49281
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/audio/shell-fm/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Makefile
--- patches/patch-Makefile 21 Sep 2008 22:27:31 -0000 1.1.1.1
+++ patches/patch-Makefile 21 Apr 2010 09:47:21 -0000
@@ -1,10 +1,13 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2008/09/21 22:27:31 jasper Exp $
-
-Don't install compressed man pages.
-
---- Makefile.orig Thu Sep 18 19:29:48 2008
-+++ Makefile Thu Sep 18 19:30:07 2008
-@@ -4,7 +4,7 @@ MANDIR := $(DESTDIR)/man
+$OpenBSD$
+--- Makefile.orig Sun Aug 30 18:55:07 2009
++++ Makefile Wed Apr 21 09:20:12 2010
+@@ -1,12 +1,12 @@
+
+ DESTDIR =
+-PREFIX := /usr
++PREFIX := ${TRUEPREFIX}
+ MANDIR := $(PREFIX)/man
+ DOCDIR  := ${PREFIX}/share/doc
 
  .PHONY : shell-fm manual all clean tags cscope
 
@@ -13,12 +16,3 @@ Don't install compressed man pages.
 
  shell-fm :
  $(MAKE) -C source
-@@ -15,7 +15,7 @@ manual :
- install :
- mkdir -p $(DESTDIR)/bin $(MANDIR)/man1
- install source/shell-fm $(DESTDIR)/bin/shell-fm
-- install manual/shell-fm.1.gz $(MANDIR)/man1
-+ install manual/shell-fm.1 $(MANDIR)/man1
-
- install-strip : install
- strip $(DESTDIR)/bin/shell-fm
Index: patches/patch-source_Makefile
===================================================================
RCS file: /cvs/ports/audio/shell-fm/patches/patch-source_Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-source_Makefile
--- patches/patch-source_Makefile 21 Sep 2008 22:27:31 -0000 1.1.1.1
+++ patches/patch-source_Makefile 21 Apr 2010 09:47:21 -0000
@@ -1,24 +1,22 @@
-$OpenBSD: patch-source_Makefile,v 1.1.1.1 2008/09/21 22:27:31 jasper Exp $
-
-Respect CFLAGS.
-
---- source/Makefile.orig Fri Sep 19 08:46:46 2008
-+++ source/Makefile Fri Sep 19 08:47:35 2008
-@@ -1,7 +1,7 @@
- SOURCE := $(wildcard *.c)
- OBJECT := $(subst .c,.o,$(SOURCE))
- BINARY := shell-fm
--LDFLAGS := $(shell pkg-config --exists ao && pkg-config ao --libs) \
-+LDFLAGS += $(shell pkg-config --exists ao && pkg-config ao --libs) \
- $(shell pkg-config mad --libs)
- ifeq ($(shell uname -s), OpenBSD)
- LDFLAGS += -lossaudio
-@@ -10,7 +10,7 @@ ifeq ($(shell uname -s), NetBSD)
+$OpenBSD$
+--- source/Makefile.orig Wed Apr 21 08:42:03 2010
++++ source/Makefile Wed Apr 21 08:44:29 2010
+@@ -5,9 +5,6 @@ BINARY := shell-fm
+ LIB := libshellfm.so
+ STATIC := libshellfm.a
+
+-ifeq ($(shell uname -s), OpenBSD)
+- LDFLAGS += -lossaudio
+-endif
+ ifeq ($(shell uname -s), NetBSD)
  LDFLAGS += -lossaudio
  endif
- LIBAO := $(shell pkg-config --exists ao && echo -DLIBAO && pkg-config ao --cflags)
--CFLAGS  := -Os -Wall -W -I./include/ $(LIBAO) $(shell pkg-config mad --cflags)
-+CFLAGS  += -Wall -W -I./include/ $(LIBAO) $(shell pkg-config mad --cflags)
-
- .PHONY: clean tags cscope
+@@ -15,7 +12,7 @@ ifeq ($(shell uname -s), Darwin)
+ CFLAGS += -D__darwin__
+ endif
 
+-CFLAGS  += -Os -Wall -W -I./include/ -DLIBAO \
++CFLAGS  += -Wall -W -I./include/ -DLIBAO \
+   $(shell pkg-config --cflags mad) \
+   $(shell pkg-config --cflags ao)
+ LDFLAGS += $(shell pkg-config --libs mad) \
Index: patches/patch-source_pipe_c
===================================================================
RCS file: patches/patch-source_pipe_c
diff -N patches/patch-source_pipe_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-source_pipe_c 21 Apr 2010 09:47:21 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- source/pipe.c.orig Wed Apr 21 09:21:01 2010
++++ source/pipe.c Wed Apr 21 09:22:24 2010
+@@ -40,7 +40,7 @@ FILE * openpipe(const char * cmd, pid_t * cpid) {
+ close(fd[1]);
+ dup2(fd[0], 0);
+
+- execl("/bin/sh", "sh", "-c", cmd, NULL);
++ execl("/bin/sh", "sh", "-c", cmd, (char *)NULL);
+ }
+
+ if(cpid != NULL)

Reply | Threaded
Open this post in threaded view
|

Re: non-sndio ports

Stuart Henderson
On 2010/04/21 11:56, David Coppa wrote:

> On Mon, 19 Apr 2010, Jacob Meuser wrote:
>
> > On Mon, Apr 19, 2010 at 09:51:01AM +0000, Jacob Meuser wrote:
> > >
> > > here's an update on what non-sndio using ports are left.  this may be
> > > missing a few that also have sndio support.  currently xmms and jack
> > > build audio(4) backends, but they will both be gone soon.  if you
> > > know of a port that uses audio(4) or ossaudio(3) and isn't listed here,
> > > let me know.
> > >
> > > if you have tested or would like to test any of the "patches sent" or
> > > WIPs let me know too.
> >
> > and if you plan on updating any of the ports, let me know *NOW* before
> > I spend *HOURS* to make them work, only to have that work be worthless.
> > thanks.
>
> Hi,
>
> here's an update for audio/shell-fm.
>
> I've removed ossaudio dep and updated it to the latest version (0.7).
>
> Tested on i386 by listening to many tunes ;)

jasper has a diff for the 0.7 update too (which I thought I ok'd
but I might be mistaken ;) which is a lot easier-reading as it doesn't
touch whitespace while updating, and doesn't rely on github tarball
creation, which I don't really trust to provide consistent results)...

Reply | Threaded
Open this post in threaded view
|

Re: non-sndio ports

David Coppa
On Wed, Apr 21, 2010 at 12:27 PM, Stuart Henderson <[hidden email]> wrote:

> jasper has a diff for the 0.7 update too (which I thought I ok'd
> but I might be mistaken ;) which is a lot easier-reading as it doesn't
> touch whitespace while updating, and doesn't rely on github tarball
> creation, which I don't really trust to provide consistent results)...

ok, then.
But remind to remove dependency on ossaudio

cheers
dav

Reply | Threaded
Open this post in threaded view
|

Re: non-sndio ports

j4nKy
In reply to this post by j4nKy
On Mon, Apr 19, 2010 at 09:51:01AM +0000, Jacob Meuser wrote:

> audio/tosha

doesn't cdio(1) in base do the same?  any point in keeping this?

--
[hidden email]
SDF Public Access UNIX System - http://sdf.lonestar.org

Reply | Threaded
Open this post in threaded view
|

Re: non-sndio ports

j4nKy
In reply to this post by j4nKy
On Mon, Apr 19, 2010 at 09:51:01AM +0000, Jacob Meuser wrote:

> audio(4) users:

> x11/kde/multimedia3 mpeglib, not sure if it's actually used or not

the yaf-* players use mpeglib.

ok?

--
[hidden email]
SDF Public Access UNIX System - http://sdf.lonestar.org

Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/kde/multimedia3/Makefile,v
retrieving revision 1.64
diff -N -u -p Makefile
--- Makefile 21 Dec 2009 20:46:02 -0000 1.64
+++ Makefile 23 Apr 2010 05:27:27 -0000
@@ -4,7 +4,7 @@ COMMENT = K Desktop Environment, multimedia applicat
 CATEGORIES = x11 x11/kde
 VERSION = 3.5.10
 DISTNAME = kdemultimedia-${VERSION}
-PKGNAME = ${DISTNAME}p4
+PKGNAME = ${DISTNAME}p5
 MODKDE_VERSION = 3.5.8
 SHARED_LIBS += artsbuilder          1.0      # .0.0
 SHARED_LIBS += artsmidi_idl         1.0      # .0.0
@@ -67,5 +67,8 @@ WANTLIB = ICE SM X11 Xau Xdmcp Xext Xrender Xv Xxf86dg
  glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 idn \
  jpeg m mad ossaudio pcre pcreposix png pthread rpcsvc sndio \
  stdc++ util xml2 z pthread-stubs xcb
+
+post-extract:
+ cp ${FILESDIR}/audioIO_sndio.cpp ${WRKSRC}/mpeglib/lib/util/audio
 
 .include <bsd.port.mk>
Index: files/audioIO_sndio.cpp
===================================================================
RCS file: files/audioIO_sndio.cpp
diff -N -u -p files/audioIO_sndio.cpp
--- /dev/null 22 Apr 2010 23:27:27 -0000
+++ files/audioIO_sndio.cpp 23 Apr 2010 05:27:27 -0000
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2010 Jacob Meuser <[hidden email]>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <unistd.h>
+#include <stdio.h>
+#include <sndio.h>
+
+#include "audioIO.h"
+
+static struct sio_hdl *hdl;
+static struct sio_par par;
+
+int
+audioConstruct()
+{
+ hdl = NULL;
+ return true;
+}
+
+void
+audioDestruct()
+{
+}
+
+int
+audioOpen()
+{
+ hdl = sio_open(NULL, SIO_PLAY, 0);
+ if (hdl == NULL) {
+ fprintf(stderr, "unable to open audio device\n");
+ return 0;
+ }
+
+ return true;
+}
+
+inline void
+audioFlush()
+{
+}
+
+void
+audioClose()
+{
+ if (hdl != NULL)
+ sio_close(hdl);
+}
+
+void
+audioInit(int sampleSize, int frequency, int stereo, int sign, int big)
+{
+ sio_initpar(&par);
+
+ par.bits = sampleSize;
+ par.sig = sign ? 1 : 0;
+ par.le = big ? 0 : 1;
+ par.rate = frequency;
+ par.pchan = stereo ? 2 : 1;
+
+ if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par))
+ fprintf(stderr, "error setting sndio parameters\n");
+  
+ if (par.bits != sampleSize ||
+    par.sig != sign ? 1 : 0 ||
+    par.le != big ? 0 : 1 ||
+    par.rate != frequency ||
+    par.pchan != stereo ? 2 : 1)
+ fprintf(stderr, "could not set requested audio parameters");
+
+ if (!sio_start(hdl))
+ fprintf(stderr, "could not start audio");
+}
+
+int
+getAudioBufferSize()
+{
+ return (par.appbufsz * par.bps * par.pchan);
+}
+
+
+void
+mixerSetVolume(int leftVolume, int rightVolume)
+{
+ /* values from 0..100 */
+}
+
+int
+mixerOpen()
+{
+ return false;
+}
+
+void
+mixerClose()
+{
+}
+
+int
+audioWrite(char *buffer, int count)
+{
+ return(sio_write(hdl, buffer, count));
+}
? patches/patch-mpeglib_lib_Makefile_in
Index: patches/patch-mpeglib_lib_util_audio_audioIO_SunOS_cpp
===================================================================
RCS file: /cvs/ports/x11/kde/multimedia3/patches/patch-mpeglib_lib_util_audio_audioIO_SunOS_cpp,v
retrieving revision 1.1
diff -N -u -p patches/patch-mpeglib_lib_util_audio_audioIO_SunOS_cpp
--- patches/patch-mpeglib_lib_util_audio_audioIO_SunOS_cpp 29 Jan 2009 22:37:21 -0000 1.1
+++ /dev/null 23 Apr 2010 04:31:01 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-mpeglib_lib_util_audio_audioIO_SunOS_cpp,v 1.1 2009/01/29 22:37:21 jakemsr Exp $
---- mpeglib/lib/util/audio/audioIO_SunOS.cpp.orig Sun Dec 28 14:56:16 2008
-+++ mpeglib/lib/util/audio/audioIO_SunOS.cpp Sun Dec 28 14:59:46 2008
-@@ -8,10 +8,11 @@
-  */
-
- #include <sys/types.h>
--#include <sys/stropts.h>
-+#include <string.h>
- #include <fcntl.h>
- #include <unistd.h>
- #include <stdio.h>
-+#include <sys/ioctl.h>
- #include <sys/audioio.h>
- #include "audioIO.h"
- #include <iostream.h>
-@@ -128,7 +129,7 @@ void mixerSetVolume(int leftVolume,int rightVolume) {
-   //someone should fix the volume on solaris
-   balance=0;
-  
--  auinfo.play.balance=(uchar_t)balance;
-+  auinfo.play.balance=(unsigned char)balance;
-   if (ioctl(audio_fd,AUDIO_SETINFO,&auinfo)<0)
-     perror("Unable to set sound volume");
- }
Index: patches/patch-mpeglib_lib_util_audio_audioIO_cpp
===================================================================
RCS file: /cvs/ports/x11/kde/multimedia3/patches/patch-mpeglib_lib_util_audio_audioIO_cpp,v
retrieving revision 1.1
diff -N -u -p patches/patch-mpeglib_lib_util_audio_audioIO_cpp
--- patches/patch-mpeglib_lib_util_audio_audioIO_cpp 29 Jan 2009 22:37:21 -0000 1.1
+++ patches/patch-mpeglib_lib_util_audio_audioIO_cpp 23 Apr 2010 05:27:27 -0000
@@ -1,12 +1,12 @@
 $OpenBSD: patch-mpeglib_lib_util_audio_audioIO_cpp,v 1.1 2009/01/29 22:37:21 jakemsr Exp $
---- mpeglib/lib/util/audio/audioIO.cpp.orig Sun Dec 28 13:31:48 2008
-+++ mpeglib/lib/util/audio/audioIO.cpp Sun Dec 28 13:32:36 2008
+--- mpeglib/lib/util/audio/audioIO.cpp.orig Sat Sep 10 01:19:53 2005
++++ mpeglib/lib/util/audio/audioIO.cpp Thu Apr 22 19:06:05 2010
 @@ -26,7 +26,11 @@
  #endif
 
  #ifdef OS_BSD
 +#ifdef __OpenBSD__
-+  #include "audioIO_SunOS.cpp"
++  #include "audioIO_sndio.cpp"
 +#else
    #include "audioIO_Linux.cpp"
 +#endif

Reply | Threaded
Open this post in threaded view
|

Re: non-sndio ports

j4nKy
On Fri, Apr 23, 2010 at 05:31:36AM +0000, Jacob Meuser wrote:
> On Mon, Apr 19, 2010 at 09:51:01AM +0000, Jacob Meuser wrote:
>
> > audio(4) users:
>
> > x11/kde/multimedia3 mpeglib, not sure if it's actually used or not
>
> the yaf-* players use mpeglib.
>
> ok?

> ? patches/patch-mpeglib_lib_Makefile_in

oops

--
[hidden email]
SDF Public Access UNIX System - http://sdf.lonestar.org

Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/kde/multimedia3/Makefile,v
retrieving revision 1.64
diff -N -u -p Makefile
--- Makefile 21 Dec 2009 20:46:02 -0000 1.64
+++ Makefile 23 Apr 2010 05:45:02 -0000
@@ -4,7 +4,7 @@ COMMENT = K Desktop Environment, multimedia applicat
 CATEGORIES = x11 x11/kde
 VERSION = 3.5.10
 DISTNAME = kdemultimedia-${VERSION}
-PKGNAME = ${DISTNAME}p4
+PKGNAME = ${DISTNAME}p5
 MODKDE_VERSION = 3.5.8
 SHARED_LIBS += artsbuilder          1.0      # .0.0
 SHARED_LIBS += artsmidi_idl         1.0      # .0.0
@@ -67,5 +67,8 @@ WANTLIB = ICE SM X11 Xau Xdmcp Xext Xrender Xv Xxf86dg
  glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 idn \
  jpeg m mad ossaudio pcre pcreposix png pthread rpcsvc sndio \
  stdc++ util xml2 z pthread-stubs xcb
+
+post-extract:
+ cp ${FILESDIR}/audioIO_sndio.cpp ${WRKSRC}/mpeglib/lib/util/audio
 
 .include <bsd.port.mk>
Index: files/audioIO_sndio.cpp
===================================================================
RCS file: files/audioIO_sndio.cpp
diff -N -u -p files/audioIO_sndio.cpp
--- /dev/null 22 Apr 2010 23:45:02 -0000
+++ files/audioIO_sndio.cpp 23 Apr 2010 05:45:02 -0000
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2010 Jacob Meuser <[hidden email]>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <unistd.h>
+#include <stdio.h>
+#include <sndio.h>
+
+#include "audioIO.h"
+
+static struct sio_hdl *hdl;
+static struct sio_par par;
+
+int
+audioConstruct()
+{
+ hdl = NULL;
+ return true;
+}
+
+void
+audioDestruct()
+{
+}
+
+int
+audioOpen()
+{
+ hdl = sio_open(NULL, SIO_PLAY, 0);
+ if (hdl == NULL) {
+ fprintf(stderr, "unable to open audio device\n");
+ return 0;
+ }
+
+ return true;
+}
+
+inline void
+audioFlush()
+{
+}
+
+void
+audioClose()
+{
+ if (hdl != NULL)
+ sio_close(hdl);
+}
+
+void
+audioInit(int sampleSize, int frequency, int stereo, int sign, int big)
+{
+ sio_initpar(&par);
+
+ par.bits = sampleSize;
+ par.sig = sign ? 1 : 0;
+ par.le = big ? 0 : 1;
+ par.rate = frequency;
+ par.pchan = stereo ? 2 : 1;
+
+ if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par))
+ fprintf(stderr, "error setting sndio parameters\n");
+  
+ if (par.bits != sampleSize ||
+    par.sig != sign ? 1 : 0 ||
+    par.le != big ? 0 : 1 ||
+    par.rate != frequency ||
+    par.pchan != stereo ? 2 : 1)
+ fprintf(stderr, "could not set requested audio parameters");
+
+ if (!sio_start(hdl))
+ fprintf(stderr, "could not start audio");
+}
+
+int
+getAudioBufferSize()
+{
+ return (par.appbufsz * par.bps * par.pchan);
+}
+
+
+void
+mixerSetVolume(int leftVolume, int rightVolume)
+{
+ /* values from 0..100 */
+}
+
+int
+mixerOpen()
+{
+ return false;
+}
+
+void
+mixerClose()
+{
+}
+
+int
+audioWrite(char *buffer, int count)
+{
+ return(sio_write(hdl, buffer, count));
+}
Index: patches/patch-mpeglib_lib_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/kde/multimedia3/patches/Attic/patch-mpeglib_lib_Makefile_in,v
diff -N -u -p patches/patch-mpeglib_lib_Makefile_in
--- /dev/null 22 Apr 2010 23:45:02 -0000
+++ patches/patch-mpeglib_lib_Makefile_in 23 Apr 2010 05:45:02 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- mpeglib/lib/Makefile.in.orig Thu Apr 22 19:09:59 2010
++++ mpeglib/lib/Makefile.in Thu Apr 22 19:10:32 2010
+@@ -293,7 +293,7 @@ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+ TAGLIB_CONFIG = @TAGLIB_CONFIG@
+-THIS_LIB_LIBS = @THIS_LIB_LIBS@
++THIS_LIB_LIBS = @THIS_LIB_LIBS@ -lsndio
+ THIS_LIB_MAJOR_VERSION = @THIS_LIB_MAJOR_VERSION@
+ THIS_LIB_MICRO_VERSION = @THIS_LIB_MICRO_VERSION@
+ THIS_LIB_MINOR_VERSION = @THIS_LIB_MINOR_VERSION@
Index: patches/patch-mpeglib_lib_util_audio_audioIO_SunOS_cpp
===================================================================
RCS file: /cvs/ports/x11/kde/multimedia3/patches/patch-mpeglib_lib_util_audio_audioIO_SunOS_cpp,v
retrieving revision 1.1
diff -N -u -p patches/patch-mpeglib_lib_util_audio_audioIO_SunOS_cpp
--- patches/patch-mpeglib_lib_util_audio_audioIO_SunOS_cpp 29 Jan 2009 22:37:21 -0000 1.1
+++ /dev/null 23 Apr 2010 05:31:01 -0000
@@ -1,25 +0,0 @@
-$OpenBSD: patch-mpeglib_lib_util_audio_audioIO_SunOS_cpp,v 1.1 2009/01/29 22:37:21 jakemsr Exp $
---- mpeglib/lib/util/audio/audioIO_SunOS.cpp.orig Sun Dec 28 14:56:16 2008
-+++ mpeglib/lib/util/audio/audioIO_SunOS.cpp Sun Dec 28 14:59:46 2008
-@@ -8,10 +8,11 @@
-  */
-
- #include <sys/types.h>
--#include <sys/stropts.h>
-+#include <string.h>
- #include <fcntl.h>
- #include <unistd.h>
- #include <stdio.h>
-+#include <sys/ioctl.h>
- #include <sys/audioio.h>
- #include "audioIO.h"
- #include <iostream.h>
-@@ -128,7 +129,7 @@ void mixerSetVolume(int leftVolume,int rightVolume) {
-   //someone should fix the volume on solaris
-   balance=0;
-  
--  auinfo.play.balance=(uchar_t)balance;
-+  auinfo.play.balance=(unsigned char)balance;
-   if (ioctl(audio_fd,AUDIO_SETINFO,&auinfo)<0)
-     perror("Unable to set sound volume");
- }
Index: patches/patch-mpeglib_lib_util_audio_audioIO_cpp
===================================================================
RCS file: /cvs/ports/x11/kde/multimedia3/patches/patch-mpeglib_lib_util_audio_audioIO_cpp,v
retrieving revision 1.1
diff -N -u -p patches/patch-mpeglib_lib_util_audio_audioIO_cpp
--- patches/patch-mpeglib_lib_util_audio_audioIO_cpp 29 Jan 2009 22:37:21 -0000 1.1
+++ patches/patch-mpeglib_lib_util_audio_audioIO_cpp 23 Apr 2010 05:45:02 -0000
@@ -1,12 +1,12 @@
 $OpenBSD: patch-mpeglib_lib_util_audio_audioIO_cpp,v 1.1 2009/01/29 22:37:21 jakemsr Exp $
---- mpeglib/lib/util/audio/audioIO.cpp.orig Sun Dec 28 13:31:48 2008
-+++ mpeglib/lib/util/audio/audioIO.cpp Sun Dec 28 13:32:36 2008
+--- mpeglib/lib/util/audio/audioIO.cpp.orig Sat Sep 10 01:19:53 2005
++++ mpeglib/lib/util/audio/audioIO.cpp Thu Apr 22 19:06:05 2010
 @@ -26,7 +26,11 @@
  #endif
 
  #ifdef OS_BSD
 +#ifdef __OpenBSD__
-+  #include "audioIO_SunOS.cpp"
++  #include "audioIO_sndio.cpp"
 +#else
    #include "audioIO_Linux.cpp"
 +#endif

Reply | Threaded
Open this post in threaded view
|

Re: non-sndio ports

j4nKy
In reply to this post by Antoine Jacoutot-7
On Mon, Apr 19, 2010 at 11:59:27AM +0200, Antoine Jacoutot wrote:
> On Mon, 19 Apr 2010, Jacob Meuser wrote:
> <...>
> > multimedia/gstreamer-0.10/plugins-good mixer?
>
> Yes, oss support is enabled only because we need mixer capability.

what does "need" mean?  does it mean this port wouldn't work at all
without it?  or is it "there would be missing functionality"?

whether applications should be able to change the system hardware
volume, in the context of a shared audio system (that is, more than
one program can "use" the hardware at a time), I think, is an
unanswered question.  my opinion is that applications that aren't
explicitely programs to control the hardware mixer should only
control the volume of the stream they produce.

--
[hidden email]
SDF Public Access UNIX System - http://sdf.lonestar.org

Reply | Threaded
Open this post in threaded view
|

Re: non-sndio ports

j4nKy
In reply to this post by David Coppa
On Wed, Apr 21, 2010 at 11:56:49AM +0200, David Coppa wrote:

> Hi,
>
> here's an update for audio/shell-fm.
>
> I've removed ossaudio dep and updated it to the latest version (0.7).
>
> Tested on i386 by listening to many tunes ;)

looks good to me.  I've apparently forgotten my last.fm password, so
I haven't tested.

but this should go the the MAINTAINER ...

> ciao
> david
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/audio/shell-fm/Makefile,v
> retrieving revision 1.2
> diff -u -p -r1.2 Makefile
> --- Makefile 6 Mar 2009 21:24:52 -0000 1.2
> +++ Makefile 21 Apr 2010 09:47:21 -0000
> @@ -1,31 +1,39 @@
>  # $OpenBSD: Makefile,v 1.2 2009/03/06 21:24:52 jasper Exp $
>  
> -COMMENT= console based player for last.fm radio streams
> +COMMENT = console based player for last.fm radio streams
>  
> -DISTNAME= shell-fm-0.6
> -PKGNAME= ${DISTNAME}p0
> -CATEGORIES= audio
> -EXTRACT_SUFX= .tar.bz2
> +V = 0.7
> +DISTNAME = jkramer-shell-fm-v${V}-0-gc274aa5
> +PKGNAME = shell-fm-${V}
> +CATEGORIES = audio
>  
> -HOMEPAGE= http://nex.scrapping.cc/code/shell-fm/
> +HOMEPAGE = http://nex.scrapping.cc/shell-fm/
>  
> -MAINTAINER= Guillaume Pinot <[hidden email]>
> +MAINTAINER = Guillaume Pinot <[hidden email]>
>  
>  # GPLv2
> -PERMIT_PACKAGE_CDROM= Yes
> -PERMIT_PACKAGE_FTP= Yes
> -PERMIT_DISTFILES_CDROM= Yes
> -PERMIT_DISTFILES_FTP= Yes
> +PERMIT_PACKAGE_CDROM = Yes
> +PERMIT_PACKAGE_FTP = Yes
> +PERMIT_DISTFILES_CDROM =Yes
> +PERMIT_DISTFILES_FTP = Yes
>  
> -MASTER_SITES= ${HOMEPAGE}/downloads/
> +MASTER_SITES = http://github.com/jkramer/shell-fm/tarball/v${V}/
>  
> -LIB_DEPENDS= ao::audio/libao \
> - mad::audio/libmad
> -WANTLIB= c m ossaudio
> +LIB_DEPENDS = ao::audio/libao \
> + mad::audio/libmad \
> + tag,tag_c::audio/taglib
>  
> -USE_GMAKE= yes
> -FAKE_FLAGS= DESTDIR="${WRKINST}${PREFIX}"
> +WANTLIB = c m
>  
> -NO_REGRESS= yes
> +USE_GMAKE = yes
> +
> +NO_REGRESS = yes
> +
> +pre-configure:
> + ${SUBST_CMD} ${WRKSRC}/Makefile
> +
> +do-install:
> + ${INSTALL_PROGRAM} ${WRKSRC}/source/shell-fm ${PREFIX}/bin/
> + ${INSTALL_MAN} ${WRKSRC}/manual/shell-fm.1 ${PREFIX}/man/man1/
>  
>  .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/audio/shell-fm/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 distinfo
> --- distinfo 21 Sep 2008 22:27:31 -0000 1.1.1.1
> +++ distinfo 21 Apr 2010 09:47:21 -0000
> @@ -1,5 +1,5 @@
> -MD5 (shell-fm-0.6.tar.bz2) = 3Isf/t+T31ZfQm8mlDhCqw==
> -RMD160 (shell-fm-0.6.tar.bz2) = N0XRXNVm1YoLS7jktD1PlXXwlGc=
> -SHA1 (shell-fm-0.6.tar.bz2) = qemimOcLKIXl6b+5+qq9Wv72O5g=
> -SHA256 (shell-fm-0.6.tar.bz2) = tm3FG5WzI7MBmMjpWvE2sjK9Piquiz7EDAfK4Ac618c=
> -SIZE (shell-fm-0.6.tar.bz2) = 35422
> +MD5 (jkramer-shell-fm-v0.7-0-gc274aa5.tar.gz) = sYYVyoaciFZpk4UTGWNaLA==
> +RMD160 (jkramer-shell-fm-v0.7-0-gc274aa5.tar.gz) = 8/xtw6YB1VrKtnGIeaKRYsJq+28=
> +SHA1 (jkramer-shell-fm-v0.7-0-gc274aa5.tar.gz) = hn/OpOJYneCQpwgIkiYaCnWRNVI=
> +SHA256 (jkramer-shell-fm-v0.7-0-gc274aa5.tar.gz) = 56gNyr+hP1uTZh9ZGSV74QZLr/c0lGs9xZGPreBB+XY=
> +SIZE (jkramer-shell-fm-v0.7-0-gc274aa5.tar.gz) = 49281
> Index: patches/patch-Makefile
> ===================================================================
> RCS file: /cvs/ports/audio/shell-fm/patches/patch-Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 patch-Makefile
> --- patches/patch-Makefile 21 Sep 2008 22:27:31 -0000 1.1.1.1
> +++ patches/patch-Makefile 21 Apr 2010 09:47:21 -0000
> @@ -1,10 +1,13 @@
> -$OpenBSD: patch-Makefile,v 1.1.1.1 2008/09/21 22:27:31 jasper Exp $
> -
> -Don't install compressed man pages.
> -
> ---- Makefile.orig Thu Sep 18 19:29:48 2008
> -+++ Makefile Thu Sep 18 19:30:07 2008
> -@@ -4,7 +4,7 @@ MANDIR := $(DESTDIR)/man
> +$OpenBSD$
> +--- Makefile.orig Sun Aug 30 18:55:07 2009
> ++++ Makefile Wed Apr 21 09:20:12 2010
> +@@ -1,12 +1,12 @@
> +
> + DESTDIR =
> +-PREFIX := /usr
> ++PREFIX := ${TRUEPREFIX}
> + MANDIR := $(PREFIX)/man
> + DOCDIR  := ${PREFIX}/share/doc
>  
>   .PHONY : shell-fm manual all clean tags cscope
>  
> @@ -13,12 +16,3 @@ Don't install compressed man pages.
>  
>   shell-fm :
>   $(MAKE) -C source
> -@@ -15,7 +15,7 @@ manual :
> - install :
> - mkdir -p $(DESTDIR)/bin $(MANDIR)/man1
> - install source/shell-fm $(DESTDIR)/bin/shell-fm
> -- install manual/shell-fm.1.gz $(MANDIR)/man1
> -+ install manual/shell-fm.1 $(MANDIR)/man1
> -
> - install-strip : install
> - strip $(DESTDIR)/bin/shell-fm
> Index: patches/patch-source_Makefile
> ===================================================================
> RCS file: /cvs/ports/audio/shell-fm/patches/patch-source_Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 patch-source_Makefile
> --- patches/patch-source_Makefile 21 Sep 2008 22:27:31 -0000 1.1.1.1
> +++ patches/patch-source_Makefile 21 Apr 2010 09:47:21 -0000
> @@ -1,24 +1,22 @@
> -$OpenBSD: patch-source_Makefile,v 1.1.1.1 2008/09/21 22:27:31 jasper Exp $
> -
> -Respect CFLAGS.
> -
> ---- source/Makefile.orig Fri Sep 19 08:46:46 2008
> -+++ source/Makefile Fri Sep 19 08:47:35 2008
> -@@ -1,7 +1,7 @@
> - SOURCE := $(wildcard *.c)
> - OBJECT := $(subst .c,.o,$(SOURCE))
> - BINARY := shell-fm
> --LDFLAGS := $(shell pkg-config --exists ao && pkg-config ao --libs) \
> -+LDFLAGS += $(shell pkg-config --exists ao && pkg-config ao --libs) \
> - $(shell pkg-config mad --libs)
> - ifeq ($(shell uname -s), OpenBSD)
> - LDFLAGS += -lossaudio
> -@@ -10,7 +10,7 @@ ifeq ($(shell uname -s), NetBSD)
> +$OpenBSD$
> +--- source/Makefile.orig Wed Apr 21 08:42:03 2010
> ++++ source/Makefile Wed Apr 21 08:44:29 2010
> +@@ -5,9 +5,6 @@ BINARY := shell-fm
> + LIB := libshellfm.so
> + STATIC := libshellfm.a
> +
> +-ifeq ($(shell uname -s), OpenBSD)
> +- LDFLAGS += -lossaudio
> +-endif
> + ifeq ($(shell uname -s), NetBSD)
>   LDFLAGS += -lossaudio
>   endif
> - LIBAO := $(shell pkg-config --exists ao && echo -DLIBAO && pkg-config ao --cflags)
> --CFLAGS  := -Os -Wall -W -I./include/ $(LIBAO) $(shell pkg-config mad --cflags)
> -+CFLAGS  += -Wall -W -I./include/ $(LIBAO) $(shell pkg-config mad --cflags)
> -
> - .PHONY: clean tags cscope
> +@@ -15,7 +12,7 @@ ifeq ($(shell uname -s), Darwin)
> + CFLAGS += -D__darwin__
> + endif
>  
> +-CFLAGS  += -Os -Wall -W -I./include/ -DLIBAO \
> ++CFLAGS  += -Wall -W -I./include/ -DLIBAO \
> +   $(shell pkg-config --cflags mad) \
> +   $(shell pkg-config --cflags ao)
> + LDFLAGS += $(shell pkg-config --libs mad) \
> Index: patches/patch-source_pipe_c
> ===================================================================
> RCS file: patches/patch-source_pipe_c
> diff -N patches/patch-source_pipe_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-source_pipe_c 21 Apr 2010 09:47:21 -0000
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- source/pipe.c.orig Wed Apr 21 09:21:01 2010
> ++++ source/pipe.c Wed Apr 21 09:22:24 2010
> +@@ -40,7 +40,7 @@ FILE * openpipe(const char * cmd, pid_t * cpid) {
> + close(fd[1]);
> + dup2(fd[0], 0);
> +
> +- execl("/bin/sh", "sh", "-c", cmd, NULL);
> ++ execl("/bin/sh", "sh", "-c", cmd, (char *)NULL);
> + }
> +
> + if(cpid != NULL)

--
[hidden email]
SDF Public Access UNIX System - http://sdf.lonestar.org

Reply | Threaded
Open this post in threaded view
|

Re: non-sndio ports

Landry Breuil-6
In reply to this post by j4nKy
On Sun, Apr 25, 2010 at 03:00:42AM +0000, Jacob Meuser wrote:
> On Mon, Apr 19, 2010 at 11:59:27AM +0200, Antoine Jacoutot wrote:
> > On Mon, 19 Apr 2010, Jacob Meuser wrote:
> > <...>
> > > multimedia/gstreamer-0.10/plugins-good mixer?
> >
> > Yes, oss support is enabled only because we need mixer capability.
>
> what does "need" mean?  does it mean this port wouldn't work at all
> without it?  or is it "there would be missing functionality"?

Ie without that, applications using gstreamer mixer capability like
xfce4-mixer and gnome mixer applet wont work anymore. Atm on my azalia
system, the only device available in xfce4-mixer is the oss mixer
(providing only 2 controls, master & mic), provided by
gst-plugins-good/sys/oss and implementing the needed interface :
http://cgit.freedesktop.org/gstreamer/gst-plugins-good/tree/sys/oss
http://www.gstreamer.net/data/doc/gstreamer/head/pwg/html/section-iface-mixer.html
as the alternatives in sys are oss/directsound/osxaudio/sunaudio, i
don't think we have another choice than using oss (or write our own on
top of libsndio).

> whether applications should be able to change the system hardware
> volume, in the context of a shared audio system (that is, more than
> one program can "use" the hardware at a time), I think, is an
> unanswered question.  my opinion is that applications that aren't
> explicitely programs to control the hardware mixer should only
> control the volume of the stream they produce.

In this case, the known users of gstossmixer _are_ explicitely made
to control the hardware mixer.

Landry

12