Commit 789be9a7 authored by Andy Wingo Wingo's avatar Andy Wingo Wingo

much build fixage turns out synaesthesia and smoothwav depend on gtk, maybe they should go to ext/

Original commit message from CVS:
much build fixage
turns out synaesthesia and smoothwav depend on gtk, maybe they should go to
ext/
parent d1141be8
SUBDIRS=gst sys ext gst-libs SUBDIRS=gst-libs gst sys ext
DIST_SUBDIRS=gst sys ext gst-libs DIST_SUBDIRS=gst-libs gst sys ext
EXTRA_DIST=gst-plugins.spec AUTHORS COPYING README ChangeLog EXTRA_DIST=gst-plugins.spec AUTHORS COPYING README ChangeLog
...@@ -311,6 +311,21 @@ AC_ARG_WITH(plugins, ...@@ -311,6 +311,21 @@ AC_ARG_WITH(plugins,
AC_SUBST(GST_PLUGINS_SELECTED) AC_SUBST(GST_PLUGINS_SELECTED)
dnl needed for smoothwave, FIXME!
if test x$USE_GLIB2 = xno; then
AM_PATH_GTK(1.2.0,,
AC_MSG_ERROR(Cannot find gtk: Is gtk-config in path?))
HAVE_GTK=yes
# we have to have it
else
PKG_CHECK_MODULES(GTK2, gtk+-2.0, HAVE_GTK=yes, HAVE_GTK=no)
GTK_CFLAGS=$GTK2_CFLAGS
GTK_LIBS=$GTK2_LIBS
fi
AC_SUBST(GTK_LIBS)
AC_SUBST(GTK_CFLAGS)
dnl ========================================================================== dnl ==========================================================================
dnl ============================= sys plugins ================================ dnl ============================= sys plugins ================================
dnl ========================================================================== dnl ==========================================================================
...@@ -1076,7 +1091,6 @@ sys/vcd/Makefile ...@@ -1076,7 +1091,6 @@ sys/vcd/Makefile
sys/vga/Makefile sys/vga/Makefile
sys/xvideo/Makefile sys/xvideo/Makefile
ext/Makefile ext/Makefile
ext/a52/Makefile
ext/aalib/Makefile ext/aalib/Makefile
ext/alsa/Makefile ext/alsa/Makefile
ext/audiofile/Makefile ext/audiofile/Makefile
...@@ -1088,6 +1102,7 @@ ext/vorbis/Makefile ...@@ -1088,6 +1102,7 @@ ext/vorbis/Makefile
gst-libs/Makefile gst-libs/Makefile
gst-libs/gst/Makefile gst-libs/gst/Makefile
gst-libs/gst/audio/Makefile gst-libs/gst/audio/Makefile
gst-libs/gst/resample/Makefile
gst-plugins.spec gst-plugins.spec
) )
......
if USE_A52 #if USE_A52
A52_DIR=a52 #A52_DIR=a52
else #else
A52_DIR= #A52_DIR=
endif #endif
if USE_AALIB if USE_AALIB
AALIB_DIR=aalib AALIB_DIR=aalib
...@@ -52,9 +52,10 @@ else ...@@ -52,9 +52,10 @@ else
VORBIS_DIR= VORBIS_DIR=
endif endif
#$A52_DIR
SUBDIRS=$(A52_DIR) $(AALIB_DIR) $(ALSA_DIR) $(AUDIOFILE_DIR) $(ESD_DIR) \ SUBDIRS=$(AALIB_DIR) $(ALSA_DIR) $(AUDIOFILE_DIR) $(ESD_DIR) \
$(LAME_DIR) $(MAD_DIR) \ $(LAME_DIR) $(MAD_DIR) \
$(SDL_DIR) $(VORBIS_DIR) $(SDL_DIR) $(VORBIS_DIR)
DIST_SUBDIRS=a52 aalib alsa audiofile esd lame mad sdl vorbis #a52
DIST_SUBDIRS=aalib alsa audiofile esd lame mad sdl vorbis
...@@ -5,9 +5,9 @@ filter_LTLIBRARIES = libgstmpeg1systemencode.la ...@@ -5,9 +5,9 @@ filter_LTLIBRARIES = libgstmpeg1systemencode.la
libgstmpeg1systemencode_la_SOURCES = gstmpeg1systemencode.c \ libgstmpeg1systemencode_la_SOURCES = gstmpeg1systemencode.c \
buffer.c \ buffer.c \
systems.c systems.c
libgstmpeg1systemencode_la_CFLAGS = -O2 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math $(GST_CFLAGS)
noinst_HEADERS = gstmpeg1systemencode.h \ noinst_HEADERS = gstmpeg1systemencode.h \
main.h \ main.h \
buffer.h buffer.h
libsystem_encode_la_CFLAGS = -O2 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math $(GST_CFLAGS)
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
/*#define DEBUG_ENABLED */ /*#define DEBUG_ENABLED */
#include <mpeg2subt.h> #include <gstmpeg2subt.h>
static void gst_mpeg2subt_class_init (GstMpeg2SubtClass *klass); static void gst_mpeg2subt_class_init (GstMpeg2SubtClass *klass);
static void gst_mpeg2subt_init (GstMpeg2Subt *mpeg2subt); static void gst_mpeg2subt_init (GstMpeg2Subt *mpeg2subt);
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
filterdir = $(libdir)/gst filterdir = $(libdir)/gst
filter_LTLIBRARIES = libgstmpegaudioparse.la libgstmp3types.la filter_LTLIBRARIES = libgstmpegaudioparse.la libgstmp3types.la
libgstmpegaudioparse_la_SOURCES = gstmpegaudioparse.c gstmp3types.c libgstmpegaudioparse_la_SOURCES = gstmpegaudioparse.c
# FIXME is this useful? # FIXME is this useful?
libgstmpegaudioparse_la_CFLAGS = -O3 $(FOMIT_FRAME_POINTER) -ffast-math -finline-functions $(GST_CFLAGS) libgstmpegaudioparse_la_CFLAGS = -O3 $(FOMIT_FRAME_POINTER) -ffast-math -finline-functions $(GST_CFLAGS)
......
...@@ -2,7 +2,7 @@ filterdir = $(libdir)/gst ...@@ -2,7 +2,7 @@ filterdir = $(libdir)/gst
filter_LTLIBRARIES = libgstrtjpeg.la filter_LTLIBRARIES = libgstrtjpeg.la
libgstrtjpeg_la_SOURCES = gstrtjpeg.c rtjpegenc.c rtjpegdec.c RTjpeg.c libgstrtjpeg_la_SOURCES = gstrtjpeg.c gstrtjpegenc.c gstrtjpegdec.c RTjpeg.c
libgstrtjpeg_la_CFLAGS = $(GST_CFLAGS) libgstrtjpeg_la_CFLAGS = $(GST_CFLAGS)
noinst_HEADERS = gstrtjpegenc.h gstrtjpegdec.h RTjpeg.h noinst_HEADERS = gstrtjpegenc.h gstrtjpegdec.h RTjpeg.h
...@@ -41,13 +41,13 @@ conversion utilities"); ...@@ -41,13 +41,13 @@ conversion utilities");
/* create an elementfactory for the rtjpegenc element */ /* create an elementfactory for the rtjpegenc element */
enc = gst_elementfactory_new("rtjpegenc",GST_TYPE_RTJPEGENC, enc = gst_elementfactory_new("rtjpegenc",GST_TYPE_RTJPEGENC,
&rtjpegenc_details); &gst_rtjpegenc_details);
g_return_val_if_fail(enc != NULL, FALSE); g_return_val_if_fail(enc != NULL, FALSE);
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (enc)); gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (enc));
/* create an elementfactory for the rtjpegdec element */ /* create an elementfactory for the rtjpegdec element */
dec = gst_elementfactory_new("rtjpegdec",GST_TYPE_RTJPEGDEC, dec = gst_elementfactory_new("rtjpegdec",GST_TYPE_RTJPEGDEC,
&rtjpegdec_details); &gst_rtjpegdec_details);
g_return_val_if_fail(dec != NULL, FALSE); g_return_val_if_fail(dec != NULL, FALSE);
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (dec)); gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (dec));
......
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