shm: Move to sys/ since it doesn't exist on windows

This commit is contained in:
Olivier Crête 2010-06-03 14:42:06 -04:00
parent 536e79befd
commit 21686e3077
12 changed files with 16 additions and 5 deletions

View file

@ -332,7 +332,6 @@ AG_GST_CHECK_PLUGIN(scaletempo)
AG_GST_CHECK_PLUGIN(sdp)
AG_GST_CHECK_PLUGIN(segmentclip)
AG_GST_CHECK_PLUGIN(selector)
AG_GST_CHECK_PLUGIN(shm)
AG_GST_CHECK_PLUGIN(siren)
AG_GST_CHECK_PLUGIN(speed)
AG_GST_CHECK_PLUGIN(subenc)
@ -496,6 +495,12 @@ AG_GST_CHECK_FEATURE(QUICKTIME, [QuickTime wrapper], qtwrapper, [
[#include <Quicktime/Quicktime.h>])
])
dnl check for shm_open (for shm plugin)
translit(dnm, m, l) AM_CONDITIONAL(USE_SHM, true)
AG_GST_CHECK_FEATURE(SHM, [POSIX shared memory source and sink], shm, [
AC_CHECK_LIB(rt, shm_open, HAVE_SHM=yes, HAVE_SHM=no)
])
dnl check for Video CD
translit(dnm, m, l) AM_CONDITIONAL(USE_VCD, true)
AG_GST_CHECK_FEATURE(VCD, [Video CD], vcdsrc, [
@ -1705,7 +1710,6 @@ gst/scaletempo/Makefile
gst/sdp/Makefile
gst/segmentclip/Makefile
gst/selector/Makefile
gst/shm/Makefile
gst/siren/Makefile
gst/speed/Makefile
gst/subenc/Makefile
@ -1732,6 +1736,7 @@ sys/dvb/Makefile
sys/fbdev/Makefile
sys/osxvideo/Makefile
sys/qtwrapper/Makefile
sys/shm/Makefile
sys/vcd/Makefile
sys/vdpau/Makefile
sys/wasapi/Makefile

View file

@ -76,9 +76,15 @@ else
VDPAU_DIR=
endif
SUBDIRS = $(ACM_DIR) $(DIRECTDRAW_DIR) $(DIRECTSOUND_DIR) $(DVB_DIR) $(FBDEV_DIR) $(OSX_VIDEO_DIR) $(QT_DIR) $(VCD_DIR) $(VDPAU_DIR) $(WININET_DIR)
if USE_SHM
SHM_DIR=shm
else
SHM_DIR=
endif
SUBDIRS = $(ACM_DIR) $(DIRECTDRAW_DIR) $(DIRECTSOUND_DIR) $(DVB_DIR) $(FBDEV_DIR) $(OSX_VIDEO_DIR) $(QT_DIR) $(SHM_DIR) $(VCD_DIR) $(VDPAU_DIR) $(WININET_DIR)
DIST_SUBDIRS = acmenc acmmp3dec directdraw directsound dvb fbdev dshowdecwrapper dshowsrcwrapper dshowvideosink \
osxvideo qtwrapper vcd vdpau wasapi wininet winks winscreencap
osxvideo qtwrapper shm vcd vdpau wasapi wininet winks winscreencap
include $(top_srcdir)/common/parallel-subdirs.mak

View file

@ -6,7 +6,7 @@ plugin_LTLIBRARIES = libgstshm.la
libgstshm_la_SOURCES = shmpipe.c shmalloc.c gstshm.c gstshmsrc.c gstshmsink.c
libgstshm_la_CFLAGS = $(GST_CFLAGS)
libgstshm_la_LIBADD =
libgstshm_la_LIBADD = -lrt
libgstshm_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS)
libgstshm_la_LIBTOOLFLAGS = --tag=disable-static