Commit 1732ce03 authored by Tim-Philipp Müller's avatar Tim-Philipp Müller
Browse files

Move oss4 plugin from -bad to -good

Hook up build infrastructure, docs and tests.

Fixes #614305.
parent 02a226f7
...@@ -433,6 +433,15 @@ dnl Some old BSD versions and also newer OpenBSD versions : ...@@ -433,6 +433,15 @@ dnl Some old BSD versions and also newer OpenBSD versions :
]) ])
]) ])
dnl *** oss4 ***
translit(dnm, m, l) AM_CONDITIONAL(USE_OSS4, true)
AG_GST_CHECK_FEATURE(OSS4, [Open Sound System 4], oss4, [
AC_MSG_CHECKING([Checking if we can build the OSS4 elements])
AC_CHECK_HEADERS([fcntl.h sys/ioctl.h sys/stat.h sys/types.h],
[test -z "$OSS4_MISSING_HEADER" && HAVE_OSS4="yes"],
[OSS4_MISSING_HEADER="yes";HAVE_OSS4="no"])
])
dnl *** Sun Audio *** dnl *** Sun Audio ***
translit(dnm, m, l) AM_CONDITIONAL(USE_SUNAUDIO, true) translit(dnm, m, l) AM_CONDITIONAL(USE_SUNAUDIO, true)
AG_GST_CHECK_FEATURE(SUNAUDIO, [Sun Audio], sunaudio, [ AG_GST_CHECK_FEATURE(SUNAUDIO, [Sun Audio], sunaudio, [
...@@ -990,6 +999,7 @@ AM_CONDITIONAL(USE_LIBCACA, false) ...@@ -990,6 +999,7 @@ AM_CONDITIONAL(USE_LIBCACA, false)
AM_CONDITIONAL(USE_LIBDV, false) AM_CONDITIONAL(USE_LIBDV, false)
AM_CONDITIONAL(USE_LIBPNG, false) AM_CONDITIONAL(USE_LIBPNG, false)
AM_CONDITIONAL(USE_OSS, false) AM_CONDITIONAL(USE_OSS, false)
AM_CONDITIONAL(USE_OSS4, false)
AM_CONDITIONAL(USE_OSX_AUDIO, false) AM_CONDITIONAL(USE_OSX_AUDIO, false)
AM_CONDITIONAL(USE_OSX_VIDEO, false) AM_CONDITIONAL(USE_OSX_VIDEO, false)
AM_CONDITIONAL(USE_PULSE, false) AM_CONDITIONAL(USE_PULSE, false)
...@@ -1130,9 +1140,10 @@ ext/wavpack/Makefile ...@@ -1130,9 +1140,10 @@ ext/wavpack/Makefile
sys/Makefile sys/Makefile
sys/directsound/Makefile sys/directsound/Makefile
sys/oss/Makefile sys/oss/Makefile
sys/sunaudio/Makefile sys/oss4/Makefile
sys/osxaudio/Makefile sys/osxaudio/Makefile
sys/osxvideo/Makefile sys/osxvideo/Makefile
sys/sunaudio/Makefile
sys/v4l2/Makefile sys/v4l2/Makefile
sys/waveform/Makefile sys/waveform/Makefile
sys/ximage/Makefile sys/ximage/Makefile
......
...@@ -138,6 +138,7 @@ rm -rf $RPM_BUILD_ROOT ...@@ -138,6 +138,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/gstreamer-%{majorminor}/libgstdeinterlace.so %{_libdir}/gstreamer-%{majorminor}/libgstdeinterlace.so
%{_libdir}/gstreamer-%{majorminor}/libgstflv.so %{_libdir}/gstreamer-%{majorminor}/libgstflv.so
%{_libdir}/gstreamer-%{majorminor}/libgsty4menc.so %{_libdir}/gstreamer-%{majorminor}/libgsty4menc.so
%{_libdir}/gstreamer-%{majorminor}/libgstoss4audio.so
# sys plugins # sys plugins
@USE_GST_V4L2_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstvideo4linux2.so @USE_GST_V4L2_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstvideo4linux2.so
......
...@@ -15,6 +15,9 @@ sys/oss/gstossmixer.c ...@@ -15,6 +15,9 @@ sys/oss/gstossmixer.c
sys/oss/gstossmixertrack.c sys/oss/gstossmixertrack.c
sys/oss/gstosssink.c sys/oss/gstosssink.c
sys/oss/gstosssrc.c sys/oss/gstosssrc.c
sys/oss4/oss4-mixer.c
sys/oss4/oss4-sink.c
sys/oss4/oss4-source.c
sys/sunaudio/gstsunaudiomixertrack.c sys/sunaudio/gstsunaudiomixertrack.c
sys/v4l2/gstv4l2src.c sys/v4l2/gstv4l2src.c
sys/v4l2/v4l2_calls.c sys/v4l2/v4l2_calls.c
......
...@@ -10,6 +10,13 @@ else ...@@ -10,6 +10,13 @@ else
OSS_DIR= OSS_DIR=
endif endif
if USE_OSS4
OSS4_DIR=oss4
else
OSS4_DIR=
endif
if USE_DIRECTSOUND if USE_DIRECTSOUND
DIRECTSOUND_DIR=directsound DIRECTSOUND_DIR=directsound
else else
...@@ -70,8 +77,8 @@ else ...@@ -70,8 +77,8 @@ else
XIMAGE_DIR= XIMAGE_DIR=
endif endif
SUBDIRS=$(DIRECTSOUND_DIR) $(OSS_DIR) $(OSX_AUDIO_DIR) $(OSX_VIDEO_DIR) $(SUNAUDIO_DIR) $(V4L2_DIR) $(XIMAGE_DIR) SUBDIRS=$(DIRECTSOUND_DIR) $(OSS_DIR) $(OSS4_DIR) $(OSX_AUDIO_DIR) $(OSX_VIDEO_DIR) $(SUNAUDIO_DIR) $(V4L2_DIR) $(XIMAGE_DIR)
DIST_SUBDIRS=directsound oss osxaudio osxvideo sunaudio v4l2 waveform ximage DIST_SUBDIRS=directsound oss oss4 osxaudio osxvideo sunaudio v4l2 waveform ximage
include $(top_srcdir)/common/parallel-subdirs.mak include $(top_srcdir)/common/parallel-subdirs.mak
gdkpixbufsink-test gdkpixbufsink-test
test-oss4
ximagesrc-test ximagesrc-test
v4l2src-test v4l2src-test
videobox-test videobox-test
......
...@@ -18,6 +18,17 @@ else ...@@ -18,6 +18,17 @@ else
V4L2_TESTS = V4L2_TESTS =
endif endif
if USE_OSS4
OSS4_TESTS=test-oss4
test_oss4_SOURCES = test-oss4.c
test_oss4_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
test_oss4_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-0.10 $(GST_LIBS)
test_oss4_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
else
OSS4_TESTS=
endif
if USE_X if USE_X
X_TESTS = ximagesrc-test X_TESTS = ximagesrc-test
...@@ -40,5 +51,5 @@ videocrop2_test_SOURCES = videocrop2-test.c ...@@ -40,5 +51,5 @@ videocrop2_test_SOURCES = videocrop2-test.c
videocrop2_test_CFLAGS = $(GST_CFLAGS) videocrop2_test_CFLAGS = $(GST_CFLAGS)
videocrop2_test_LDADD = $(GST_LIBS) videocrop2_test_LDADD = $(GST_LIBS)
noinst_PROGRAMS = $(GTK_TESTS) $(V4L2_TESTS) $(X_TESTS) videocrop-test videobox-test videocrop2-test noinst_PROGRAMS = $(GTK_TESTS) $(OSS4_TESTS) $(V4L2_TESTS) $(X_TESTS) videocrop-test videobox-test videocrop2-test
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment