SOURCES (AC-branch): gstreamer-plugins-bad-divx4linux.patch, gstre...

[freetz]

Author: freetz                       Date: Fri Jun  2 17:05:59 2006 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- merged changes from HEAD

---- Files affected:
SOURCES:
   gstreamer-plugins-bad-divx4linux.patch (1.1.2.1 -> 1.1.2.2) , gstreamer-plugins-bad-libdts.patch (1.1.2.1 -> 1.1.2.2) 

---- Diffs:

================================================================
Index: SOURCES/gstreamer-plugins-bad-divx4linux.patch
diff -u SOURCES/gstreamer-plugins-bad-divx4linux.patch:1.1.2.1 SOURCES/gstreamer-plugins-bad-divx4linux.patch:1.1.2.2
--- SOURCES/gstreamer-plugins-bad-divx4linux.patch:1.1.2.1	Mon May 15 23:28:41 2006
+++ SOURCES/gstreamer-plugins-bad-divx4linux.patch	Fri Jun  2 19:05:54 2006
@@ -20,16 +20,17 @@
  
  /* 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 @@
+--- gst-plugins-bad-0.10.3/configure.ac.orig	2006-05-21 20:22:12.474199250 +0200
++++ gst-plugins-bad-0.10.3/configure.ac	2006-05-21 20:23:11.165867250 +0200
+@@ -317,14 +317,14 @@
  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 ] )
+-  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([
@@ -38,15 +39,16 @@
  #if ENCORE_VERSION != 20021024
  #error Wrong version of divx encore libraries
  #endif
-@@ -438,14 +438,14 @@
-          AC_MSG_WARN([Wrong version of divx4linux installed]) ])
+@@ -340,7 +340,7 @@
+     ])
    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
+-    AC_CHECK_HEADER(decore.h, , [
++    AC_CHECK_HEADER(divx/decore.h, , [
+       AC_MSG_WARN([Divx4linux decoder headers not found])
+       HAVE_DIVX=no
+     ])
+@@ -348,7 +348,7 @@
    if [ test x$HAVE_DIVX = xyes ]; then
      AC_MSG_CHECKING([Checking for valid divx4linux decore version])
      AC_TRY_COMPILE([

================================================================
Index: SOURCES/gstreamer-plugins-bad-libdts.patch
diff -u SOURCES/gstreamer-plugins-bad-libdts.patch:1.1.2.1 SOURCES/gstreamer-plugins-bad-libdts.patch:1.1.2.2
--- SOURCES/gstreamer-plugins-bad-libdts.patch:1.1.2.1	Mon May 15 23:28:41 2006
+++ SOURCES/gstreamer-plugins-bad-libdts.patch	Fri Jun  2 19:05:54 2006
@@ -1,11 +1,13 @@
---- 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 @@
+--- gst-plugins-bad-0.10.3/configure.ac.orig	2006-05-04 17:18:42.000000000 +0200
++++ gst-plugins-bad-0.10.3/configure.ac	2006-05-21 20:21:48.752716750 +0200
+@@ -308,8 +308,8 @@
  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")
+-  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)
  ])
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/gstreamer-plugins-bad-divx4linux.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
    http://cvs.pld-linux.org/SOURCES/gstreamer-plugins-bad-libdts.patch?r1=1.1.2.1&r2=1.1.2.2&f=u