much build fixage turns out synaesthesia and smoothwav depend on gtk, maybe they...

Original commit message from CVS:
much build fixage
turns out synaesthesia and smoothwav depend on gtk, maybe they should go to
ext/

diff --git a/Makefile.am b/Makefile.am
index 50801b047feeeb0509604d5fb2ce52883bd8257b..3dfc9c800f75cff6b7371f130744537ec0200274 100644 (file)
--- 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 7c5888d96745a2702b92d890b73f072fb59b46d4..c037fbb8ae3175cd5ef9bd507e9c8d79d4ad1104 100644 (file)
--- 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 ff91846e69cca39c3150b604665248229319f943..0edd708f5481e8af074bdf8dbe1d59d15b9698ea 100644 (file)
--- 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/ext/alsa/gstalsa.c b/ext/alsa/gstalsa.c
index 8cd8afc8c3f47a195505e8f63640f79034b21553..db2f713845f3346773149f3db5396ab2743664ad 100644 (file)
--- a/ext/alsa/gstalsa.c
+++ b/ext/alsa/gstalsa.c
@@ -19,7 +19,7 @@
 */
 
 #include <stdlib.h>
-#include "alsa.h"
+#include "gstalsa.h"
 
 static GstElementDetails gst_alsa_sink_details = {  
     "Alsa Sink",

diff --git a/ext/alsa/gstalsa.h b/ext/alsa/gstalsa.h
index 4fdaaa68359046adc7bbc7772e43cedd3f58c0ad..37ccb00ba14ffdacd45f12c2b266f5a2b6b754a1 100644 (file)
--- a/ext/alsa/gstalsa.h
+++ b/ext/alsa/gstalsa.h
@@ -21,7 +21,7 @@
 #ifndef __GST_ALSA_H__
 #define __GST_ALSA_H__
 
-#include <sys/asoundlib.h>
+#include <alsa/asoundlib.h>
 #include <gst/gst.h>
 #include <libs/bytestream/gstbytestream.h>
 #include <glib.h>

diff --git a/gst/audioscale/Makefile.am b/gst/audioscale/Makefile.am
index a6cde7afe1f4a11cec6a87947e0dae097aaf4400..421d801024b2a10f8d85d43d18c763409b56ebd3 100644 (file)
--- a/gst/audioscale/Makefile.am
+++ b/gst/audioscale/Makefile.am
@@ -4,7 +4,7 @@ filterdir = $(libdir)/gst
 filter_LTLIBRARIES = libgstaudioscale.la
 
 libgstaudioscale_la_SOURCES = gstaudioscale.c
-libgstaudioscale_la_LIBADD = $(top_builddir)/libs/resample/libresample.la
+libgstaudioscale_la_LIBADD = $(top_builddir)/gst-libs/gst/resample/libgstresample.la
 libgstaudioscale_la_CFLAGS = -ffast-math $(GST_CFLAGS)
 
 noinst_HEADERS = gstaudioscale.h

diff --git a/gst/videoscale/Makefile.am b/gst/videoscale/Makefile.am
index e2ca13d75121c41f6f893032e6800a6d6ec63708..aac20cfdb19b1e62a50fe0f7cf7e3be79bced67e 100644 (file)
--- a/gst/videoscale/Makefile.am
+++ b/gst/videoscale/Makefile.am
@@ -14,7 +14,7 @@ libgstvideoscale_la_SOURCES = \
                        gstvideoscale.c \
                        videoscale.c \
                        $(ARCHSRCS)
-libvideoscale_la_CFLAGS = -O2 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math $(GST_CFLAGS)
+libgstvideoscale_la_CFLAGS = -O2 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math $(GST_CFLAGS)
 
 noinst_HEADERS = gstvideoscale.h videoscale_x86.h
 

diff --git a/gst/videoscale/videoscale.c b/gst/videoscale/videoscale.c
index d33aab6835d522432f5e5f3bb7d0098f62d20816..fc1549a256a1f85b3453a180f59d6e377ecfbe9b 100644 (file)
--- a/gst/videoscale/videoscale.c
+++ b/gst/videoscale/videoscale.c
@@ -28,15 +28,15 @@
 #include "videoscale_x86.h"
 #endif
 
-static void    gst_videoscale_scale_yuv                (Videoscale *scale, unsigned char *src, unsigned char *dest);
-static void    gst_videoscale_scale_rgb                (Videoscale *scale, unsigned char *src, unsigned char *dest);
+static void    gst_videoscale_scale_yuv                (GstVideoscale *scale, unsigned char *src, unsigned char *dest);
+static void    gst_videoscale_scale_rgb                (GstVideoscale *scale, unsigned char *src, unsigned char *dest);
 
 /* scalers */
-static void    gst_videoscale_scale_nearest            (Videoscale *scale, unsigned char *src, unsigned char *dest,
+static void    gst_videoscale_scale_nearest            (GstVideoscale *scale, unsigned char *src, unsigned char *dest,
                                                         int sw, int sh, int dw, int dh);
-static void    gst_videoscale_scale_plane_slow         (Videoscale *scale, unsigned char *src, unsigned char *dest,
+static void    gst_videoscale_scale_plane_slow         (GstVideoscale *scale, unsigned char *src, unsigned char *dest,
                                                         int sw, int sh, int dw, int dh);
-static void    gst_videoscale_scale_point_sample       (Videoscale *scale, unsigned char *src, unsigned char *dest,
+static void    gst_videoscale_scale_point_sample       (GstVideoscale *scale, unsigned char *src, unsigned char *dest,
                                                         int sw, int sh, int dw, int dh);
 
 /* filters */
@@ -44,7 +44,7 @@ static unsigned char gst_videoscale_bilinear          (unsigned char *src, double x, dou
 static unsigned char gst_videoscale_bicubic            (unsigned char *src, double x, double y, int sw, int sh);
 
 void
-gst_videoscale_setup (Videoscale *scale)
+gst_videoscale_setup (GstVideoscale *scale)
 {
   switch (scale->format) {
     case GST_MAKE_FOURCC('I','4','2','0'):
@@ -95,7 +95,7 @@ gst_videoscale_setup (Videoscale *scale)
 }
 
 static void
-gst_videoscale_scale_rgb (Videoscale *scale, unsigned char *src, unsigned char *dest)
+gst_videoscale_scale_rgb (GstVideoscale *scale, unsigned char *src, unsigned char *dest)
 {
   int sw = scale->width;
   int sh = scale->height;
@@ -121,7 +121,7 @@ gst_videoscale_scale_rgb (Videoscale *scale, unsigned char *src, unsigned char *
 }
 
 static void
-gst_videoscale_scale_yuv (Videoscale *scale, unsigned char *src, unsigned char *dest)
+gst_videoscale_scale_yuv (GstVideoscale *scale, unsigned char *src, unsigned char *dest)
 {
   int sw = scale->width;
   int sh = scale->height;
@@ -214,7 +214,7 @@ gst_videoscale_bicubic (unsigned char *src, double x, double y, int sw, int sh)
 }
 
 static void
-gst_videoscale_scale_plane_slow (Videoscale *scale, unsigned char *src, unsigned char *dest,
+gst_videoscale_scale_plane_slow (GstVideoscale *scale, unsigned char *src, unsigned char *dest,
                                 int sw, int sh, int dw, int dh)
 {
   double zoomx = ((double)dw)/(double)sw;
@@ -244,7 +244,7 @@ gst_videoscale_scale_plane_slow (Videoscale *scale, unsigned char *src, unsigned
 }
 
 static void
-gst_videoscale_scale_point_sample (Videoscale *scale, unsigned char *src, unsigned char *dest,
+gst_videoscale_scale_point_sample (GstVideoscale *scale, unsigned char *src, unsigned char *dest,
                                   int sw, int sh, int dw, int dh)
 {
   int ypos, yinc, y;
@@ -292,7 +292,7 @@ gst_videoscale_scale_point_sample (Videoscale *scale, unsigned char *src, unsign
 }
 
 static void
-gst_videoscale_scale_nearest (Videoscale *scale,
+gst_videoscale_scale_nearest (GstVideoscale *scale,
                              unsigned char *src,
                              unsigned char *dest,
                              int sw, int sh, int dw, int dh)

diff --git a/gst/videoscale/videoscale_x86.c b/gst/videoscale/videoscale_x86.c
index 1704d6e7af471e08dbc35705db900e4ff738ae28..1abb5779ad76e0ef34edb6d1273d27b9dea95b58 100644 (file)
--- a/gst/videoscale/videoscale_x86.c
+++ b/gst/videoscale/videoscale_x86.c
@@ -23,7 +23,7 @@
 
 /* scalers */
 void gst_videoscale_generate_rowbytes_x86      (unsigned char *copy_row, int src_w, int dst_w, int bpp);
-void gst_videoscale_scale_nearest_x86          (Videoscale *scale,
+void gst_videoscale_scale_nearest_x86          (GstVideoscale *scale,
                                                         unsigned char *src, unsigned char *dest,
                                                         int sw, int sh, int dw, int dh);