SOURCES (AC-branch): gstreamer-ffmpeg-nocpp.patch (NEW), gstreamer...
baggins
baggins at pld-linux.org
Mon May 15 23:28:46 CEST 2006
Author: baggins Date: Mon May 15 21:28:46 2006 GMT
Module: SOURCES Tag: AC-branch
---- Log message:
- from HEAD
---- Files affected:
SOURCES:
gstreamer-ffmpeg-nocpp.patch (NONE -> 1.1.2.1) (NEW), gstreamer-plugins-bad-bashish.patch (NONE -> 1.1.2.1) (NEW), gstreamer-plugins-bad-divx4linux.patch (NONE -> 1.1.2.1) (NEW), gstreamer-plugins-bad-libdts.patch (NONE -> 1.1.2.1) (NEW), gstreamer-plugins-bad-opengl.patch (NONE -> 1.1.2.1) (NEW), gstreamer-plugins-ugly-bashish.patch (NONE -> 1.1.2.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/gstreamer-ffmpeg-nocpp.patch
diff -u /dev/null SOURCES/gstreamer-ffmpeg-nocpp.patch:1.1.2.1
--- /dev/null Mon May 15 23:28:46 2006
+++ SOURCES/gstreamer-ffmpeg-nocpp.patch Mon May 15 23:28:41 2006
@@ -0,0 +1,10 @@
+--- gst-ffmpeg-0.10.0/gst-libs/ext/ffmpeg/libavformat/Makefile.am.orig 2005-10-21 16:30:30.000000000 +0200
++++ gst-ffmpeg-0.10.0/gst-libs/ext/ffmpeg/libavformat/Makefile.am 2006-01-14 18:43:50.575886750 +0100
+@@ -136,7 +136,6 @@
+ $(encoder_SRC) \
+ $(image_SRC) \
+ $(audiooss_SRC) \
+- $(audiobeos_SRC) \
+ $(v4l_SRC) \
+ $(bktr_SRC) \
+ $(dv_SRC) \
================================================================
Index: SOURCES/gstreamer-plugins-bad-bashish.patch
diff -u /dev/null SOURCES/gstreamer-plugins-bad-bashish.patch:1.1.2.1
--- /dev/null Mon May 15 23:28:46 2006
+++ SOURCES/gstreamer-plugins-bad-bashish.patch Mon May 15 23:28:41 2006
@@ -0,0 +1,11 @@
+--- gst-plugins-0.8.7/common/m4/gst-feature.m4.orig 2004-09-21 16:16:36.000000000 +0200
++++ gst-plugins-0.8.7/common/m4/gst-feature.m4 2005-01-24 13:28:43.871500536 +0100
+@@ -133,7 +133,7 @@
+ [$1]_CFLAGS=
+ HAVE_[$1]=no
+ else
+- if [$2] --plugin-libs [$3] &> /dev/null; then
++ if [$2] --plugin-libs [$3] > /dev/null 2> /dev/null; then
+ [$1]_LIBS=`[$2] --plugin-libs [$3]`
+ else
+ [$1]_LIBS=`[$2] --libs [$3]`
================================================================
Index: SOURCES/gstreamer-plugins-bad-divx4linux.patch
diff -u /dev/null SOURCES/gstreamer-plugins-bad-divx4linux.patch:1.1.2.1
--- /dev/null Mon May 15 23:28:46 2006
+++ SOURCES/gstreamer-plugins-bad-divx4linux.patch Mon May 15 23:28:41 2006
@@ -0,0 +1,57 @@
+--- gst-plugins-bad-0.10.1/ext/divx/gstdivxdec.h.orig 2005-12-19 15:40:22.000000000 +0100
++++ gst-plugins-bad-0.10.1/ext/divx/gstdivxdec.h 2006-02-25 01:04:28.560232500 +0100
+@@ -21,7 +21,7 @@
+ #define __GST_DIVXDEC_H__
+
+ #include <gst/gst.h>
+-#include <decore.h>
++#include <divx/decore.h>
+
+ #ifdef __cplusplus
+ extern "C" {
+--- gst-plugins-bad-0.10.1/ext/divx/gstdivxenc.c.orig 2005-12-19 15:40:22.000000000 +0100
++++ gst-plugins-bad-0.10.1/ext/divx/gstdivxenc.c 2006-02-25 01:04:46.369345500 +0100
+@@ -24,7 +24,7 @@
+ #include <string.h>
+ #include "gstdivxenc.h"
+ #include <gst/video/video.h>
+-#include <encore2.h>
++#include <divx/encore2.h>
+
+ /* elementfactory information */
+ GstElementDetails gst_divxenc_details = {
+--- gst-plugins-bad-0.10.1/configure.ac.orig 2006-02-25 00:57:12.156959000 +0100
++++ gst-plugins-bad-0.10.1/configure.ac 2006-02-25 01:03:56.306216750 +0100
+@@ -421,13 +421,13 @@
+ translit(dnm, m, l) AM_CONDITIONAL(USE_DIVX, true)
+ GST_CHECK_FEATURE(DIVX, [divx plugins], divx, [
+ HAVE_DIVX=yes
+- AC_CHECK_HEADER(encore2.h, ,
++ AC_CHECK_HEADER(divx/encore2.h, ,
+ [ AC_MSG_WARN([Divx4linux encore headers not found]) &&
+ HAVE_DIVX=no ] )
+ if [ test x$HAVE_DIVX = xyes ]; then
+ AC_MSG_CHECKING([Checking for valid divx4linux encore version])
+ AC_TRY_COMPILE([
+-#include <encore2.h>
++#include <divx/encore2.h>
+ #if ENCORE_VERSION != 20021024
+ #error Wrong version of divx encore libraries
+ #endif
+@@ -438,14 +438,14 @@
+ AC_MSG_WARN([Wrong version of divx4linux installed]) ])
+ fi
+ if [ test x$HAVE_DIVX = xyes ]; then
+- AC_CHECK_HEADER(decore.h, ,
++ AC_CHECK_HEADER(divx/decore.h, ,
+ [ AC_MSG_WARN([Divx4linux decoder headers not found]) &&
+ HAVE_DIVX=no ] )
+ fi
+ if [ test x$HAVE_DIVX = xyes ]; then
+ AC_MSG_CHECKING([Checking for valid divx4linux decore version])
+ AC_TRY_COMPILE([
+-#include <decore.h>
++#include <divx/decore.h>
+ #if DECORE_VERSION != 20021112
+ #error Wrong version of divx decore libraries
+ #endif
================================================================
Index: SOURCES/gstreamer-plugins-bad-libdts.patch
diff -u /dev/null SOURCES/gstreamer-plugins-bad-libdts.patch:1.1.2.1
--- /dev/null Mon May 15 23:28:46 2006
+++ SOURCES/gstreamer-plugins-bad-libdts.patch Mon May 15 23:28:41 2006
@@ -0,0 +1,11 @@
+--- gst-plugins-bad-0.10.1/configure.ac.orig 2006-02-25 00:48:13.743310000 +0100
++++ gst-plugins-bad-0.10.1/configure.ac 2006-02-25 00:57:12.156959000 +0100
+@@ -413,7 +413,7 @@
+ dnl *** DTS ***
+ translit(dnm, m, l) AM_CONDITIONAL(USE_DTS, true)
+ GST_CHECK_FEATURE(DTS, [dts library], dtsdec, [
+- GST_CHECK_LIBHEADER(DTS, dts_pic, dts_init, -lm, dts.h, DTS_LIBS="-ldts_pic -lm")
++ GST_CHECK_LIBHEADER(DTS, dts, dts_init, -lm, dts.h, DTS_LIBS="-ldts -lm")
+ AC_SUBST(DTS_LIBS)
+ ])
+
================================================================
Index: SOURCES/gstreamer-plugins-bad-opengl.patch
diff -u /dev/null SOURCES/gstreamer-plugins-bad-opengl.patch:1.1.2.1
--- /dev/null Mon May 15 23:28:46 2006
+++ SOURCES/gstreamer-plugins-bad-opengl.patch Mon May 15 23:28:41 2006
@@ -0,0 +1,41 @@
+--- gst-plugins-bad-0.10.1/configure.ac.orig 2006-02-20 19:52:59.000000000 +0100
++++ gst-plugins-bad-0.10.1/configure.ac 2006-02-25 00:48:13.743310250 +0100
+@@ -395,7 +395,7 @@
+ AC_MSG_NOTICE([cannot find X11 development files])
+ else
+ dnl this is much more than we want
+- X_LIBS="$X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS"
++ X_LIBS="$X_LIBS $X_EXTRA_LIBS"
+ dnl AC_PATH_XTRA only defines the path needed to find the X libs,
+ dnl it does not add the libs; therefore we add them here
+ X_LIBS="$X_LIBS -lX11"
+@@ -557,7 +557,7 @@
+ dnl *** OpenGL ***
+ translit(dnm, m, l) AM_CONDITIONAL(USE_OPENGL, true)
+ GST_CHECK_FEATURE(OPENGL, [Open GL], glsink, [
+- GST_CHECK_LIBHEADER(GL, GLU, glTexImage2D,,
++ GST_CHECK_LIBHEADER(GL, GL, glTexImage2D,,
+ GL/gl.h, HAVE_OPENGL="yes", HAVE_OPENGL="no")
+ ])
+
+--- gst-plugins-bad-0.10.1/sys/glsink/Makefile.am.orig 2006-01-30 16:47:47.000000000 +0100
++++ gst-plugins-bad-0.10.1/sys/glsink/Makefile.am 2006-02-24 23:56:30.889394000 +0100
+@@ -4,7 +4,7 @@
+ libgstglimagesink_la_SOURCES = glimagesink.c
+ libgstglimagesink_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS) $(GST_BASE_CFLAGS) \
+ $(GST_PLUGINS_BASE_CFLAGS)
+-libgstglimagesink_la_LIBADD = $(X_LIBS) $(XSHM_LIBS) -lGL -lGLU \
++libgstglimagesink_la_LIBADD = $(X_LIBS) $(XSHM_LIBS) -lGL \
+ $(GST_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
+ $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_MAJORMINOR)
+ libgstglimagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+--- gst-plugins-bad-0.10.1/sys/glsink/glimagesink.c.orig 2006-02-14 12:36:30.000000000 +0100
++++ gst-plugins-bad-0.10.1/sys/glsink/glimagesink.c 2006-02-24 23:55:17.184787750 +0100
+@@ -32,7 +32,6 @@
+
+ #include <GL/glx.h>
+ #include <GL/gl.h>
+-#include <GL/glu.h>
+
+ GST_DEBUG_CATEGORY (gst_debug_glimage_sink);
+ #define GST_CAT_DEFAULT gst_debug_glimage_sink
================================================================
Index: SOURCES/gstreamer-plugins-ugly-bashish.patch
diff -u /dev/null SOURCES/gstreamer-plugins-ugly-bashish.patch:1.1.2.1
--- /dev/null Mon May 15 23:28:46 2006
+++ SOURCES/gstreamer-plugins-ugly-bashish.patch Mon May 15 23:28:41 2006
@@ -0,0 +1,11 @@
+--- gst-plugins-0.8.7/common/m4/gst-feature.m4.orig 2004-09-21 16:16:36.000000000 +0200
++++ gst-plugins-0.8.7/common/m4/gst-feature.m4 2005-01-24 13:28:43.871500536 +0100
+@@ -133,7 +133,7 @@
+ [$1]_CFLAGS=
+ HAVE_[$1]=no
+ else
+- if [$2] --plugin-libs [$3] &> /dev/null; then
++ if [$2] --plugin-libs [$3] > /dev/null 2> /dev/null; then
+ [$1]_LIBS=`[$2] --plugin-libs [$3]`
+ else
+ [$1]_LIBS=`[$2] --libs [$3]`
================================================================
More information about the pld-cvs-commit
mailing list