diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 17 | ||||
| -rw-r--r-- | ext/Makefile.am | 17 | ||||
| -rw-r--r-- | gst/mpeg1sys/Makefile.am | 2 | ||||
| -rw-r--r-- | gst/mpeg2sub/gstmpeg2subt.c | 2 | ||||
| -rw-r--r-- | gst/mpegaudioparse/Makefile.am | 2 | ||||
| -rw-r--r-- | gst/rtjpeg/Makefile.am | 2 | ||||
| -rw-r--r-- | gst/rtjpeg/gstrtjpeg.c | 4 |
8 files changed, 33 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am index 50801b04..3dfc9c80 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ -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 diff --git a/configure.ac b/configure.ac index 7c5888d9..c037fbb8 100644 --- a/configure.ac +++ b/configure.ac @@ -311,6 +311,21 @@ AC_ARG_WITH(plugins, 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 ============================= sys plugins ================================ dnl ========================================================================== @@ -1076,7 +1091,6 @@ sys/vcd/Makefile sys/vga/Makefile sys/xvideo/Makefile ext/Makefile -ext/a52/Makefile ext/aalib/Makefile ext/alsa/Makefile ext/audiofile/Makefile @@ -1088,6 +1102,7 @@ ext/vorbis/Makefile gst-libs/Makefile gst-libs/gst/Makefile gst-libs/gst/audio/Makefile +gst-libs/gst/resample/Makefile gst-plugins.spec ) diff --git a/ext/Makefile.am b/ext/Makefile.am index ff91846e..0edd708f 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -1,8 +1,8 @@ -if USE_A52 -A52_DIR=a52 -else -A52_DIR= -endif +#if USE_A52 +#A52_DIR=a52 +#else +#A52_DIR= +#endif if USE_AALIB AALIB_DIR=aalib @@ -52,9 +52,10 @@ else VORBIS_DIR= endif - -SUBDIRS=$(A52_DIR) $(AALIB_DIR) $(ALSA_DIR) $(AUDIOFILE_DIR) $(ESD_DIR) \ +#$A52_DIR +SUBDIRS=$(AALIB_DIR) $(ALSA_DIR) $(AUDIOFILE_DIR) $(ESD_DIR) \ $(LAME_DIR) $(MAD_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 diff --git a/gst/mpeg1sys/Makefile.am b/gst/mpeg1sys/Makefile.am index 5e28e2be..44c49467 100644 --- a/gst/mpeg1sys/Makefile.am +++ b/gst/mpeg1sys/Makefile.am @@ -5,9 +5,9 @@ filter_LTLIBRARIES = libgstmpeg1systemencode.la libgstmpeg1systemencode_la_SOURCES = gstmpeg1systemencode.c \ buffer.c \ systems.c +libgstmpeg1systemencode_la_CFLAGS = -O2 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math $(GST_CFLAGS) noinst_HEADERS = gstmpeg1systemencode.h \ main.h \ buffer.h -libsystem_encode_la_CFLAGS = -O2 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math $(GST_CFLAGS) diff --git a/gst/mpeg2sub/gstmpeg2subt.c b/gst/mpeg2sub/gstmpeg2subt.c index ee51d067..eda8dee6 100644 --- a/gst/mpeg2sub/gstmpeg2subt.c +++ b/gst/mpeg2sub/gstmpeg2subt.c @@ -19,7 +19,7 @@ /*#define DEBUG_ENABLED */ -#include <mpeg2subt.h> +#include <gstmpeg2subt.h> static void gst_mpeg2subt_class_init (GstMpeg2SubtClass *klass); static void gst_mpeg2subt_init (GstMpeg2Subt *mpeg2subt); diff --git a/gst/mpegaudioparse/Makefile.am b/gst/mpegaudioparse/Makefile.am index 9d670bd3..4823c996 100644 --- a/gst/mpegaudioparse/Makefile.am +++ b/gst/mpegaudioparse/Makefile.am @@ -3,7 +3,7 @@ filterdir = $(libdir)/gst filter_LTLIBRARIES = libgstmpegaudioparse.la libgstmp3types.la -libgstmpegaudioparse_la_SOURCES = gstmpegaudioparse.c gstmp3types.c +libgstmpegaudioparse_la_SOURCES = gstmpegaudioparse.c # FIXME is this useful? libgstmpegaudioparse_la_CFLAGS = -O3 $(FOMIT_FRAME_POINTER) -ffast-math -finline-functions $(GST_CFLAGS) diff --git a/gst/rtjpeg/Makefile.am b/gst/rtjpeg/Makefile.am index 157ac760..8adeae0b 100644 --- a/gst/rtjpeg/Makefile.am +++ b/gst/rtjpeg/Makefile.am @@ -2,7 +2,7 @@ filterdir = $(libdir)/gst 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) noinst_HEADERS = gstrtjpegenc.h gstrtjpegdec.h RTjpeg.h diff --git a/gst/rtjpeg/gstrtjpeg.c b/gst/rtjpeg/gstrtjpeg.c index 335914f6..c34d0f61 100644 --- a/gst/rtjpeg/gstrtjpeg.c +++ b/gst/rtjpeg/gstrtjpeg.c @@ -41,13 +41,13 @@ conversion utilities"); /* create an elementfactory for the rtjpegenc element */ enc = gst_elementfactory_new("rtjpegenc",GST_TYPE_RTJPEGENC, - &rtjpegenc_details); + &gst_rtjpegenc_details); g_return_val_if_fail(enc != NULL, FALSE); gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (enc)); /* create an elementfactory for the rtjpegdec element */ dec = gst_elementfactory_new("rtjpegdec",GST_TYPE_RTJPEGDEC, - &rtjpegdec_details); + &gst_rtjpegdec_details); g_return_val_if_fail(dec != NULL, FALSE); gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (dec)); |