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

all of gstreamer is happy with SEPARATE_BUILD.

Browse Source 
patch it to compile and build the sunaudio plugin.
Not really functional yet, though...
This commit is contained in:
espie 2007-01-09 23:22:56 +00:00
parent 582c732d01
commit dcfeebd2dc
8 changed files with 137 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
multimedia/gstreamer-0.10/Makefile.inc
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.2 2007/01/09 20:00:23 espie Exp $
# $OpenBSD: Makefile.inc,v 1.3 2007/01/09 23:22:56 espie Exp $
CATEGORIES?= multimedia devel
@ -15,6 +15,7 @@ EXTRACT_SUFX?= .tar.bz2
VERSION= 0.10
SUBST_VARS+= VERSION
SHARED_ONLY= Yes
SEPARATE_BUILD?= simple
USE_GMAKE?= Yes
USE_LIBTOOL?= Yes

3
multimedia/gstreamer-0.10/plugins-good/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2007/01/09 22:01:27 espie Exp $
# $OpenBSD: Makefile,v 1.4 2007/01/09 23:22:56 espie Exp $
COMMENT-main= "multimedia framework - good plugins"
COMMENT-aalib= "multimedia framework - aalib plugin"
@ -87,7 +87,6 @@ CONFIGURE_ARGS+= --with-aalib-prefix=${LOCALBASE} \
--disable-libdv \
--disable-libpng \
--disable-shout2 \
--disable-sunaudio \
--disable-taglib
post-install:

37
multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiomixerctrl_c Normal file
View File

