[patch] Patch to fix gst-plugin-vpx-1.14.4 with vpx-1.8

gst-plugins-vpx-1.14.4-vpx-1.8.patch (text/plain), 4.26 KB, created by Alexandre Ferreira on 2019-02-10 18:24:35 UTC

--- gst-plugins-good-1.14.4/configure.local	2019-02-10 11:53:12.478372112 -0600
+++ gst-plugins-good-1.14.4/configure	2019-02-10 11:54:57.798373801 -0600
@@ -664,6 +664,8 @@
 WAVPACK_CFLAGS
 USE_VPX_FALSE
 USE_VPX_TRUE
+VPX_180_LIBS
+VPX_180_CFLAGS
 VPX_140_LIBS
 VPX_140_CFLAGS
 VPX_130_LIBS
@@ -1495,6 +1497,8 @@
 VPX_130_LIBS
 VPX_140_CFLAGS
 VPX_140_LIBS
+VPX_180_CFLAGS
+VPX_180_LIBS
 WAVPACK_CFLAGS
 WAVPACK_LIBS'
 
@@ -2468,6 +2472,10 @@
               C compiler flags for VPX_140, overriding pkg-config
   VPX_140_LIBS
               linker flags for VPX_140, overriding pkg-config
+  VPX_180_CFLAGS
+              C compiler flags for VPX_180, overriding pkg-config
+  VPX_180_LIBS
+              linker flags for VPX_180, overriding pkg-config
   WAVPACK_CFLAGS
               C compiler flags for WAVPACK, overriding pkg-config
   WAVPACK_LIBS
@@ -37799,6 +37807,82 @@
 
 
 fi
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VPX_180" >&5
+$as_echo_n "checking for VPX_180... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$VPX_180_CFLAGS"; then
+        pkg_cv_VPX_180_CFLAGS="$VPX_180_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vpx >= 1.8.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "vpx >= 1.8.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_VPX_180_CFLAGS=`$PKG_CONFIG --cflags "vpx >= 1.8.0" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$VPX_180_LIBS"; then
+        pkg_cv_VPX_180_LIBS="$VPX_180_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vpx >= 1.8.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "vpx >= 1.8.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_VPX_180_LIBS=`$PKG_CONFIG --libs "vpx >= 1.8.0" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        VPX_180_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "vpx >= 1.8.0"`
+        else
+	        VPX_180_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "vpx >= 1.8.0"`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$VPX_180_PKG_ERRORS" >&5
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                true
+elif test $pkg_failed = untried; then
+	true
+else
+	VPX_180_CFLAGS=$pkg_cv_VPX_180_CFLAGS
+	VPX_180_LIBS=$pkg_cv_VPX_180_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+
+$as_echo "#define HAVE_VPX_1_8 1" >>confdefs.h
+
+
+fi
 
     LIBS="$OLD_LIBS"
     CFLAGS="$OLD_CFLAGS"
--- gst-plugins-good-1.14.4/ext/vpx/gstvpxdec.c.old	2019-02-10 11:58:40.566377372 -0600
+++ gst-plugins-good-1.14.4/ext/vpx/gstvpxdec.c	2019-02-10 11:58:54.622377598 -0600
@@ -62,6 +62,7 @@
     {C_FLAGS (VP8_DEBLOCK), "Deblock", "deblock"},
     {C_FLAGS (VP8_DEMACROBLOCK), "Demacroblock", "demacroblock"},
     {C_FLAGS (VP8_ADDNOISE), "Add noise", "addnoise"},
+#ifndef HAVE_VPX_1_8
     {C_FLAGS (VP8_DEBUG_TXT_FRAME_INFO),
           "Print frame information",
         "visualize-frame-info"},
@@ -74,6 +75,7 @@
     {C_FLAGS (VP8_DEBUG_TXT_RATE_INFO),
           "Print video rate info",
         "visualize-rate-info"},
+#endif
     {C_FLAGS (VP8_MFQE), "Multi-frame quality enhancement", "mfqe"},
     {0, NULL, NULL}
   };
--- gst-plugins-good-1.14.4/config.h.in.old	2019-02-10 12:11:21.202074487 -0600
+++ gst-plugins-good-1.14.4/config.h.in	2019-02-10 12:18:46.126081621 -0600
@@ -389,6 +389,9 @@
 /* Defined if the VPX library version is 1.4 or bigger */
 #undef HAVE_VPX_1_4
 
+/* Defined if the VPX library version is 1.8 or bigger */
+#undef HAVE_VPX_1_8
+
 /* Define to enable Win32 WaveForm (used by waveformsink). */
 #undef HAVE_WAVEFORM