Hello community, here is the log from the commit of package mjpegtools for openSUSE:Factory checked in at 2011-11-18 15:45:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mjpegtools (Old) and /work/SRC/openSUSE:Factory/.mjpegtools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mjpegtools", Maintainer is "pu...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/mjpegtools/mjpegtools.changes 2011-09-23 02:13:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mjpegtools.new/mjpegtools.changes 2011-11-18 15:46:20.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Nov 15 02:02:52 UTC 2011 - cmorv...@yahoo.es + +- Update to 2.0.0 +- Remove obsoleted patches +- Rename to follow SLPP +- Use pkgconfig()-type BuildRequires +- Spec-clean + +------------------------------------------------------------------- Old: ---- mjpegtools-1.9.0-fix-compiler-error.patch mjpegtools-1.9.0-patched.tar.bz2 mjpegtools-1.9.0.tar.bz2 mjpegtools-fix-invalid-conversion.patch mjpegtools-fix_init.patch mjpegtools-fix_lib_versioning-mpeg2enc.patch mjpegtools-fix_lib_versioning.patch mjpegtools-jpeg-7.patch New: ---- mjpegtools-2.0.0-patched.tar.gz mjpegtools-2.0.0.tar.gz mjpegtools-config_h.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mjpegtools.spec ++++++ --- /var/tmp/diff_new_pack.iKaVBJ/_old 2011-11-18 15:46:23.000000000 +0100 +++ /var/tmp/diff_new_pack.iKaVBJ/_new 2011-11-18 15:46:23.000000000 +0100 @@ -15,55 +15,49 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: mjpegtools -Version: 1.9.0 -Release: 22 -License: BSD3c(or similar) ; GPLv2+ -Group: Productivity/Multimedia/Video/Editors and Convertors +Version: 2.0.0 +Release: 0 Summary: MJPEG Video Capture and Processing Tools -AutoReqProv: on Url: http://mjpeg.sourceforge.net/ +Group: Productivity/Multimedia/Video/Editors and Convertors %if 0%{?BUILD_ORIG} -Source0: %{name}-%{version}.tar.bz2 +Source0: http://sourceforge.net/projects/mjpeg/files/mjpegtools/%{version}/mjpegtools-%{version}.tar.gz %else -# FIXME read the comment at the top. # WARNING: This is not a comment, but a real command to repack souce: -#%(sh %{_sourcedir}/%{name}-codecpatch.sh %{_sourcedir} %{name}-%{version}.tar.bz2 %{name}-%{version}-patched.tar.bz2 ) -Source0: %{name}-%{version}-patched.tar.bz2 +#%(sh %{_sourcedir}/mjpegtools-codecpatch.sh %{_sourcedir} mjpegtools-%{version}.tar.gz mjpegtools-%{version}-patched.tar.gz ) +Source0: %{name}-%{version}-patched.tar.gz %endif +License: BSD3c(or similar) ; GPLv2+ Source1: mjpegtools-codecpatch.sh Patch0: mjpegtools-cpuinfo.patch -Patch4: mjpegtools-vector_alignment.patch -Patch5: mjpegtools-getopt.patch -Patch6: mjpegtools-writeable_strings.patch -Patch7: mjpegtools-fix-invalid-conversion.patch -Patch8: mjpegtools-1.9.0-fix-compiler-error.patch -Patch9: mjpegtools-jpeg-7.patch -Patch10: mjpegtools-fix_init.patch -Patch11: mjpegtools-fix_lib_versioning.patch -Patch12: mjpegtools-no_arch_tuning.patch -Patch13: mjpegtools-v4l-2.6.38.patch -Patch21: mjpegtools-fix_lib_versioning-mpeg2enc.patch -Patch100: %{name}-codecpatch.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: %install_info_prereq -BuildRequires: SDL-devel +Patch1: mjpegtools-vector_alignment.patch +Patch2: mjpegtools-getopt.patch +Patch3: mjpegtools-writeable_strings.patch +Patch4: mjpegtools-no_arch_tuning.patch +Patch5: mjpegtools-config_h.patch +Patch6: mjpegtools-v4l-2.6.38.patch +Patch100: mjpegtools-codecpatch.patch BuildRequires: gcc-c++ -BuildRequires: gtk2-devel BuildRequires: libjpeg-devel -BuildRequires: libpng-devel -BuildRequires: libquicktime-devel -BuildRequires: nasm +BuildRequires: pkg-config +BuildRequires: pkgconfig(gdk-x11-2.0) +BuildRequires: pkgconfig(gobject-2.0) +BuildRequires: pkgconfig(gtk+-x11-2.0) +BuildRequires: pkgconfig(libdv) +BuildRequires: pkgconfig(libpng14) +BuildRequires: pkgconfig(libquicktime) %if 0%{?suse_version} >= 1210 -BuildRequires: libv4l-devel >= 0.8.4 +BuildRequires: pkgconfig(libv4l1) %endif -#BuildRequires: gtk1-compat-devel -#BuildRequires: libmovtar popt-devel +BuildRequires: pkgconfig(sdl) +BuildRequires: pkgconfig(SDL_gfx) +Requires(post): info +Requires(preun): info -%define lib_version %(echo %{version}|cut -d. -f1-2) +%define lib_version %(echo %{version} | cut -d. -f1-2) %description The mjpegtools allow for capture, playback, processing, and simple @@ -72,14 +66,25 @@ zoran-driver package), but the processing tools can be used with MJPEG data from other sources as well. -%package devel -License: BSD3c(or similar) ; GPLv2+ -Group: Development/Libraries/C and C++ +%package -n libmjpegutils-2_0-0 +Summary: MJPEG Video Capture and Processing Tools +Group: System/Libraries + +%description -n libmjpegutils-2_0-0 +The mjpegtools allow for capture, playback, processing, and simple +editing of MJPEG AV data. The hardware I/O applications are intended +for use with Zoran MJPEG framegrabber-based hardware (see the +zoran-driver package), but the processing tools can be used with MJPEG +data from other sources as well. + +%package -n libmjpegutils-devel Summary: MJPEG Video Capture and Processing Tools -Requires: %{name} = %{version} -Requires: SDL-devel glibc-devel zlib-devel libdv-devel libjpeg-devel libquicktime-devel +Group: Development/Libraries/C and C++ +Requires: libmjpegutils-2_0-0 = %{version} +Provides: mjpegtools-devel = %{version} +Obsoletes: mjpegtools-devel < %{version} -%description devel +%description -n libmjpegutils-devel This package contains all files needed to develop code that uses the mjpegtools libraries. @@ -87,23 +92,18 @@ %setup -q %patch0 %if 0%{?BUILD_ORIG} -%patch4 -p1 -%patch21 +%patch1 +%endif +%patch2 -p1 +%patch3 -p1 +%patch4 +%patch5 +%if 0%{?suse_version} >= 1210 +%patch6 %endif -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 %if ! 0%{?BUILD_ORIG} # remove references to files removed by %%{name}-codecpatch.sh -%patch100 -p1 -%endif -%patch10 -%patch11 -%patch12 -%if 0%{?suse_version} >= 1210 -%patch13 -p1 +%patch100 %endif %build @@ -111,32 +111,12 @@ sed -i~ '/currently broken/d' mpeg2enc/mpeg2enc.cc diff -u mpeg2enc/mpeg2enc.cc* || : %endif -CFLAGS="%{optflags}" -CXXFLAGS="%{optflags}" - -%ifnarch %ix86 - CFLAGS+=" -fPIC" -%endif -export CXXFLAGS CFLAGS autoreconf -vfi -# disable linking against libmpeg2encpp on ppc architectures -./configure \ -%ifarch ppc ppc64 - --disable-simd-accel \ -%endif - --prefix=%{_prefix} \ - --libdir=%{_libdir} \ - --mandir=%{_mandir} \ - --infodir=%{_infodir} \ - --disable-warnings_as_errors \ - --disable-arch_tuning -# --with-quicktime=/usr/include/quicktime \ -# --with-dv=/usr \ -%{__make} %{?jobs:-j%jobs} +%configure --disable-static --disable-arch_tuning +make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install -rm -f %{buildroot}/usr/share/info/dir +%make_install # remove mpeg encoding %if ! 0%{?BUILD_ORIG} for app in lav2mpeg mp2enc mpeg2enc mpegtranscode; do @@ -144,31 +124,33 @@ rm -f %{buildroot}%{_mandir}/man1/${app}.* done %endif -rm -f %{buildroot}/%{_libdir}/*.la - -%clean -rm -rf "%{buildroot}" +rm %{buildroot}%{_libdir}/lib*.la %post -%install_info --info-dir=%{_infodir} %{_infodir}/mjpeg-howto.info.gz -/sbin/ldconfig +%install_info --info-dir=%{_infodir} %{_infodir}/mjpeg-howto.info%{ext_info} %postun -%install_info_delete --info-dir=%{_infodir} %{_infodir}/mjpeg-howto.info.gz -/sbin/ldconfig +%install_info_delete --info-dir=%{_infodir} %{_infodir}/mjpeg-howto.info%{ext_info} + +%post -n libmjpegutils-2_0-0 -p /sbin/ldconfig + +%postun -n libmjpegutils-2_0-0 -p /sbin/ldconfig %files -%defattr(-,root,root) -%doc AUTHORS CHANGES COPYING ChangeLog HINTS README* -%{_bindir}/* -%{_libdir}/lib*-%{lib_version}.so -%doc %{_mandir}/man1/*.1.gz -%doc %{_mandir}/man5/*.5.gz -%doc %{_infodir}/mjpeg-howto* - -%files devel -%defattr(-,root,root) -%{_includedir}/mjpegtools +%defattr(0644, root, root, 0755) +%attr(0755,-,-) %{_bindir}/* +%{_mandir}/man1/*.1%{ext_man} +%{_mandir}/man5/*.5%{ext_man} +%{_infodir}/mjpeg-howto.info%{ext_info} + +%files -n libmjpegutils-2_0-0 +%defattr(0644, root, root, 0755) +%doc AUTHORS BUGS CHANGES COPYING HINTS NEWS PLANS README* TODO +%{_libdir}/lib*-%{lib_version}.so.* + +%files -n libmjpegutils-devel +%defattr(0644, root, root, 0755) +%{_includedir}/mjpegtools/ %{_libdir}/liblavfile.so %{_libdir}/liblavjpeg.so %{_libdir}/liblavplay.so ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.iKaVBJ/_old 2011-11-18 15:46:23.000000000 +0100 +++ /var/tmp/diff_new_pack.iKaVBJ/_new 2011-11-18 15:46:23.000000000 +0100 @@ -1 +1 @@ -mjpegtools +libmjpegutils-2_0-0 ++++++ mjpegtools-codecpatch.patch ++++++ --- /var/tmp/diff_new_pack.iKaVBJ/_old 2011-11-18 15:46:23.000000000 +0100 +++ /var/tmp/diff_new_pack.iKaVBJ/_new 2011-11-18 15:46:23.000000000 +0100 @@ -1,29 +1,63 @@ -diff -rp mjpegtools-1.9.0rc2.orig/configure.ac mjpegtools-1.9.0rc2/configure.ac -*** mjpegtools-1.9.0rc2.orig/configure.ac 2007-02-26 18:05:38.000000000 +0100 ---- mjpegtools-1.9.0rc2/configure.ac 2007-08-09 17:40:30.241647704 +0200 -*************** AC_CONFIG_FILES([ -*** 559,566 **** - y4munsharp/Makefile - y4mutils/Makefile - yuvfilters/Makefile -- mpeg2enc/Makefile -- aenc/Makefile - mplex/Makefile - scripts/Makefile - utils/Makefile ---- 559,564 ---- -diff -rp mjpegtools-1.9.0rc2.orig/Makefile.am mjpegtools-1.9.0rc2/Makefile.am -*** mjpegtools-1.9.0rc2.orig/Makefile.am 2006-06-01 19:09:25.000000000 +0200 ---- mjpegtools-1.9.0rc2/Makefile.am 2007-08-09 17:40:15.590874960 +0200 -*************** -*** 10,18 **** - - SUBDIRS = \ - utils \ -- mpeg2enc \ - lavtools \ -- aenc \ - mplex \ - scripts \ - docs \ ---- 10,16 ---- +Index: Makefile.am +=================================================================== +--- Makefile.am.orig ++++ Makefile.am +@@ -10,9 +10,7 @@ + + SUBDIRS = \ + utils \ +- mpeg2enc \ + lavtools \ +- aenc \ + mplex \ + scripts \ + docs \ +Index: configure.ac +=================================================================== +--- configure.ac.orig ++++ configure.ac +@@ -588,8 +588,6 @@ AC_CONFIG_FILES([ + y4munsharp/Makefile + y4mutils/Makefile + yuvfilters/Makefile +- mpeg2enc/Makefile +- aenc/Makefile + mplex/Makefile + scripts/Makefile + utils/Makefile +Index: configure +=================================================================== +--- configure.orig ++++ configure +@@ -18564,7 +18564,7 @@ $as_echo "#define NDEBUG 1" >>confdefs.h + ;; + esac + +-ac_config_files="$ac_config_files Makefile debian/Makefile debian/control docs/Makefile lavtools/Makefile yuvcorrect/Makefile yuvdenoise/Makefile yuvdeinterlace/Makefile yuvscaler/Makefile y4munsharp/Makefile y4mutils/Makefile yuvfilters/Makefile mpeg2enc/Makefile aenc/Makefile mplex/Makefile scripts/Makefile utils/Makefile utils/altivec/Makefile utils/mmxsse/Makefile y4mdenoise/Makefile mjpegtools.pc mjpegtools.spec" ++ac_config_files="$ac_config_files Makefile debian/Makefile debian/control docs/Makefile lavtools/Makefile yuvcorrect/Makefile yuvdenoise/Makefile yuvdeinterlace/Makefile yuvscaler/Makefile y4munsharp/Makefile y4mutils/Makefile yuvfilters/Makefile mplex/Makefile scripts/Makefile utils/Makefile utils/altivec/Makefile utils/mmxsse/Makefile y4mdenoise/Makefile mjpegtools.pc mjpegtools.spec" + + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure +@@ -19726,8 +19726,6 @@ do + "y4munsharp/Makefile") CONFIG_FILES="$CONFIG_FILES y4munsharp/Makefile" ;; + "y4mutils/Makefile") CONFIG_FILES="$CONFIG_FILES y4mutils/Makefile" ;; + "yuvfilters/Makefile") CONFIG_FILES="$CONFIG_FILES yuvfilters/Makefile" ;; +- "mpeg2enc/Makefile") CONFIG_FILES="$CONFIG_FILES mpeg2enc/Makefile" ;; +- "aenc/Makefile") CONFIG_FILES="$CONFIG_FILES aenc/Makefile" ;; + "mplex/Makefile") CONFIG_FILES="$CONFIG_FILES mplex/Makefile" ;; + "scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;; + "utils/Makefile") CONFIG_FILES="$CONFIG_FILES utils/Makefile" ;; +Index: Makefile.in +=================================================================== +--- Makefile.in.orig ++++ Makefile.in +@@ -296,9 +296,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + SUBDIRS = \ + utils \ +- mpeg2enc \ + lavtools \ +- aenc \ + mplex \ + scripts \ + docs \ ++++++ mjpegtools-codecpatch.sh ++++++ --- /var/tmp/diff_new_pack.iKaVBJ/_old 2011-11-18 15:46:23.000000000 +0100 +++ /var/tmp/diff_new_pack.iKaVBJ/_new 2011-11-18 15:46:23.000000000 +0100 @@ -9,9 +9,9 @@ echo "========================================================" trap "rm -vrf \"$TMPDIR\" \"${1}/${2}\"" ERR cd $TMPDIR - tar -xjf "${1}/${2}" - rm -Rf mjpegtools-1.9.0/{aenc,mpeg2enc} - tar -cjf "${1}/${3}" mjpegtools-1.9.0 + tar -xzf "${1}/${2}" + rm -Rf mjpegtools-2.0.0/{aenc,mpeg2enc} + tar -czf "${1}/${3}" mjpegtools-2.0.0 cd - 1>/dev/null rm -Rf $TMPDIR else ++++++ mjpegtools-config_h.patch ++++++ Index: mplex/stream_params.hpp =================================================================== --- mplex/stream_params.hpp.orig +++ mplex/stream_params.hpp @@ -23,7 +23,6 @@ #ifndef __STREAM_PARAMS_HH__ #define __STREAM_PARAMS_HH__ -#include <config.h> #include <mjpeg_types.h> class LpcmParams { ++++++ mjpegtools-cpuinfo.patch ++++++ --- /var/tmp/diff_new_pack.iKaVBJ/_old 2011-11-18 15:46:23.000000000 +0100 +++ /var/tmp/diff_new_pack.iKaVBJ/_new 2011-11-18 15:46:23.000000000 +0100 @@ -1,6 +1,8 @@ ---- cpuinfo.sh +Index: cpuinfo.sh +=================================================================== +--- cpuinfo.sh.orig +++ cpuinfo.sh -@@ -91,6 +91,7 @@ +@@ -91,6 +91,7 @@ _mmx2=no _sse=no _sse2=no _mtrr=no @@ -8,7 +10,7 @@ for i in $pparam ; do case "$i" in -@@ -101,6 +102,7 @@ +@@ -101,6 +102,7 @@ for i in $pparam ; do mtrr|k6_mtrr|cyrix_arr) _mtrr=yes ;; xmm|sse|kni) _sse=yes _mmx2=yes ;; sse2) _sse2=yes ;; @@ -16,9 +18,9 @@ esac done -@@ -171,8 +173,13 @@ +@@ -178,8 +180,13 @@ case "$pvendor" in else - proc=i686 + proc=i686 fi - ;; - 15) proc=pentium4 ++++++ mjpegtools-getopt.patch ++++++ --- /var/tmp/diff_new_pack.iKaVBJ/_old 2011-11-18 15:46:23.000000000 +0100 +++ /var/tmp/diff_new_pack.iKaVBJ/_new 2011-11-18 15:46:23.000000000 +0100 @@ -1,22 +1,19 @@ ---- - y4mdenoise/main.c | 2 +- - yuvdeinterlace/yuvdeinterlace.cc | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - ---- a/y4mdenoise/main.c -+++ b/y4mdenoise/main.c -@@ -261,7 +261,7 @@ int main(int argc, char *argv[]) +diff -ur mjpegtools-2.0.0.orig/y4mdenoise/main.c mjpegtools-2.0.0/y4mdenoise/main.c +--- mjpegtools-2.0.0.orig/y4mdenoise/main.c 2010-07-25 22:06:56.000000000 +0200 ++++ mjpegtools-2.0.0/y4mdenoise/main.c 2011-05-28 14:52:21.763767632 +0200 +@@ -274,7 +274,7 @@ void process_commandline(int argc, char *argv[]) { - char c; + int c; - while ((c = getopt (argc, argv, "h?z:Z:t:T:r:R:m:M:f:BI:p:v:i:")) != -1) // HACK + while ((c = getopt (argc, argv, "h?z:Z:t:T:r:R:m:M:f:BI:p:v:")) != -1) { ---- a/yuvdeinterlace/yuvdeinterlace.cc -+++ b/yuvdeinterlace/yuvdeinterlace.cc -@@ -845,7 +845,7 @@ main (int argc, char *argv[]) +diff -ur mjpegtools-2.0.0.orig/yuvdeinterlace/yuvdeinterlace.cc mjpegtools-2.0.0/yuvdeinterlace/yuvdeinterlace.cc +--- mjpegtools-2.0.0.orig/yuvdeinterlace/yuvdeinterlace.cc 2009-09-19 20:16:47.000000000 +0200 ++++ mjpegtools-2.0.0/yuvdeinterlace/yuvdeinterlace.cc 2011-05-28 14:53:14.191273843 +0200 +@@ -923,7 +923,7 @@ deinterlacer YUVdeint; ++++++ mjpegtools-no_arch_tuning.patch ++++++ --- /var/tmp/diff_new_pack.iKaVBJ/_old 2011-11-18 15:46:23.000000000 +0100 +++ /var/tmp/diff_new_pack.iKaVBJ/_new 2011-11-18 15:46:23.000000000 +0100 @@ -3,9 +3,9 @@ Index: configure.ac =================================================================== ---- configure.ac.orig 2011-02-09 16:21:51.834820601 +0100 -+++ configure.ac 2011-02-09 16:40:53.583304265 +0100 -@@ -421,27 +421,34 @@ dnl done with the helper script cpuinfo. +--- configure.ac.orig ++++ configure.ac +@@ -451,27 +451,34 @@ dnl done with the helper script cpuinfo. dnl correctly is complex and lengthy (about as long as the entire configure.ac dnl file). ++++++ mjpegtools-v4l-2.6.38.patch ++++++ --- /var/tmp/diff_new_pack.iKaVBJ/_old 2011-11-18 15:46:23.000000000 +0100 +++ /var/tmp/diff_new_pack.iKaVBJ/_new 2011-11-18 15:46:23.000000000 +0100 @@ -1,24 +1,8 @@ -diff -ur mjpegtools-1.9.0.orig/configure.ac mjpegtools-1.9.0/configure.ac ---- mjpegtools-1.9.0.orig/configure.ac 2011-07-07 11:07:45.211089635 +0200 -+++ mjpegtools-1.9.0/configure.ac 2011-07-07 11:18:42.513089556 +0200 -@@ -155,11 +155,11 @@ - have_video4linux=false - case $host in - *-*-linux*) -- AC_CHECK_HEADER(linux/videodev.h, -+ AC_CHECK_HEADER(libv4l1-videodev.h, - [have_video4linux=true - AC_DEFINE(HAVE_V4L, 1, - [Building for Linux - using the video4linux API])], -- [AC_MSG_ERROR([videodev.h not found - please install the linux kernel headers])]) -+ [AC_MSG_ERROR([libv4l1-videodev.h not found - please install the v4l-utils devel package])]) - ;; - esac - AM_CONDITIONAL(HAVE_V4L, test x$have_video4linux = xtrue) -diff -ur mjpegtools-1.9.0.orig/lavtools/lavvideo.c mjpegtools-1.9.0/lavtools/lavvideo.c ---- mjpegtools-1.9.0.orig/lavtools/lavvideo.c 2011-07-07 11:07:45.220089635 +0200 -+++ mjpegtools-1.9.0/lavtools/lavvideo.c 2011-07-07 11:18:27.601089556 +0200 -@@ -63,7 +63,7 @@ +Index: lavtools/lavvideo.c +=================================================================== +--- lavtools/lavvideo.c.orig ++++ lavtools/lavvideo.c +@@ -63,7 +63,7 @@ Copyright by Gernot Ziegler. * errors here, check your linux/time.h && sys/time.h header setup. */ #define _LINUX_TIME_H @@ -27,9 +11,10 @@ #include <videodev_mjpeg.h> #include <frequencies.h> -diff -ur mjpegtools-1.9.0.orig/lavtools/liblavplay.c mjpegtools-1.9.0/lavtools/liblavplay.c ---- mjpegtools-1.9.0.orig/lavtools/liblavplay.c 2011-07-07 11:07:45.221089635 +0200 -+++ mjpegtools-1.9.0/lavtools/liblavplay.c 2011-07-07 11:16:01.227089575 +0200 +Index: lavtools/liblavplay.c +=================================================================== +--- lavtools/liblavplay.c.orig ++++ lavtools/liblavplay.c @@ -68,7 +68,8 @@ * errors here, check your linux/time.h && sys/time.h header setup. */ @@ -40,9 +25,10 @@ #else #define VIDEO_MODE_PAL 0 #define VIDEO_MODE_NTSC 1 -diff -ur mjpegtools-1.9.0.orig/lavtools/liblavrec.c mjpegtools-1.9.0/lavtools/liblavrec.c ---- mjpegtools-1.9.0.orig/lavtools/liblavrec.c 2011-07-07 11:07:45.221089635 +0200 -+++ mjpegtools-1.9.0/lavtools/liblavrec.c 2011-07-07 11:16:18.362089573 +0200 +Index: lavtools/liblavrec.c +=================================================================== +--- lavtools/liblavrec.c.orig ++++ lavtools/liblavrec.c @@ -63,7 +63,8 @@ * errors here, check your linux/time.h && sys/time.h header setup. */ @@ -53,9 +39,10 @@ #ifdef HAVE_SYS_SOUNDCARD_H #include <sys/soundcard.h> #endif -diff -ur mjpegtools-1.9.0.orig/lavtools/testrec.c mjpegtools-1.9.0/lavtools/testrec.c ---- mjpegtools-1.9.0.orig/lavtools/testrec.c 2011-07-07 11:07:45.220089635 +0200 -+++ mjpegtools-1.9.0/lavtools/testrec.c 2011-07-07 11:19:56.128089546 +0200 +Index: lavtools/testrec.c +=================================================================== +--- lavtools/testrec.c.orig ++++ lavtools/testrec.c @@ -89,7 +89,7 @@ * errors here, check your linux/time.h && sys/time.h header setup. */ @@ -65,3 +52,49 @@ #include <linux/soundcard.h> /* These are explicit prototypes for the compiler, to prepare separation of audiolib.c */ +Index: configure.ac +=================================================================== +--- configure.ac.orig ++++ configure.ac +@@ -164,7 +164,7 @@ AC_ARG_WITH([v4l], AC_HELP_STRING([--wit + AS_IF([test "x$with_v4l" != "xno"], [ + case $host in + *-*-linux*) +- AC_CHECK_HEADER(linux/videodev.h, ++ AC_CHECK_HEADER(libv4l1-videodev.h, + [have_video4linux=true + AC_DEFINE(HAVE_V4L, 1, + [Building for Linux - using the video4linux API])], []) +@@ -173,7 +173,7 @@ esac]) + + AS_IF([test "x$have_video4linux" != "xtrue" && test "x$with_v4l" != "xno"], + [have_video4linux=false +- AC_MSG_WARN([videodev.h not found - please install the linux kernel headers programms needing v4l disabled])]) ++ AC_MSG_WARN([libv4l1-videodev.h not found - please install the linux kernel headers programms needing v4l disabled])]) + AM_CONDITIONAL(HAVE_V4L, test x$have_video4linux = xtrue) + + dnl ********************************************************************* +Index: configure +=================================================================== +--- configure.orig ++++ configure +@@ -16392,7 +16392,7 @@ if test "x$with_v4l" != "xno"; then : + + case $host in + *-*-linux*) +- ac_fn_c_check_header_mongrel "$LINENO" "linux/videodev.h" "ac_cv_header_linux_videodev_h" "$ac_includes_default" ++ ac_fn_c_check_header_mongrel "$LINENO" "libv4l1-videodev.h" "ac_cv_header_linux_videodev_h" "$ac_includes_default" + if test "x$ac_cv_header_linux_videodev_h" = xyes; then : + have_video4linux=true + +@@ -16407,8 +16407,8 @@ fi + + if test "x$have_video4linux" != "xtrue" && test "x$with_v4l" != "xno"; then : + have_video4linux=false +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: videodev.h not found - please install the linux kernel headers programms needing v4l disabled" >&5 +-$as_echo "$as_me: WARNING: videodev.h not found - please install the linux kernel headers programms needing v4l disabled" >&2;} ++ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libv4l1-videodev.h not found - please install the linux kernel headers programms needing v4l disabled" >&5 ++$as_echo "$as_me: WARNING: libv4l1-videodev.h not found - please install the linux kernel headers programms needing v4l disabled" >&2;} + fi + if test x$have_video4linux = xtrue; then + HAVE_V4L_TRUE= ++++++ mjpegtools-vector_alignment.patch ++++++ --- /var/tmp/diff_new_pack.iKaVBJ/_old 2011-11-18 15:46:23.000000000 +0100 +++ /var/tmp/diff_new_pack.iKaVBJ/_new 2011-11-18 15:46:23.000000000 +0100 @@ -3,9 +3,11 @@ mpeg2enc/imageplanes.hh | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) ---- a/mpeg2enc/imageplanes.cc -+++ b/mpeg2enc/imageplanes.cc -@@ -19,19 +19,22 @@ ImagePlanes::ImagePlanes( EncoderParams +Index: mpeg2enc/imageplanes.cc +=================================================================== +--- mpeg2enc/imageplanes.cc.orig ++++ mpeg2enc/imageplanes.cc +@@ -19,19 +19,22 @@ ImagePlanes::ImagePlanes( EncoderParams switch( c ) { case 0 : // Y plane @@ -30,7 +32,7 @@ planes[c] = 0; break; } -@@ -43,8 +46,8 @@ ImagePlanes::ImagePlanes( EncoderParams +@@ -43,8 +46,8 @@ ImagePlanes::ImagePlanes( EncoderParams { for( int c = 0; c < NUM_PLANES; ++c ) { @@ -41,9 +43,11 @@ } } ---- a/mpeg2enc/imageplanes.hh -+++ b/mpeg2enc/imageplanes.hh -@@ -51,6 +51,7 @@ class ImagePlanes +Index: mpeg2enc/imageplanes.hh +=================================================================== +--- mpeg2enc/imageplanes.hh.orig ++++ mpeg2enc/imageplanes.hh +@@ -50,6 +50,7 @@ class ImagePlanes int image_data_width, int image_data_height); protected: uint8_t *planes[NUM_PLANES]; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
