summaryrefslogtreecommitdiff
path: root/src/post
diff options
context:
space:
mode:
Diffstat (limited to 'src/post')
-rw-r--r--src/post/audio/Makefile.am2
-rw-r--r--src/post/goom/Makefile.am2
-rw-r--r--src/post/goom/diff_against_release.patch13
-rw-r--r--src/post/goom/filters.c4
-rw-r--r--src/post/mosaico/Makefile.am4
-rw-r--r--src/post/planar/Makefile.am11
-rw-r--r--src/post/visualizations/Makefile.am2
7 files changed, 28 insertions, 10 deletions
diff --git a/src/post/audio/Makefile.am b/src/post/audio/Makefile.am
index a7dbe64bf..44d2af31a 100644
--- a/src/post/audio/Makefile.am
+++ b/src/post/audio/Makefile.am
@@ -8,6 +8,6 @@ lib_LTLIBRARIES = xineplug_post_audio_filters.la
xineplug_post_audio_filters_la_SOURCES = \
upmix.c upmix_mono.c filter.c window.c stretch.c audio_filters.c
-xineplug_post_audio_filters_la_LIBADD = $(XINE_LIB)
+xineplug_post_audio_filters_la_LIBADD = $(XINE_LIB) $(THREAD_LIBS)
xineplug_post_audio_filters_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ -lm
diff --git a/src/post/goom/Makefile.am b/src/post/goom/Makefile.am
index 285f458fe..85d6c165e 100644
--- a/src/post/goom/Makefile.am
+++ b/src/post/goom/Makefile.am
@@ -25,7 +25,7 @@ xineplug_post_goom_la_SOURCES = $(extra_files) xine_goom.c \
gfontlib.c gfontrle.c goom_core.c goom_tools.c goomsl.c goomsl_hash.c goomsl_heap.c \
goomsl_lex.c goomsl_yacc.c graphic.c ifs.c lines.c mathtools.c \
plugin_info.c sound_tester.c surf3d.c tentacle3d.c v3d.c
-xineplug_post_goom_la_LIBADD = $(XINE_LIB) $(GOOM_LIBS)
+xineplug_post_goom_la_LIBADD = $(XINE_LIB) $(GOOM_LIBS) $(THREAD_LIBS)
xineplug_post_goom_la_LDFLAGS = -avoid-version -module $(XINE_PLUGIN_MIN_SYMS)
noinst_HEADERS = cpu_info.h default_scripts.h drawmethods.h gfontlib.h gfontrle.h goom.h \
diff --git a/src/post/goom/diff_against_release.patch b/src/post/goom/diff_against_release.patch
index 7f40e7c2a..4fc5bd972 100644
--- a/src/post/goom/diff_against_release.patch
+++ b/src/post/goom/diff_against_release.patch
@@ -345,3 +345,16 @@ diff -u -p -r1.13 goom_core.c
*param1 = goomInfo->screen.width / 7.0f;
*param2 = 6.0f * goomInfo->screen.width / 7.0f;
}
+--- post/goom/filters.c.orig 2005-08-20 12:29:12.000000000 +0200
++++ post/goom/filters.c 2005-08-20 12:28:25.000000000 +0200
+@@ -201,8 +201,8 @@ static inline v2g zoomVector(ZoomFilterF
+ /* Noise */
+ if (data->noisify)
+ {
+- vx += (((float)random()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
+- vy += (((float)random()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
++ vx += (((float)rand()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
++ vy += (((float)rand()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
+ }
+
+ /* Hypercos */
diff --git a/src/post/goom/filters.c b/src/post/goom/filters.c
index 86bfdbde7..26cb0e54c 100644
--- a/src/post/goom/filters.c
+++ b/src/post/goom/filters.c
@@ -201,8 +201,8 @@ static inline v2g zoomVector(ZoomFilterFXWrapperData *data, float X, float Y)
/* Noise */
if (data->noisify)
{
- vx += (((float)random()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
- vy += (((float)random()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
+ vx += (((float)rand()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
+ vy += (((float)rand()) / ((float)RAND_MAX) - 0.5f) / 50.0f;
}
/* Hypercos */
diff --git a/src/post/mosaico/Makefile.am b/src/post/mosaico/Makefile.am
index 835723364..2f3a9bc8a 100644
--- a/src/post/mosaico/Makefile.am
+++ b/src/post/mosaico/Makefile.am
@@ -5,9 +5,9 @@ libdir = $(XINE_PLUGINDIR)/post
lib_LTLIBRARIES = xineplug_post_mosaico.la xineplug_post_switch.la
xineplug_post_mosaico_la_SOURCES = mosaico.c
-xineplug_post_mosaico_la_LIBADD = $(XINE_LIB)
+xineplug_post_mosaico_la_LIBADD = $(XINE_LIB) $(THREAD_LIBS)
xineplug_post_mosaico_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_post_switch_la_SOURCES = switch.c
-xineplug_post_switch_la_LIBADD = $(XINE_LIB)
+xineplug_post_switch_la_LIBADD = $(XINE_LIB) $(THREAD_LIBS)
xineplug_post_switch_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
diff --git a/src/post/planar/Makefile.am b/src/post/planar/Makefile.am
index 5eeae5a58..f0c512228 100644
--- a/src/post/planar/Makefile.am
+++ b/src/post/planar/Makefile.am
@@ -1,7 +1,12 @@
include $(top_srcdir)/misc/Makefile.common
AM_CFLAGS = -I$(top_srcdir)/src/libffmpeg/libavcodec/libpostproc
-POSTPROC_LIB = $(top_builddir)/src/libffmpeg/libavcodec/libpostproc/libpostprocess.la
+if HAVE_FFMPEG
+POSTPROC_LIB = $(FFMPEG_POSTPROC_LIBS)
+else
+POSTPROC_LIB = $(top_builddir)/src/libffmpeg/libavcodec/libpostproc/libpostprocess.la
+POSTPROC_DEP = $(POSTPROC_LIB)
+endif
libdir = $(XINE_PLUGINDIR)/post
@@ -9,8 +14,8 @@ lib_LTLIBRARIES = xineplug_post_planar.la
xineplug_post_planar_la_SOURCES = planar.c invert.c expand.c fill.c boxblur.c \
denoise3d.c eq.c eq2.c unsharp.c pp.c
-xineplug_post_planar_la_DEPENDENCIES = $(POSTPROC_LIB)
-xineplug_post_planar_la_LIBADD = $(XINE_LIB) $(POSTPROC_LIB) -lm
+xineplug_post_planar_la_DEPENDENCIES = $(POSTPROC_DEP)
+xineplug_post_planar_la_LIBADD = $(XINE_LIB) $(POSTPROC_LIB) -lm $(THREAD_LIBS)
xineplug_post_planar_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
$(POSTPROC_LIB):
diff --git a/src/post/visualizations/Makefile.am b/src/post/visualizations/Makefile.am
index ba79640fe..055d0eb32 100644
--- a/src/post/visualizations/Makefile.am
+++ b/src/post/visualizations/Makefile.am
@@ -8,7 +8,7 @@ lib_LTLIBRARIES = xineplug_post_visualizations.la
xineplug_post_visualizations_la_SOURCES = \
visualizations.c fft.c fftscope.c oscope.c fftgraph.c
-xineplug_post_visualizations_la_LIBADD = $(XINE_LIB)
+xineplug_post_visualizations_la_LIBADD = $(XINE_LIB) $(THREAD_LIBS)
xineplug_post_visualizations_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ -lm
noinst_HEADERS = fft.h visualizations.h