Skip to content

GitLab

Commit 9af006a1 authored by Andy Wingo Wingo's avatar Andy Wingo Wingo
Browse files
Options

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 302e83b4
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 27 deletions
Makefile.am
View file @ 9af006a1
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
configure.ac
View file @ 9af006a1
......@@ -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
)
......
ext/Makefile.am
View file @ 9af006a1
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
ext/alsa/gstalsa.c
View file @ 9af006a1
......@@ -19,7 +19,7 @@
*/
#include <stdlib.h>
#include "alsa.h"
#include "gstalsa.h"
static GstElementDetails gst_alsa_sink_details = {
"Alsa Sink",
......
ext/alsa/gstalsa.h
View file @ 9af006a1
......@@ -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>
......
gst/audioscale/Makefile.am
View file @ 9af006a1
......@@ -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
......
gst/videoscale/Makefile.am
View file @ 9af006a1
......@@ -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
gst/videoscale/videoscale.c
View file @ 9af006a1
......@@ -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)
......
gst/videoscale/videoscale_x86.c
View file @ 9af006a1
......@@ -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);
......
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