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

- fix OSS audio output with azalia(4); patch from jakemsr@, thanks ;-)

Browse Source 
- we're using autotools, so patch gst-default.m4 instead of configure to
add sensible output defaults; problem noticed by jakemsr@
- fix WANTLIB while here

ok jakemsr@
This commit is contained in:
ajacoutot 2008-02-14 18:51:59 +00:00
parent 27e509243a
commit 2b6f74519a
4 changed files with 51 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.14 2007/10/21 14:33:07 espie Exp $
# $OpenBSD: Makefile,v 1.15 2008/02/14 18:51:59 ajacoutot Exp $
COMMENT-main= multimedia framework - good plugins
COMMENT-aalib= multimedia framework - aalib plugin
@ -17,20 +17,20 @@ COMMENT-shout= multimedia framework - shoutcast plugin
V= 0.10.5
DISTNAME= gst-plugins-good-$V
PKGNAME-main= gstreamer-plugins-good-$Vp1
PKGNAME-aalib= gstreamer-aalib-$Vp1
PKGNAME-cairo= gstreamer-cairo-$Vp2
PKGNAME-gconf= gstreamer-confelements-$Vp2
PKGNAME-esd= gstreamer-esd-$Vp0
PKGNAME-flac= gstreamer-flac-$Vp1
PKGNAME-speex= gstreamer-speex-$Vp0
PKGNAME-taglib= gstreamer-taglib-$Vp0
PKGNAME-dv= gstreamer-dv-$Vp0
PKGNAME-jpeg= gstreamer-jpeg-$Vp0
PKGNAME-png= gstreamer-png-$Vp0
PKGNAME-gdk= gstreamer-gdk-pixbuf-$Vp2
PKGNAME-caca= gstreamer-libcaca-$Vp1
PKGNAME-shout= gstreamer-shoutcast-$Vp0
PKGNAME-main= gstreamer-plugins-good-$Vp2
PKGNAME-aalib= gstreamer-aalib-$Vp2
PKGNAME-cairo= gstreamer-cairo-$Vp3
PKGNAME-gconf= gstreamer-confelements-$Vp3
PKGNAME-esd= gstreamer-esd-$Vp1
PKGNAME-flac= gstreamer-flac-$Vp2
PKGNAME-speex= gstreamer-speex-$Vp1
PKGNAME-taglib= gstreamer-taglib-$Vp1
PKGNAME-dv= gstreamer-dv-$Vp1
PKGNAME-jpeg= gstreamer-jpeg-$Vp1
PKGNAME-png= gstreamer-png-$Vp1
PKGNAME-gdk= gstreamer-gdk-pixbuf-$Vp3
PKGNAME-caca= gstreamer-libcaca-$Vp2
PKGNAME-shout= gstreamer-shoutcast-$Vp1
MULTI_PACKAGES= -main -aalib -cairo -gconf -esd -flac -speex \
@ -44,7 +44,7 @@ MODULES= devel/gettext
RUN_DEPENDS= ::${BUILD_PKGPATH}
WANTLIB= glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \
xml2 m z
pcre xml2 m z
LIB_DEPENDS= gstreamer-0.10:gstreamer->=0.10:multimedia/gstreamer-0.10/core
WANTLIB-main= ${WANTLIB} \
@ -117,9 +117,10 @@ LIB_DEPENDS-png= ${LIB_DEPENDS} \
png::graphics/png
WANTLIB-gdk= ${WANTLIB} \
X11 Xext Xrender atk-1.0 cairo fontconfig freetype \
glitz pango-1.0 pangocairo-1.0 pangoft2-1.0 png \
gstbase-0.10 Xau Xcursor Xdmcp Xfixes Xi Xinerama Xrandr expat
X11 Xcomposite Xdamage Xext Xrender atk-1.0 \
cairo fontconfig freetype glitz pango-1.0 \
pangocairo-1.0 pangoft2-1.0 png gstbase-0.10 \
Xau Xcursor Xdmcp Xfixes Xi Xinerama Xrandr expat
LIB_DEPENDS-gdk= ${LIB_DEPENDS} \
gdk_pixbuf-2.0,gtk-x11-2.0,gdk-x11-2.0::x11/gtk+2

15
multimedia/gstreamer-0.10/plugins-good/patches/patch-common_m4_gst-default_m4 Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-common_m4_gst-default_m4,v 1.1 2008/02/14 18:52:00 ajacoutot Exp $
--- common/m4/gst-default.m4.orig Thu Feb 14 09:39:16 2008
+++ common/m4/gst-default.m4 Thu Feb 14 09:43:41 2008
@@ -25,6 +25,11 @@ AC_DEFUN([GST_DEFAULT_ELEMENTS],
DEFAULT_AUDIOSRC="osxaudiosrc"
DEFAULT_VIDEOSINK="osxvideosink"
;;
+ *-openbsd* )
+ DEFAULT_AUDIOSINK="osssink"
+ DEFAULT_AUDIOSRC="osssrc"
+ DEFAULT_VIDEOSINK="xvimagesink"
+ ;;
esac
AC_SUBST(DEFAULT_AUDIOSINK)

15
multimedia/gstreamer-0.10/plugins-good/patches/patch-configure
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-configure,v 1.1 2007/10/14 11:12:54 ajacoutot Exp $
--- configure.orig Sun Oct 14 12:49:34 2007
+++ configure Sun Oct 14 12:51:59 2007
@@ -29725,9 +29725,9 @@ _ACEOF
- DEFAULT_AUDIOSINK="autoaudiosink"
+ DEFAULT_AUDIOSINK="osssink"
DEFAULT_VIDEOSINK="autovideosink"
- DEFAULT_AUDIOSRC="alsasrc"
+ DEFAULT_AUDIOSRC="osssrc"
DEFAULT_VIDEOSRC="v4lsrc"
DEFAULT_VISUALIZER="goom"
case "$host" in

16
multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_oss_gstosshelper_c Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-sys_oss_gstosshelper_c,v 1.1 2008/02/14 18:52:00 ajacoutot Exp $
--- sys/oss/gstosshelper.c.orig Thu Feb 14 09:28:31 2008
+++ sys/oss/gstosshelper.c Thu Feb 14 09:29:52 2008
@@ -253,6 +253,12 @@ gst_oss_helper_rate_probe_check (GstOssProbe * probe)
* driver is seriously buggy, and probably doesn't work with other
* media libraries/apps. */
probe->min = gst_oss_helper_rate_check_rate (probe, 8000);
+ if (probe->min == -1)
+ probe->min = gst_oss_helper_rate_check_rate (probe, 32000);
+ if (probe->min == -1)
+ probe->min = gst_oss_helper_rate_check_rate (probe, 44100);
+ if (probe->min == -1)
+ probe->min = gst_oss_helper_rate_check_rate (probe, 48000);
probe->max = gst_oss_helper_rate_check_rate (probe, 48000);
}
if (probe->min == -1 || probe->max == -1) {