Hello community,
here is the log from the commit of package gstreamer-0_10-plugins-bad for openSUSE:Factory
checked in at Tue Jun 14 12:14:12 CEST 2011.
--------
--- GNOME/gstreamer-0_10-plugins-bad/gstreamer-0_10-plugins-bad.changes 2011-05-19 23:50:03.000000000 +0200
+++ /mounts/work_src_done/STABLE/gstreamer-0_10-plugins-bad/gstreamer-0_10-plugins-bad.changes 2011-06-08 14:31:39.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Jun 8 12:31:01 UTC 2011 - reddwarf@opensuse.org
+
+- fix build with mjpegtools 2.0.0
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
gstreamer-0_10-plugins-bad-mjpegtool2.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gstreamer-0_10-plugins-bad.spec ++++++
--- /var/tmp/diff_new_pack.Ab8OuD/_old 2011-06-14 12:12:02.000000000 +0200
+++ /var/tmp/diff_new_pack.Ab8OuD/_new 2011-06-14 12:12:02.000000000 +0200
@@ -27,7 +27,7 @@
# Use rpmbuild -D 'BUILD_ORIG 1' -D 'BUILD_ORIG_ADDON 1' to build patched build plus original as addon.
%define _name gst-plugins-bad
Version: 0.10.22
-Release: 1
+Release: 2
%define gst_branch 0.10
# Please remove me when slv2 and lv2core are in factory.
%if %{with LV2}
@@ -138,6 +138,8 @@
# blacklisted content and if it's clean, edit the script and add to the allowed list in the script
%endif
Source1: %{name}-patch-source.sh
+# From upstream GIT, remove in next version
+Patch0: %{name}-mjpegtool2.patch
Patch6: gstreamer010-plugins-bad-real.patch
Url: http://gstreamer.freedesktop.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -286,7 +288,9 @@
%prep
%setup -q -n %{_name}-%{version}
translation-update-upstream po gst-plugins-bad-0.10
+%patch0
%patch6
+autoconf
%build
%configure\
++++++ gstreamer-0_10-plugins-bad-mjpegtool2.patch ++++++
Index: configure.ac
===================================================================
--- configure.ac.orig
+++ configure.ac
@@ -1042,21 +1042,25 @@ PKG_CHECK_EXISTS(mjpegtools >= 1.6.1.93
PKG_CHECK_EXISTS(mjpegtools >= 1.8.0 mjpegtools < 1.9.0, [
mjpegtools_api=10800
], [
- PKG_CHECK_MODULES(MJPEG, mjpegtools >= 1.9.0, [
- dnl logging API changed in release candidates
- OLD_CFLAGS="$CFLAGS"
- OLD_LIBS="$LIBS"
- CFLAGS="$MJPEG_CFLAGS"
- LIBS="$LIBS $MJPEG_LIBS -lmjpegutils $LIBM -lpthread"
- AC_CHECK_FUNC(mjpeg_loglev_t, [
- mjpegtools_api=10903
- ], [
- mjpegtools_api=10900
- ])
- CFLAGS="$OLD_CFLAGS"
- LIBS="$OLD_LIBS"
+ PKG_CHECK_EXISTS(mjpegtools >= 2.0.0, [
+ mjpegtools_api=20000
], [
- mjpegtools_api=0
+ PKG_CHECK_MODULES(MJPEG, mjpegtools >= 1.9.0 mjpegtools < 2.0.0, [
+ dnl logging API changed in release candidates
+ OLD_CFLAGS="$CFLAGS"
+ OLD_LIBS="$LIBS"
+ CFLAGS="$MJPEG_CFLAGS"
+ LIBS="$LIBS $MJPEG_LIBS -lmjpegutils $LIBM -lpthread"
+ AC_CHECK_FUNC(mjpeg_loglev_t, [
+ mjpegtools_api=10903
+ ], [
+ mjpegtools_api=10900
+ ])
+ CFLAGS="$OLD_CFLAGS"
+ LIBS="$OLD_LIBS"
+ ], [
+ mjpegtools_api=0
+ ])
])
])
])
Index: ext/mpeg2enc/gstmpeg2encoder.cc
===================================================================
--- ext/mpeg2enc/gstmpeg2encoder.cc.orig
+++ ext/mpeg2enc/gstmpeg2encoder.cc
@@ -26,7 +26,10 @@
#include