@ -0,0 +1,37 @@
$OpenBSD: patch-sys_sunaudio_gstsunaudiomixerctrl_c,v 1.1 2007/01/09 23:22:56 espie Exp $
--- sys/sunaudio/gstsunaudiomixerctrl.c.orig Tue Jan 9 23:23:14 2007
+++ sys/sunaudio/gstsunaudiomixerctrl.c Tue Jan 9 23:24:28 2007
@@ -235,20 +235,10 @@ gst_sunaudiomixer_ctrl_get_volume (GstSu
}
}
- /* Likewise reset MUTE */
- if ((sunaudiotrack->track_num == GST_SUNAUDIO_TRACK_OUTPUT &&
- audioinfo.output_muted == 1) ||
- (sunaudiotrack->track_num != GST_SUNAUDIO_TRACK_OUTPUT && gain == 0)) {
- track->flags |= GST_MIXER_TRACK_MUTE;
- } else {
- /*
- * If MUTE is set, then gain is always 0, so don't bother
- * resetting our internal value.
- */
+
sunaudiotrack->gain = gain;
sunaudiotrack->balance = balance;
track->flags &= ~GST_MIXER_TRACK_MUTE;
- }
}
void
@@ -337,11 +327,6 @@ gst_sunaudiomixer_ctrl_set_mute (GstSunA
switch (sunaudiotrack->track_num) {
case GST_SUNAUDIO_TRACK_OUTPUT:
-
- if (mute)
- audioinfo.output_muted = 1;
- else
- audioinfo.output_muted = 0;
audioinfo.play.gain = volume;
audioinfo.play.balance = balance;

12
multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiomixerctrl_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-sys_sunaudio_gstsunaudiomixerctrl_h,v 1.1 2007/01/09 23:22:56 espie Exp $
--- sys/sunaudio/gstsunaudiomixerctrl.h.orig Tue Jan 9 23:18:47 2007
+++ sys/sunaudio/gstsunaudiomixerctrl.h Tue Jan 9 23:19:06 2007
@@ -19,6 +19,8 @@
#ifndef __GST_SUNAUDIO_MIXER_CTRL_H
#define __GST_SUNAUDIO_MIXER_CTRL_H
+#include <sys/types.h>
+#include <sys/ioctl.h>
#include <sys/audioio.h>
#include <gst/gst.h>

29
multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiosink_c Normal file
View File

@ -0,0 +1,29 @@
$OpenBSD: patch-sys_sunaudio_gstsunaudiosink_c,v 1.1 2007/01/09 23:22:56 espie Exp $
--- sys/sunaudio/gstsunaudiosink.c.orig Tue Jan 9 23:19:43 2007
+++ sys/sunaudio/gstsunaudiosink.c Tue Jan 9 23:22:54 2007
@@ -42,7 +42,6 @@
#include <fcntl.h>
#include <string.h>
-#include <stropts.h>
#include <unistd.h>
#include <sys/mman.h>
@@ -623,7 +622,7 @@ gst_sunaudiosink_reset (GstAudioSink * a
}
/* Flush the audio */
- ret = ioctl (sunaudiosink->fd, I_FLUSH, FLUSHW);
+ ret = ioctl (sunaudiosink->fd, AUDIO_FLUSH);
if (ret == -1) {
GST_ELEMENT_ERROR (sunaudiosink, RESOURCE, SETTINGS, (NULL), ("%s",
strerror (errno)));
@@ -638,7 +637,7 @@ gst_sunaudiosink_reset (GstAudioSink * a
g_cond_signal (sunaudiosink->sleep_cond);
- ret = ioctl (sunaudiosink->fd, I_FLUSH, FLUSHW);
+ ret = ioctl (sunaudiosink->fd, AUDIO_FLUSH);
if (ret == -1) {
GST_ELEMENT_ERROR (sunaudiosink, RESOURCE, SETTINGS, (NULL), ("%s",
strerror (errno)));

12
multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiosink_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-sys_sunaudio_gstsunaudiosink_h,v 1.1 2007/01/09 23:22:56 espie Exp $
--- sys/sunaudio/gstsunaudiosink.h.orig Tue Jan 9 23:20:19 2007
+++ sys/sunaudio/gstsunaudiosink.h Tue Jan 9 23:20:32 2007
@@ -23,6 +23,8 @@
#ifndef __GST_SUNAUDIO_SINK_H__
#define __GST_SUNAUDIO_SINK_H__
+#include <sys/types.h>
+#include <sys/ioctl.h>
#include <sys/audioio.h>
#include <gst/gst.h>
#include <gst/audio/gstaudiosink.h>

41
multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiosrc_c Normal file
View File

@ -0,0 +1,41 @@
$OpenBSD: patch-sys_sunaudio_gstsunaudiosrc_c,v 1.1 2007/01/09 23:22:56 espie Exp $
--- sys/sunaudio/gstsunaudiosrc.c.orig Tue Jan 9 23:24:45 2007
+++ sys/sunaudio/gstsunaudiosrc.c Tue Jan 9 23:26:04 2007
@@ -45,8 +45,6 @@
#include <fcntl.h>
#include <string.h>
#include <unistd.h>
-#include <stropts.h>
-#include <sys/mixer.h>
#include "gstsunaudiosrc.h"
@@ -248,9 +246,8 @@ gst_sunaudiosrc_open (GstAudioSrc * asrc
int fd, ret, err;
fd = open (sunaudiosrc->device, O_RDONLY);
- err = ioctl (fd, AUDIO_MIXER_MULTIPLE_OPEN);
- if (fd == -1 || err == -1) {
+ if (fd == -1) {
GST_ELEMENT_ERROR (sunaudiosrc, RESOURCE, OPEN_READ, (NULL),
("can't open connection to Sun Audio device %s", sunaudiosrc->device));
@@ -375,7 +372,7 @@ gst_sunaudiosrc_prepare (GstAudioSrc * a
}
- ioctl (sunaudiosrc->fd, I_FLUSH, FLUSHR);
+ ioctl (sunaudiosrc->fd, AUDIO_FLUSH);
return TRUE;
}
@@ -429,7 +426,7 @@ gst_sunaudiosrc_reset (GstAudioSrc * asr
}
/* Flush the audio */
- ret = ioctl (sunaudiosrc->fd, I_FLUSH, FLUSHR);
+ ret = ioctl (sunaudiosrc->fd, AUDIO_FLUSH);
if (ret == -1) {
GST_ELEMENT_ERROR (sunaudiosrc, RESOURCE, SETTINGS, (NULL), ("%s",
strerror (errno)));

4
multimedia/gstreamer-0.10/plugins-good/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.3 2007/01/09 21:33:25 espie Exp $
@comment $OpenBSD: PLIST-main,v 1.4 2007/01/09 23:22:56 espie Exp $
lib/gstreamer-${VERSION}/libgstalaw.la
lib/gstreamer-${VERSION}/libgstalaw.so
lib/gstreamer-${VERSION}/libgstalpha.la
@ -49,6 +49,8 @@ lib/gstreamer-${VERSION}/libgstrtsp.la
lib/gstreamer-${VERSION}/libgstrtsp.so
lib/gstreamer-${VERSION}/libgstsmpte.la
lib/gstreamer-${VERSION}/libgstsmpte.so
lib/gstreamer-${VERSION}/libgstsunaudio.la
lib/gstreamer-${VERSION}/libgstsunaudio.so
lib/gstreamer-${VERSION}/libgstudp.la
lib/gstreamer-${VERSION}/libgstudp.so
lib/gstreamer-${VERSION}/libgstvideobalance.la