From 6122b192681e27e93803dd75e1cf12ec6b4c57e2 Mon Sep 17 00:00:00 2001 From: Thorsten Leemhuis Date: Tue, 22 Jul 2008 16:53:24 +0000 Subject: [PATCH 01/50] Setup of module mjpegtools --- .gitignore | 0 sources | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From a35e4d6ee5afe8b4ff378caed9afd609d78665bd Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 25 Jul 2008 19:08:52 +0000 Subject: [PATCH 02/50] initial mjpegtools import --- .gitignore | 1 + mjpegtools-1.9.0_rc3-gcc43.patch | 147 ++++++++++ mjpegtools-1.9.0rc1-anytovcd-ffmpegver.patch | 11 + mjpegtools.spec | 272 +++++++++++++++++++ sources | 1 + 5 files changed, 432 insertions(+) create mode 100644 mjpegtools-1.9.0_rc3-gcc43.patch create mode 100644 mjpegtools-1.9.0rc1-anytovcd-ffmpegver.patch create mode 100644 mjpegtools.spec diff --git a/.gitignore b/.gitignore index e69de29..e9e3e2a 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +mjpegtools-1.9.0rc3.tar.gz diff --git a/mjpegtools-1.9.0_rc3-gcc43.patch b/mjpegtools-1.9.0_rc3-gcc43.patch new file mode 100644 index 0000000..ae3fc90 --- /dev/null +++ b/mjpegtools-1.9.0_rc3-gcc43.patch @@ -0,0 +1,147 @@ +http://bugs.gentoo.org/200767 +http://sourceforge.net/tracker/index.php?func=detail&aid=1947059&group_id=5776&atid=305776 + +--- mjpegtools-1.9.0rc3/mpeg2enc/encodertypes.h ++++ mjpegtools-1.9.0rc3/mpeg2enc/encodertypes.h +@@ -25,6 +25,8 @@ + */ + + ++#include ++ + class Parity + { + public: +--- mjpegtools-1.9.0rc3/mpeg2enc/macroblock.cc ++++ mjpegtools-1.9.0rc3/mpeg2enc/macroblock.cc +@@ -21,6 +21,7 @@ + + #include + #include ++#include + + #include "macroblock.hh" + #include "mpeg2syntaxcodes.h" +--- mjpegtools-1.9.0rc3/mpeg2enc/picturereader.cc ++++ mjpegtools-1.9.0rc3/mpeg2enc/picturereader.cc +@@ -23,6 +23,7 @@ + #include "picturereader.hh" + #include "mpeg2encoder.hh" + #include "imageplanes.hh" ++#include + //#include + //#include + //#include +--- mjpegtools-1.9.0rc3/mplex/inputstrm.cpp ++++ mjpegtools-1.9.0rc3/mplex/inputstrm.cpp +@@ -23,6 +23,7 @@ + + #include + #include ++#include + + #include "mjpeg_types.h" + #include "inputstrm.hpp" +--- mjpegtools-1.9.0rc3/mplex/padstrm.cpp ++++ mjpegtools-1.9.0rc3/mplex/padstrm.cpp +@@ -24,6 +24,7 @@ + #include "config.h" + #endif + ++#include + #include "padstrm.hpp" + + +--- mjpegtools-1.9.0rc3/mplex/multiplexor.cpp ++++ mjpegtools-1.9.0rc3/mplex/multiplexor.cpp +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + + #include + #include +--- mjpegtools-1.9.0rc3/mplex/main.cpp ++++ mjpegtools-1.9.0rc3/mplex/main.cpp +@@ -31,6 +31,7 @@ + #include + #endif + #include ++#include + #include + #include + #ifndef _WIN32 +--- mjpegtools-1.9.0rc3/y4mdenoise/Set.hh ++++ mjpegtools-1.9.0rc3/y4mdenoise/Set.hh +@@ -23,7 +23,7 @@ + // How we implement ourselves. + + public: +- typedef typename Imp::Allocator Allocator; ++ typedef typename Imp::Allocator_t Allocator; + // The type of allocator to use to allocate items in the set. + + Set (const PRED &a_rPred = PRED(), +--- mjpegtools-1.9.0rc3/y4mdenoise/SkipList.hh ++++ mjpegtools-1.9.0rc3/y4mdenoise/SkipList.hh +@@ -57,19 +57,19 @@ + // Will give good sorting for up to e^10 items. + + public: +- typedef Allocator Allocator; ++ typedef Allocator Allocator_t; + // The type of node allocator to use. + +- static Allocator sm_oNodeAllocator; ++ static Allocator_t sm_oNodeAllocator; + // The default node allocator. + + SkipList (const PRED &a_rPred = PRED(), +- Allocator &a_rAlloc = sm_oNodeAllocator); ++ Allocator_t &a_rAlloc = sm_oNodeAllocator); + // Default constructor. Must be followed by Init(). + + SkipList (Status_t &a_reStatus, bool a_bAllowDuplicates, + uint32_t a_nRandSeed, const PRED &a_rPred = PRED(), +- Allocator &a_rAlloc = sm_oNodeAllocator); ++ Allocator_t &a_rAlloc = sm_oNodeAllocator); + // Constructor. Specify whether or not duplicates are allowed, + // and provide a random number seed. + +@@ -255,7 +255,7 @@ + + private: + +- Allocator &m_rNodeAllocator; ++ Allocator_t &m_rNodeAllocator; + // Where we get memory to allocate nodes. + + bool m_bAllowDuplicates; +@@ -337,7 +337,7 @@ + + // The default node allocator. Allocates 64K at a time. + template +-typename SkipList::Allocator ++typename SkipList::Allocator_t + SkipList::sm_oNodeAllocator (65536); + + +@@ -345,7 +345,7 @@ + // Default constructor. Must be followed by Init(). + template + SkipList::SkipList (const PRED &a_rPred, +- Allocator &a_rAlloc) ++ Allocator_t &a_rAlloc) + : m_rNodeAllocator (a_rAlloc), m_oPred (a_rPred) + { + // Set up some defaults. +@@ -371,7 +371,7 @@ + template + SkipList::SkipList (Status_t &a_reStatus, + bool a_bAllowDuplicates, uint32_t a_nRandSeed, +- const PRED &a_rPred, Allocator &a_rAlloc) ++ const PRED &a_rPred, Allocator_t &a_rAlloc) + : m_rNodeAllocator (a_rAlloc), m_oPred (a_rPred) + { + // Make sure they didn't start us off with an error. diff --git a/mjpegtools-1.9.0rc1-anytovcd-ffmpegver.patch b/mjpegtools-1.9.0rc1-anytovcd-ffmpegver.patch new file mode 100644 index 0000000..069cef6 --- /dev/null +++ b/mjpegtools-1.9.0rc1-anytovcd-ffmpegver.patch @@ -0,0 +1,11 @@ +--- mjpegtools-1.9.0rc1/scripts/anytovcd.sh~ 2006-02-16 19:58:24.000000000 +0200 ++++ mjpegtools-1.9.0rc1/scripts/anytovcd.sh 2007-02-24 22:28:52.000000000 +0200 +@@ -206,7 +206,7 @@ + + fi + +-FFMPEG_VERSION="`${FFMPEG} 2>&1 | awk '$4 == "build" {print $5}' | sed s/,// | head -1`" ++FFMPEG_VERSION="`${FFMPEG} -version 2>&1 | awk '$1 == "ffmpeg" {print $2}' | sed s/SVN-r// | head -n 1`" + + AUD_TRACK="`range_check ${AUD_TRACK} 1 99`" + FFMPEG_AUD_TRACK="`${FFMPEG} -i \"${AUDIO_SRC}\" 2>&1 | awk '/Audio:/ {sub("^#","",$2); print $2}' | awk -F[ '{print $1}' | head -${AUD_TRACK} | tail -1`" diff --git a/mjpegtools.spec b/mjpegtools.spec new file mode 100644 index 0000000..7139db5 --- /dev/null +++ b/mjpegtools.spec @@ -0,0 +1,272 @@ +Name: mjpegtools +Version: 1.9.0 +Release: 0.5.rc3%{?dist} +Summary: Tools to manipulate MPEG data + +Group: Applications/Multimedia +License: GPLv2 +URL: http://mjpeg.sourceforge.net/ +Source0: http://downloads.sourceforge.net/mjpeg/%{name}-%{version}rc3.tar.gz +Patch0: %{name}-1.9.0rc1-anytovcd-ffmpegver.patch +Patch1: http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-video/mjpegtools/files/mjpegtools-1.9.0_rc3-gcc43.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: libjpeg-devel +BuildRequires: nasm +BuildRequires: libdv-devel +BuildRequires: SDL-devel >= 1.1.3 +BuildRequires: SDL_gfx-devel +BuildRequires: libquicktime-devel >= 0.9.8 +BuildRequires: libpng-devel +BuildRequires: gtk2-devel >= 2.4.0 +Requires: %{name}-libs = %{version}-%{release} +# mencoder for lav2avi.sh +Requires: mencoder +# ffmpeg main package, y4mscaler and which for anytovcd.sh +Requires: ffmpeg +Requires: y4mscaler +Requires: which +Requires(post): /sbin/install-info +Requires(preun): /sbin/install-info + +%description +The mjpeg programs are a set of tools that can do recording of videos +and playback, simple cut-and-paste editing and the MPEG compression of +audio and video under Linux. This package contains mjpegtools console +utilities. + +%package gui +Summary: GUI tools to manipulate MPEG data +Group: Applications/Multimedia +Requires: %{name} = %{version}-%{release} + +%description gui +The mjpeg programs are a set of tools that can do recording of videos +and playback, simple cut-and-paste editing and the MPEG compression of +audio and video under Linux. This package contains mjpegtools GUI +utilities. + +%package libs +Summary: Libraries used by mjpegtools +Group: System Environment/Libraries +Requires: libquicktime >= 0.9.8 + +%description libs +The mjpeg programs are a set of tools that can do recording of videos +and playback, simple cut-and-paste editing and the MPEG compression of +audio and video under Linux. This package contains libraries used by +mjpegtools. + +%package devel +Summary: Development files for mjpegtools libraries +Group: Development/Libraries +Requires: %{name}-libs = %{version}-%{release} +Requires: pkgconfig + +%description devel +The mjpeg programs are a set of tools that can do recording of videos +and playback, simple cut-and-paste editing and the MPEG compression of +audio and video under Linux. This package contains development files +for building applications that use mjpegtools libraries. + + +%prep +%setup -q -n %{name}-%{version}rc3 +find . -type d -name CVS -print0 | xargs -0 rm -rf +%patch0 -p1 +%patch1 -p1 +sed -i -e 's/ARCHFLAGS=.*/ARCHFLAGS=/' configure* +sed -i -e 's|/lib /usr/lib|/%{_lib} %{_libdir}|' configure # lib64 rpaths +for f in docs/yuvfps.1 ; do + iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f +done + + +%build +%configure --disable-dependency-tracking --disable-static +make # %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT +rm -f $RPM_BUILD_ROOT{%{_infodir}/dir,%{_libdir}/lib*.la} +# too broken/outdated to be useful in 1.[89].0 (and would come with dep chain) +rm -f $RPM_BUILD_ROOT%{_bindir}/mpegtranscode + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig + +%post +/sbin/install-info %{_infodir}/mjpeg-howto.info %{_infodir}/dir || : + +%preun +[ $1 -eq 0 ] && \ +/sbin/install-info --delete %{_infodir}/mjpeg-howto.info %{_infodir}/dir || : + + +%files +%defattr(-,root,root,-) +%doc COPYING CHANGES ChangeLog AUTHORS BUGS README.lavpipe NEWS TODO +%{_bindir}/* +%exclude %{_bindir}/glav +%exclude %{_bindir}/lavplay +%exclude %{_bindir}/y4mhist +%exclude %{_bindir}/yuvplay +%{_mandir}/man1/*.1* +%exclude %{_mandir}/man1/lavplay.1* +%exclude %{_mandir}/man1/yuvplay.1* +%{_mandir}/man5/yuv4mpeg.5* +%{_infodir}/mjpeg-howto.info* + +%files gui +%defattr(-,root,root,-) +%doc README.glav +%{_bindir}/glav +# lavplay and yuvplay won't save -libs/console util users from X11 and SDL +# dependencies as long as liblavplay is in -libs, but they're inherently +# GUI tools -> include them here +%{_bindir}/lavplay +%{_bindir}/y4mhist +%{_bindir}/yuvplay +%{_mandir}/man1/lavplay.1* +%{_mandir}/man1/yuvplay.1* + +%files libs +%defattr(-,root,root,-) +%doc COPYING +%{_libdir}/lib*.so.* + +%files devel +%defattr(-,root,root,-) +%{_includedir}/%{name} +%{_libdir}/lib*.so +%{_libdir}/pkgconfig/%{name}.pc + + +%changelog +* Tue Apr 22 2008 Ville Skyttä - 1.9.0-0.5.rc3 +- Apply patch from Gentoo to fix build with GCC 4.3 (#1941). + +* Tue Dec 4 2007 Ville Skyttä - 1.9.0-0.4.rc3 +- 1.9.0rc3. + +* Sat Sep 29 2007 Ville Skyttä - 1.9.0-0.4.rc2 +- Requires: which + +* Wed Aug 22 2007 Ville Skyttä - 1.9.0-0.3.rc2 +- License: GPLv2 + +* Thu Jun 21 2007 Ville Skyttä - 1.9.0-0.2.rc2 +- Rebuild. + +* Fri Jun 8 2007 Ville Skyttä - 1.9.0-0.1.rc2 +- 1.9.0rc2. + +* Sat Nov 25 2006 Ville Skyttä - 1.8.0-7 +- Split GUI utilities into -gui subpackage. +- Don't ship mpegtranscode, it's broken/outdated. +- Require mencoder for lav2avi.sh. + +* Fri Oct 06 2006 Thorsten Leemhuis 1.8.0-6 +- rebuilt for unwind info generation, broken in gcc-4.1.1-21 + +* Sun Sep 24 2006 Ville Skyttä - 1.8.0-5 +- Specfile cleanup. + +* Sun Jun 4 2006 Ville Skyttä - 1.8.0-4 +- Get rid of undefined non-weak symbols in liblav*. +- Apply upstream fix for compiling with libquicktime 0.9.8. + +* Thu Mar 09 2006 Andreas Bierfert +- switch to new release field + +* Tue Feb 28 2006 Andreas Bierfert +- add dist + +* Sat Jan 21 2006 Ville Skyttä - 1.8.0-0.lvn.3 +- Include license text in -libs, it can be installed without the main package. +- Convert yuvfps man page to UTF-8. +- Fix -devel Group tag. + +* Thu Jan 19 2006 Adrian Reber - 1.8.0-0.lvn.2 +- Added patch to compile with gcc 4.1 +- Dropped 0 Epoch + +* Mon Sep 19 2005 Ville Skyttä - 0:1.8.0-0.lvn.1 +- 1.8.0. + +* Sat Aug 27 2005 Ville Skyttä - 0:1.6.3-0.lvn.0.1.rc3 +- 1.6.3-rc3, Altivec fixes applied upstream. + +* Fri Aug 12 2005 Ville Skyttä - 0:1.6.3-0.lvn.0.1.rc2 +- 1.6.3-rc2, clean up obsolete pre-FC2 stuff. +- Fix Altivec build, kudos to upstream. + +* Thu May 26 2005 Ville Skyttä - 0:1.6,3-0.lvn.0.1.rc1 +- 1.6.3-rc1 (1.7.0 snapshot package not released, so no Epoch bump). + +* Sun May 22 2005 Ville Skyttä - 0:1.7.0-0.lvn.0.2.cvs20050521 +- PPC: disable Altivec due to gcc4 build failure, honor $RPM_OPT_FLAGS. + +* Sat May 21 2005 Ville Skyttä - 0:1.7.0-0.lvn.0.1.cvs20050521 +- Pre-1.7.0 snapshot as of today, all patches applied or obsoleted upstream. +- Require pkgconfig in -devel. + +* Wed Feb 2 2005 Ville Skyttä - 0:1.6.2-0.lvn.7 +- Add corrected -fPIC tweak from Thorsten. + +* Mon Jan 31 2005 Ville Skyttä - 0:1.6.2-0.lvn.6 +- Include PNG input support. +- Remove no-op $RPM_OPT_FLAGS setting from %%build. +- Remove bogus optimization settings from configure script. + +* Fri Dec 31 2004 Thorsten Leemhuis - 0:1.6.2-0.lvn.5 +- CFLAGS="$CFLAGS -fPIC" on non x86; Fixes build error on x86_64; The + option --with-pic is not enough + +* Sat Dec 18 2004 Dams - 0:1.6.2-0.lvn.4 +- Disabling static libraries building + +* Tue Dec 14 2004 Ville Skyttä - 0:1.6.2-0.lvn.3 +- Include quicktime support. +- Apply patch from ALT Linux to fix info pages, fix typo in %%post. +- Require /sbin/install-info. +- Add "--without static" rpmbuild option to work around an issue with FC3 strip +- Always enable SIMD accelerations, CPU capabilities detected at runtime. +- Always disable use of cmov. + +* Thu Nov 11 2004 Dams 0:1.6.2-0.lvn.2 +- Added patch to fix gcc3.4 build +- Detected race condition in Makefiles (disabling _smp_mflags use) +- Added info files & scriptlets +- Dropped patch0 and patch1 + +* Tue Jun 8 2004 Dams 0:1.6.2-0.lvn.1 +- Updated to 1.6.2 + +* Sun Sep 28 2003 Dams 0:1.6.1-0.fdr.6 +- Removed comment after scriptlets + +* Fri Aug 22 2003 Dams 0:1.6.1-0.fdr.5 +- buildroot -> RPM_BUILD_ROOT + +* Sun Aug 10 2003 Dams 0:1.6.1-0.fdr.4 +- Applied upstream patches to fix build on gcc3.3 systems + +* Tue Apr 29 2003 Dams 0:1.6.1-0.fdr.3 +- Now test arch for configure options (from Ville) +- Removed ImageMagick-devel BuildRequires + +* Sun Apr 27 2003 Dams 0:1.6.1-0.fdr.2 +- Added missing BuildRequires +- Added post/postun scriplets for libs package + +* Wed Apr 23 2003 Dams +- Initial build. diff --git a/sources b/sources index e69de29..29c0a05 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +d38dad44333e3236ccc0dc1efdb27910 mjpegtools-1.9.0rc3.tar.gz From 18bccf849116af594ab078f0ff15601de5630d6a Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 25 Jul 2008 19:16:49 +0000 Subject: [PATCH 03/50] * Fri Jul 25 2008 Hans de Goede 1.9.0-0.6.rc3 - Release bump for rpmfusion - Sync with freshrpms (no changes) --- mjpegtools.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index 7139db5..20aa090 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -1,6 +1,6 @@ Name: mjpegtools Version: 1.9.0 -Release: 0.5.rc3%{?dist} +Release: 0.6.rc3%{?dist} Summary: Tools to manipulate MPEG data Group: Applications/Multimedia @@ -151,6 +151,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jul 25 2008 Hans de Goede 1.9.0-0.6.rc3 +- Release bump for rpmfusion +- Sync with freshrpms (no changes) + * Tue Apr 22 2008 Ville Skyttä - 1.9.0-0.5.rc3 - Apply patch from Gentoo to fix build with GCC 4.3 (#1941). From a3bdebb19ea588e390bd1597e1d201dca5ba558f Mon Sep 17 00:00:00 2001 From: Thorsten Leemhuis Date: Sun, 29 Mar 2009 13:42:15 +0000 Subject: [PATCH 04/50] * Sun Mar 29 2009 Thorsten Leemhuis - 1.9.0-0.7.rc3 - rebuild for new F11 features --- mjpegtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index 20aa090..57a8e5e 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -1,6 +1,6 @@ Name: mjpegtools Version: 1.9.0 -Release: 0.6.rc3%{?dist} +Release: 0.7.rc3%{?dist} Summary: Tools to manipulate MPEG data Group: Applications/Multimedia @@ -151,6 +151,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Mar 29 2009 Thorsten Leemhuis - 1.9.0-0.7.rc3 +- rebuild for new F11 features + * Fri Jul 25 2008 Hans de Goede 1.9.0-0.6.rc3 - Release bump for rpmfusion - Sync with freshrpms (no changes) From 597b6b8c98180213c10e0f91b3c661f11c953b17 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Wed, 15 Apr 2009 10:41:21 +0000 Subject: [PATCH 05/50] * Wed Apr 15 2009 Hans de Goede 1.9.0-1 - Update to upstream 1.9.0 final release --- .gitignore | 2 +- mjpegtools-1.9.0-gcc44.patch | 12 +++ mjpegtools-1.9.0_rc3-gcc43.patch | 147 ------------------------------- mjpegtools.spec | 12 +-- sources | 2 +- 5 files changed, 21 insertions(+), 154 deletions(-) create mode 100644 mjpegtools-1.9.0-gcc44.patch delete mode 100644 mjpegtools-1.9.0_rc3-gcc43.patch diff --git a/.gitignore b/.gitignore index e9e3e2a..bbbf2f6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -mjpegtools-1.9.0rc3.tar.gz +mjpegtools-1.9.0.tar.gz diff --git a/mjpegtools-1.9.0-gcc44.patch b/mjpegtools-1.9.0-gcc44.patch new file mode 100644 index 0000000..96c415d --- /dev/null +++ b/mjpegtools-1.9.0-gcc44.patch @@ -0,0 +1,12 @@ +diff -up mjpegtools-1.9.0/mplex/lpcmstrm_in.cpp~ mjpegtools-1.9.0/mplex/lpcmstrm_in.cpp +--- mjpegtools-1.9.0/mplex/lpcmstrm_in.cpp~ 2005-10-13 18:43:10.000000000 +0200 ++++ mjpegtools-1.9.0/mplex/lpcmstrm_in.cpp 2009-04-15 12:22:29.000000000 +0200 +@@ -53,7 +53,7 @@ LPCMStream::LPCMStream(IBitStream &ibs, + + bool LPCMStream::Probe(IBitStream &bs ) + { +- char *last_dot = strrchr( bs.StreamName(), '.' ); ++ const char *last_dot = strrchr( bs.StreamName(), '.' ); + return + last_dot != NULL + && strcmp( last_dot+1, "lpcm") == 0; diff --git a/mjpegtools-1.9.0_rc3-gcc43.patch b/mjpegtools-1.9.0_rc3-gcc43.patch deleted file mode 100644 index ae3fc90..0000000 --- a/mjpegtools-1.9.0_rc3-gcc43.patch +++ /dev/null @@ -1,147 +0,0 @@ -http://bugs.gentoo.org/200767 -http://sourceforge.net/tracker/index.php?func=detail&aid=1947059&group_id=5776&atid=305776 - ---- mjpegtools-1.9.0rc3/mpeg2enc/encodertypes.h -+++ mjpegtools-1.9.0rc3/mpeg2enc/encodertypes.h -@@ -25,6 +25,8 @@ - */ - - -+#include -+ - class Parity - { - public: ---- mjpegtools-1.9.0rc3/mpeg2enc/macroblock.cc -+++ mjpegtools-1.9.0rc3/mpeg2enc/macroblock.cc -@@ -21,6 +21,7 @@ - - #include - #include -+#include - - #include "macroblock.hh" - #include "mpeg2syntaxcodes.h" ---- mjpegtools-1.9.0rc3/mpeg2enc/picturereader.cc -+++ mjpegtools-1.9.0rc3/mpeg2enc/picturereader.cc -@@ -23,6 +23,7 @@ - #include "picturereader.hh" - #include "mpeg2encoder.hh" - #include "imageplanes.hh" -+#include - //#include - //#include - //#include ---- mjpegtools-1.9.0rc3/mplex/inputstrm.cpp -+++ mjpegtools-1.9.0rc3/mplex/inputstrm.cpp -@@ -23,6 +23,7 @@ - - #include - #include -+#include - - #include "mjpeg_types.h" - #include "inputstrm.hpp" ---- mjpegtools-1.9.0rc3/mplex/padstrm.cpp -+++ mjpegtools-1.9.0rc3/mplex/padstrm.cpp -@@ -24,6 +24,7 @@ - #include "config.h" - #endif - -+#include - #include "padstrm.hpp" - - ---- mjpegtools-1.9.0rc3/mplex/multiplexor.cpp -+++ mjpegtools-1.9.0rc3/mplex/multiplexor.cpp -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #include - #include ---- mjpegtools-1.9.0rc3/mplex/main.cpp -+++ mjpegtools-1.9.0rc3/mplex/main.cpp -@@ -31,6 +31,7 @@ - #include - #endif - #include -+#include - #include - #include - #ifndef _WIN32 ---- mjpegtools-1.9.0rc3/y4mdenoise/Set.hh -+++ mjpegtools-1.9.0rc3/y4mdenoise/Set.hh -@@ -23,7 +23,7 @@ - // How we implement ourselves. - - public: -- typedef typename Imp::Allocator Allocator; -+ typedef typename Imp::Allocator_t Allocator; - // The type of allocator to use to allocate items in the set. - - Set (const PRED &a_rPred = PRED(), ---- mjpegtools-1.9.0rc3/y4mdenoise/SkipList.hh -+++ mjpegtools-1.9.0rc3/y4mdenoise/SkipList.hh -@@ -57,19 +57,19 @@ - // Will give good sorting for up to e^10 items. - - public: -- typedef Allocator Allocator; -+ typedef Allocator Allocator_t; - // The type of node allocator to use. - -- static Allocator sm_oNodeAllocator; -+ static Allocator_t sm_oNodeAllocator; - // The default node allocator. - - SkipList (const PRED &a_rPred = PRED(), -- Allocator &a_rAlloc = sm_oNodeAllocator); -+ Allocator_t &a_rAlloc = sm_oNodeAllocator); - // Default constructor. Must be followed by Init(). - - SkipList (Status_t &a_reStatus, bool a_bAllowDuplicates, - uint32_t a_nRandSeed, const PRED &a_rPred = PRED(), -- Allocator &a_rAlloc = sm_oNodeAllocator); -+ Allocator_t &a_rAlloc = sm_oNodeAllocator); - // Constructor. Specify whether or not duplicates are allowed, - // and provide a random number seed. - -@@ -255,7 +255,7 @@ - - private: - -- Allocator &m_rNodeAllocator; -+ Allocator_t &m_rNodeAllocator; - // Where we get memory to allocate nodes. - - bool m_bAllowDuplicates; -@@ -337,7 +337,7 @@ - - // The default node allocator. Allocates 64K at a time. - template --typename SkipList::Allocator -+typename SkipList::Allocator_t - SkipList::sm_oNodeAllocator (65536); - - -@@ -345,7 +345,7 @@ - // Default constructor. Must be followed by Init(). - template - SkipList::SkipList (const PRED &a_rPred, -- Allocator &a_rAlloc) -+ Allocator_t &a_rAlloc) - : m_rNodeAllocator (a_rAlloc), m_oPred (a_rPred) - { - // Set up some defaults. -@@ -371,7 +371,7 @@ - template - SkipList::SkipList (Status_t &a_reStatus, - bool a_bAllowDuplicates, uint32_t a_nRandSeed, -- const PRED &a_rPred, Allocator &a_rAlloc) -+ const PRED &a_rPred, Allocator_t &a_rAlloc) - : m_rNodeAllocator (a_rAlloc), m_oPred (a_rPred) - { - // Make sure they didn't start us off with an error. diff --git a/mjpegtools.spec b/mjpegtools.spec index 57a8e5e..99eb24c 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -1,14 +1,14 @@ Name: mjpegtools Version: 1.9.0 -Release: 0.7.rc3%{?dist} +Release: 1%{?dist} Summary: Tools to manipulate MPEG data Group: Applications/Multimedia License: GPLv2 URL: http://mjpeg.sourceforge.net/ -Source0: http://downloads.sourceforge.net/mjpeg/%{name}-%{version}rc3.tar.gz +Source0: http://downloads.sourceforge.net/mjpeg/%{name}-%{version}.tar.gz Patch0: %{name}-1.9.0rc1-anytovcd-ffmpegver.patch -Patch1: http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-video/mjpegtools/files/mjpegtools-1.9.0_rc3-gcc43.patch +Patch1: mjpegtools-1.9.0-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libjpeg-devel @@ -71,8 +71,7 @@ for building applications that use mjpegtools libraries. %prep -%setup -q -n %{name}-%{version}rc3 -find . -type d -name CVS -print0 | xargs -0 rm -rf +%setup -q %patch0 -p1 %patch1 -p1 sed -i -e 's/ARCHFLAGS=.*/ARCHFLAGS=/' configure* @@ -151,6 +150,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Apr 15 2009 Hans de Goede 1.9.0-1 +- Update to upstream 1.9.0 final release + * Sun Mar 29 2009 Thorsten Leemhuis - 1.9.0-0.7.rc3 - rebuild for new F11 features diff --git a/sources b/sources index 29c0a05..8b5e6e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d38dad44333e3236ccc0dc1efdb27910 mjpegtools-1.9.0rc3.tar.gz +309a6fcf0900a010d6a9c1e91afc2f5c mjpegtools-1.9.0.tar.gz From 4622614ecb010b64b0cf3cc873d0185a53775e3b Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 3 Sep 2010 14:41:39 +0000 Subject: [PATCH 06/50] * Fri Sep 3 2010 Hans de Goede 1.9.0-2 - Fix a memleak which is causing issues for LiVES --- mjpegtools-1.9.0-png-memleak.patch | 11 +++++++++++ mjpegtools.spec | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 mjpegtools-1.9.0-png-memleak.patch diff --git a/mjpegtools-1.9.0-png-memleak.patch b/mjpegtools-1.9.0-png-memleak.patch new file mode 100644 index 0000000..f077a1a --- /dev/null +++ b/mjpegtools-1.9.0-png-memleak.patch @@ -0,0 +1,11 @@ +diff -up mjpegtools-1.9.0/lavtools/png2yuv.c~ mjpegtools-1.9.0/lavtools/png2yuv.c +--- mjpegtools-1.9.0/lavtools/png2yuv.c~ 2007-11-08 18:31:50.000000000 +0100 ++++ mjpegtools-1.9.0/lavtools/png2yuv.c 2010-09-03 13:32:43.015596001 +0200 +@@ -407,6 +407,7 @@ int decode_png(const char *pngname, int + return 2; + } + ++ png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); + fclose(pngfile); + + return 1; diff --git a/mjpegtools.spec b/mjpegtools.spec index 99eb24c..03d4616 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -1,6 +1,6 @@ Name: mjpegtools Version: 1.9.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tools to manipulate MPEG data Group: Applications/Multimedia @@ -9,6 +9,7 @@ URL: http://mjpeg.sourceforge.net/ Source0: http://downloads.sourceforge.net/mjpeg/%{name}-%{version}.tar.gz Patch0: %{name}-1.9.0rc1-anytovcd-ffmpegver.patch Patch1: mjpegtools-1.9.0-gcc44.patch +Patch2: mjpegtools-1.9.0-png-memleak.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libjpeg-devel @@ -74,6 +75,7 @@ for building applications that use mjpegtools libraries. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 sed -i -e 's/ARCHFLAGS=.*/ARCHFLAGS=/' configure* sed -i -e 's|/lib /usr/lib|/%{_lib} %{_libdir}|' configure # lib64 rpaths for f in docs/yuvfps.1 ; do @@ -150,6 +152,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Sep 3 2010 Hans de Goede 1.9.0-2 +- Fix a memleak which is causing issues for LiVES + * Wed Apr 15 2009 Hans de Goede 1.9.0-1 - Update to upstream 1.9.0 final release From 793294f7bfcb7b1e51455c052b7a7532783e8d3f Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Tue, 2 Aug 2011 21:46:40 +0000 Subject: [PATCH 07/50] * Mon Aug 1 2011 Hans de Goede - 2.0.0-1 - Update to new upstream 2.0.0 final release --- .gitignore | 2 +- mjpegtools-1.9.0-gcc44.patch | 12 --- mjpegtools-1.9.0-png-memleak.patch | 11 --- mjpegtools-1.9.0rc1-anytovcd-ffmpegver.patch | 11 --- mjpegtools-2.0.0-no-config-in-public-header.h | 11 +++ mjpegtools.spec | 88 +++++++++++++------ sources | 2 +- 7 files changed, 73 insertions(+), 64 deletions(-) delete mode 100644 mjpegtools-1.9.0-gcc44.patch delete mode 100644 mjpegtools-1.9.0-png-memleak.patch delete mode 100644 mjpegtools-1.9.0rc1-anytovcd-ffmpegver.patch create mode 100644 mjpegtools-2.0.0-no-config-in-public-header.h diff --git a/.gitignore b/.gitignore index bbbf2f6..a750a96 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -mjpegtools-1.9.0.tar.gz +mjpegtools-2.0.0.tar.gz diff --git a/mjpegtools-1.9.0-gcc44.patch b/mjpegtools-1.9.0-gcc44.patch deleted file mode 100644 index 96c415d..0000000 --- a/mjpegtools-1.9.0-gcc44.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up mjpegtools-1.9.0/mplex/lpcmstrm_in.cpp~ mjpegtools-1.9.0/mplex/lpcmstrm_in.cpp ---- mjpegtools-1.9.0/mplex/lpcmstrm_in.cpp~ 2005-10-13 18:43:10.000000000 +0200 -+++ mjpegtools-1.9.0/mplex/lpcmstrm_in.cpp 2009-04-15 12:22:29.000000000 +0200 -@@ -53,7 +53,7 @@ LPCMStream::LPCMStream(IBitStream &ibs, - - bool LPCMStream::Probe(IBitStream &bs ) - { -- char *last_dot = strrchr( bs.StreamName(), '.' ); -+ const char *last_dot = strrchr( bs.StreamName(), '.' ); - return - last_dot != NULL - && strcmp( last_dot+1, "lpcm") == 0; diff --git a/mjpegtools-1.9.0-png-memleak.patch b/mjpegtools-1.9.0-png-memleak.patch deleted file mode 100644 index f077a1a..0000000 --- a/mjpegtools-1.9.0-png-memleak.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up mjpegtools-1.9.0/lavtools/png2yuv.c~ mjpegtools-1.9.0/lavtools/png2yuv.c ---- mjpegtools-1.9.0/lavtools/png2yuv.c~ 2007-11-08 18:31:50.000000000 +0100 -+++ mjpegtools-1.9.0/lavtools/png2yuv.c 2010-09-03 13:32:43.015596001 +0200 -@@ -407,6 +407,7 @@ int decode_png(const char *pngname, int - return 2; - } - -+ png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); - fclose(pngfile); - - return 1; diff --git a/mjpegtools-1.9.0rc1-anytovcd-ffmpegver.patch b/mjpegtools-1.9.0rc1-anytovcd-ffmpegver.patch deleted file mode 100644 index 069cef6..0000000 --- a/mjpegtools-1.9.0rc1-anytovcd-ffmpegver.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mjpegtools-1.9.0rc1/scripts/anytovcd.sh~ 2006-02-16 19:58:24.000000000 +0200 -+++ mjpegtools-1.9.0rc1/scripts/anytovcd.sh 2007-02-24 22:28:52.000000000 +0200 -@@ -206,7 +206,7 @@ - - fi - --FFMPEG_VERSION="`${FFMPEG} 2>&1 | awk '$4 == "build" {print $5}' | sed s/,// | head -1`" -+FFMPEG_VERSION="`${FFMPEG} -version 2>&1 | awk '$1 == "ffmpeg" {print $2}' | sed s/SVN-r// | head -n 1`" - - AUD_TRACK="`range_check ${AUD_TRACK} 1 99`" - FFMPEG_AUD_TRACK="`${FFMPEG} -i \"${AUDIO_SRC}\" 2>&1 | awk '/Audio:/ {sub("^#","",$2); print $2}' | awk -F[ '{print $1}' | head -${AUD_TRACK} | tail -1`" diff --git a/mjpegtools-2.0.0-no-config-in-public-header.h b/mjpegtools-2.0.0-no-config-in-public-header.h new file mode 100644 index 0000000..2043f31 --- /dev/null +++ b/mjpegtools-2.0.0-no-config-in-public-header.h @@ -0,0 +1,11 @@ +diff -up mjpegtools-2.0.0/mplex/stream_params.hpp~ mjpegtools-2.0.0/mplex/stream_params.hpp +--- mjpegtools-2.0.0/mplex/stream_params.hpp~ 2010-03-13 14:05:07.000000000 +0100 ++++ mjpegtools-2.0.0/mplex/stream_params.hpp 2011-08-02 23:34:12.126843444 +0200 +@@ -23,7 +23,6 @@ + #ifndef __STREAM_PARAMS_HH__ + #define __STREAM_PARAMS_HH__ + +-#include + #include + class LpcmParams + { diff --git a/mjpegtools.spec b/mjpegtools.spec index 03d4616..72641c1 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -1,17 +1,12 @@ Name: mjpegtools -Version: 1.9.0 -Release: 2%{?dist} +Version: 2.0.0 +Release: 1%{?dist} Summary: Tools to manipulate MPEG data - Group: Applications/Multimedia License: GPLv2 URL: http://mjpeg.sourceforge.net/ Source0: http://downloads.sourceforge.net/mjpeg/%{name}-%{version}.tar.gz -Patch0: %{name}-1.9.0rc1-anytovcd-ffmpegver.patch -Patch1: mjpegtools-1.9.0-gcc44.patch -Patch2: mjpegtools-1.9.0-png-memleak.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - +Patch0: mjpegtools-2.0.0-no-config-in-public-header.h BuildRequires: libjpeg-devel BuildRequires: nasm BuildRequires: libdv-devel @@ -21,6 +16,7 @@ BuildRequires: libquicktime-devel >= 0.9.8 BuildRequires: libpng-devel BuildRequires: gtk2-devel >= 2.4.0 Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-lav = %{version}-%{release} # mencoder for lav2avi.sh Requires: mencoder # ffmpeg main package, y4mscaler and which for anytovcd.sh @@ -36,6 +32,7 @@ and playback, simple cut-and-paste editing and the MPEG compression of audio and video under Linux. This package contains mjpegtools console utilities. + %package gui Summary: GUI tools to manipulate MPEG data Group: Applications/Multimedia @@ -47,22 +44,34 @@ and playback, simple cut-and-paste editing and the MPEG compression of audio and video under Linux. This package contains mjpegtools GUI utilities. + %package libs -Summary: Libraries used by mjpegtools +Summary: MJPEGtools libraries Group: System Environment/Libraries -Requires: libquicktime >= 0.9.8 %description libs The mjpeg programs are a set of tools that can do recording of videos and playback, simple cut-and-paste editing and the MPEG compression of +audio and video under Linux. This package contains libraries which are +used by mjpegtools and also by several other projects. + + +%package lav +Summary: MJPEGtools lavpipe libraries +Group: System Environment/Libraries +Requires: %{name}-libs = %{version}-%{release} + +%description lav +The mjpeg programs are a set of tools that can do recording of videos +and playback, simple cut-and-paste editing and the MPEG compression of audio and video under Linux. This package contains libraries used by mjpegtools. + %package devel Summary: Development files for mjpegtools libraries Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} -Requires: pkgconfig %description devel The mjpeg programs are a set of tools that can do recording of videos @@ -71,11 +80,22 @@ audio and video under Linux. This package contains development files for building applications that use mjpegtools libraries. +%package lav-devel +Summary: Development files for mjpegtools lavpipe libraries +Group: Development/Libraries +Requires: %{name}-lav = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} + +%description lav-devel +The mjpeg programs are a set of tools that can do recording of videos +and playback, simple cut-and-paste editing and the MPEG compression of +audio and video under Linux. This package contains development files +for building applications that use mjpegtools lavpipe libraries. + + %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 sed -i -e 's/ARCHFLAGS=.*/ARCHFLAGS=/' configure* sed -i -e 's|/lib /usr/lib|/%{_lib} %{_libdir}|' configure # lib64 rpaths for f in docs/yuvfps.1 ; do @@ -85,36 +105,35 @@ done %build %configure --disable-dependency-tracking --disable-static -make # %{?_smp_mflags} +make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT{%{_infodir}/dir,%{_libdir}/lib*.la} # too broken/outdated to be useful in 1.[89].0 (and would come with dep chain) -rm -f $RPM_BUILD_ROOT%{_bindir}/mpegtranscode +rm $RPM_BUILD_ROOT%{_bindir}/mpegtranscode -%clean -rm -rf $RPM_BUILD_ROOT +%post +/sbin/install-info %{_infodir}/mjpeg-howto.info %{_infodir}/dir || : +%preun +[ $1 -eq 0 ] && \ +/sbin/install-info --delete %{_infodir}/mjpeg-howto.info %{_infodir}/dir || : %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig -%post -/sbin/install-info %{_infodir}/mjpeg-howto.info %{_infodir}/dir || : +%post lav -p /sbin/ldconfig -%preun -[ $1 -eq 0 ] && \ -/sbin/install-info --delete %{_infodir}/mjpeg-howto.info %{_infodir}/dir || : +%postun lav -p /sbin/ldconfig %files %defattr(-,root,root,-) -%doc COPYING CHANGES ChangeLog AUTHORS BUGS README.lavpipe NEWS TODO +%doc CHANGES ChangeLog AUTHORS BUGS README.lavpipe NEWS TODO %{_bindir}/* %exclude %{_bindir}/glav %exclude %{_bindir}/lavplay @@ -130,8 +149,8 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc README.glav %{_bindir}/glav -# lavplay and yuvplay won't save -libs/console util users from X11 and SDL -# dependencies as long as liblavplay is in -libs, but they're inherently +# lavplay and yuvplay won't save console util users from X11 and SDL +# dependencies as long as liblavplay is in -lav, but they're inherently # GUI tools -> include them here %{_bindir}/lavplay %{_bindir}/y4mhist @@ -142,16 +161,29 @@ rm -rf $RPM_BUILD_ROOT %files libs %defattr(-,root,root,-) %doc COPYING -%{_libdir}/lib*.so.* +%{_libdir}/libm*.so.* + +%files lav +%defattr(-,root,root,-) +%{_libdir}/liblav*.so.* %files devel %defattr(-,root,root,-) %{_includedir}/%{name} -%{_libdir}/lib*.so +%exclude %{_includedir}/%{name}/*lav*.h +%{_libdir}/libm*.so %{_libdir}/pkgconfig/%{name}.pc +%files lav-devel +%defattr(-,root,root,-) +%{_includedir}/%{name}/*lav*.h +%{_libdir}/liblav*.so + %changelog +* Mon Aug 1 2011 Hans de Goede - 2.0.0-1 +- Update to new upstream 2.0.0 final release + * Fri Sep 3 2010 Hans de Goede 1.9.0-2 - Fix a memleak which is causing issues for LiVES diff --git a/sources b/sources index 8b5e6e1..80e9c7f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -309a6fcf0900a010d6a9c1e91afc2f5c mjpegtools-1.9.0.tar.gz +903e1e3b967eebcc5fe5626d7517dc46 mjpegtools-2.0.0.tar.gz From f60f13205d77f08af5433d17f10b354b0a8f99f5 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 8 Feb 2012 21:53:46 +0000 Subject: [PATCH 08/50] * Wed Feb 08 2012 Nicolas Chauvet - 2.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- mjpegtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index 72641c1..9873a6a 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -1,6 +1,6 @@ Name: mjpegtools Version: 2.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tools to manipulate MPEG data Group: Applications/Multimedia License: GPLv2 @@ -181,6 +181,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/mpegtranscode %changelog +* Wed Feb 08 2012 Nicolas Chauvet - 2.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Aug 1 2011 Hans de Goede - 2.0.0-1 - Update to new upstream 2.0.0 final release From 8bb4b61db2c1f146ca3c5ff9975365267c30b2aa Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 2 Mar 2012 22:12:57 +0000 Subject: [PATCH 09/50] * Fri Mar 02 2012 Nicolas Chauvet - 2.0.0-3 - Rebuilt for c++ ABI breakage --- mjpegtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index 9873a6a..c845e40 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -1,6 +1,6 @@ Name: mjpegtools Version: 2.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tools to manipulate MPEG data Group: Applications/Multimedia License: GPLv2 @@ -181,6 +181,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/mpegtranscode %changelog +* Fri Mar 02 2012 Nicolas Chauvet - 2.0.0-3 +- Rebuilt for c++ ABI breakage + * Wed Feb 08 2012 Nicolas Chauvet - 2.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From b167d04a09d436e132489aaff8a35ddd1b2daa51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 2 May 2012 12:45:49 +0000 Subject: [PATCH 10/50] =?UTF-8?q?*=20Wed=20May=2002=202012=20S=C3=A9rgio?= =?UTF-8?q?=20Basto=20=20-=202.0.0-4=20-=20Add=20patch?= =?UTF-8?q?=20for=20gcc=204.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mjpegtools.spec | 7 ++++++- mjpegtools_gcc470.patch | 11 +++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 mjpegtools_gcc470.patch diff --git a/mjpegtools.spec b/mjpegtools.spec index c845e40..238eaf9 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -1,12 +1,13 @@ Name: mjpegtools Version: 2.0.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tools to manipulate MPEG data Group: Applications/Multimedia License: GPLv2 URL: http://mjpeg.sourceforge.net/ Source0: http://downloads.sourceforge.net/mjpeg/%{name}-%{version}.tar.gz Patch0: mjpegtools-2.0.0-no-config-in-public-header.h +Patch1: mjpegtools_gcc470.patch BuildRequires: libjpeg-devel BuildRequires: nasm BuildRequires: libdv-devel @@ -96,6 +97,7 @@ for building applications that use mjpegtools lavpipe libraries. %prep %setup -q %patch0 -p1 +%patch1 -p1 sed -i -e 's/ARCHFLAGS=.*/ARCHFLAGS=/' configure* sed -i -e 's|/lib /usr/lib|/%{_lib} %{_libdir}|' configure # lib64 rpaths for f in docs/yuvfps.1 ; do @@ -181,6 +183,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/mpegtranscode %changelog +* Wed May 02 2012 Sérgio Basto - 2.0.0-4 +- Add patch for gcc 4.7 + * Fri Mar 02 2012 Nicolas Chauvet - 2.0.0-3 - Rebuilt for c++ ABI breakage diff --git a/mjpegtools_gcc470.patch b/mjpegtools_gcc470.patch new file mode 100644 index 0000000..050b33f --- /dev/null +++ b/mjpegtools_gcc470.patch @@ -0,0 +1,11 @@ +--- a/y4mdenoise/MotionSearcher.hh ++++ b/y4mdenoise/MotionSearcher.hh +@@ -2196,7 +2196,7 @@ + { + // This region is too small to be bothered with. + // Just get rid of it. +- DeleteRegion (a_pRegion); ++ this->DeleteRegion (a_pRegion); + } + else + { From e24d23f2e88bfffb961b26d1d65b2cc2e17759f3 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Tue, 26 Jun 2012 07:44:38 +0000 Subject: [PATCH 11/50] Rebuilt --- mjpegtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index 238eaf9..03fe695 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -1,6 +1,6 @@ Name: mjpegtools Version: 2.0.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tools to manipulate MPEG data Group: Applications/Multimedia License: GPLv2 @@ -183,6 +183,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/mpegtranscode %changelog +* Tue Jun 26 2012 Nicolas Chauvet - 2.0.0-5 +- Rebuilt for FFmpeg + * Wed May 02 2012 Sérgio Basto - 2.0.0-4 - Add patch for gcc 4.7 From 2c458ad328f5f911348584ed6268137ab78f3ce1 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 3 Mar 2013 21:43:45 +0000 Subject: [PATCH 12/50] * Sun Mar 03 2013 Nicolas Chauvet - 2.0.0-6 - Mass rebuilt for Fedora 19 Features --- mjpegtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index 03fe695..8a09e59 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -1,6 +1,6 @@ Name: mjpegtools Version: 2.0.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Tools to manipulate MPEG data Group: Applications/Multimedia License: GPLv2 @@ -183,6 +183,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/mpegtranscode %changelog +* Sun Mar 03 2013 Nicolas Chauvet - 2.0.0-6 +- Mass rebuilt for Fedora 19 Features + * Tue Jun 26 2012 Nicolas Chauvet - 2.0.0-5 - Rebuilt for FFmpeg From c1e0f097b59ae70705bc4c54e227397380c08dbe Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 25 May 2013 13:39:15 +0000 Subject: [PATCH 13/50] Rebuilt for --- mjpegtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index 8a09e59..a507abd 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -1,6 +1,6 @@ Name: mjpegtools Version: 2.0.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Tools to manipulate MPEG data Group: Applications/Multimedia License: GPLv2 @@ -183,6 +183,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/mpegtranscode %changelog +* Sat May 25 2013 Nicolas Chauvet - 2.0.0-7 +- Rebuilt for x264/FFmpeg + * Sun Mar 03 2013 Nicolas Chauvet - 2.0.0-6 - Mass rebuilt for Fedora 19 Features From ac7e09fe4ff14c787104071fc037ba0b9eaf9550 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 30 Sep 2013 02:34:30 +0000 Subject: [PATCH 14/50] =?UTF-8?q?*=20Mon=20Sep=2030=202013=20S=C3=A9rgio?= =?UTF-8?q?=20Basto=20=20-=202.0.0-8=20-=20Rebuilt=20fo?= =?UTF-8?q?r=20x264/FFmpeg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mjpegtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index a507abd..9dff44c 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -1,6 +1,6 @@ Name: mjpegtools Version: 2.0.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Tools to manipulate MPEG data Group: Applications/Multimedia License: GPLv2 @@ -183,6 +183,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/mpegtranscode %changelog +* Mon Sep 30 2013 Sérgio Basto - 2.0.0-8 +- Rebuilt for x264/FFmpeg + * Sat May 25 2013 Nicolas Chauvet - 2.0.0-7 - Rebuilt for x264/FFmpeg From c91bba9af27552bfc1ad9cd0d2f923885eabbdab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 6 Nov 2013 15:06:03 +0000 Subject: [PATCH 15/50] =?UTF-8?q?*=20Wed=20Nov=2006=202013=20S=C3=A9rgio?= =?UTF-8?q?=20Basto=20=20-=202.0.0-9=20-=20Rebuilt=20fo?= =?UTF-8?q?r=20x264/FFmpeg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mjpegtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index 9dff44c..a976930 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -1,6 +1,6 @@ Name: mjpegtools Version: 2.0.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Tools to manipulate MPEG data Group: Applications/Multimedia License: GPLv2 @@ -183,6 +183,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/mpegtranscode %changelog +* Wed Nov 06 2013 Sérgio Basto - 2.0.0-9 +- Rebuilt for x264/FFmpeg + * Mon Sep 30 2013 Sérgio Basto - 2.0.0-8 - Rebuilt for x264/FFmpeg From 69f7afb3cf2bb68278757e538edf3346d71742d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Fri, 8 Nov 2013 02:26:27 +0000 Subject: [PATCH 16/50] =?UTF-8?q?*=20Thu=20Nov=2007=202013=20S=C3=A9rgio?= =?UTF-8?q?=20Basto=20=20-=202.1.0-1=20-=20Update=20to?= =?UTF-8?q?=202.1.0=20-=20Drop=20upstreamed=20patches.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- mjpegtools-2.0.0-no-config-in-public-header.h | 11 ----------- mjpegtools.spec | 12 ++++++------ mjpegtools_gcc470.patch | 11 ----------- sources | 2 +- 5 files changed, 8 insertions(+), 30 deletions(-) delete mode 100644 mjpegtools-2.0.0-no-config-in-public-header.h delete mode 100644 mjpegtools_gcc470.patch diff --git a/.gitignore b/.gitignore index a750a96..163eb25 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -mjpegtools-2.0.0.tar.gz +mjpegtools-2.1.0.tar.gz diff --git a/mjpegtools-2.0.0-no-config-in-public-header.h b/mjpegtools-2.0.0-no-config-in-public-header.h deleted file mode 100644 index 2043f31..0000000 --- a/mjpegtools-2.0.0-no-config-in-public-header.h +++ /dev/null @@ -1,11 +0,0 @@ -diff -up mjpegtools-2.0.0/mplex/stream_params.hpp~ mjpegtools-2.0.0/mplex/stream_params.hpp ---- mjpegtools-2.0.0/mplex/stream_params.hpp~ 2010-03-13 14:05:07.000000000 +0100 -+++ mjpegtools-2.0.0/mplex/stream_params.hpp 2011-08-02 23:34:12.126843444 +0200 -@@ -23,7 +23,6 @@ - #ifndef __STREAM_PARAMS_HH__ - #define __STREAM_PARAMS_HH__ - --#include - #include - class LpcmParams - { diff --git a/mjpegtools.spec b/mjpegtools.spec index a976930..7e6c246 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -1,13 +1,11 @@ Name: mjpegtools -Version: 2.0.0 -Release: 9%{?dist} +Version: 2.1.0 +Release: 1%{?dist} Summary: Tools to manipulate MPEG data Group: Applications/Multimedia License: GPLv2 URL: http://mjpeg.sourceforge.net/ Source0: http://downloads.sourceforge.net/mjpeg/%{name}-%{version}.tar.gz -Patch0: mjpegtools-2.0.0-no-config-in-public-header.h -Patch1: mjpegtools_gcc470.patch BuildRequires: libjpeg-devel BuildRequires: nasm BuildRequires: libdv-devel @@ -96,8 +94,6 @@ for building applications that use mjpegtools lavpipe libraries. %prep %setup -q -%patch0 -p1 -%patch1 -p1 sed -i -e 's/ARCHFLAGS=.*/ARCHFLAGS=/' configure* sed -i -e 's|/lib /usr/lib|/%{_lib} %{_libdir}|' configure # lib64 rpaths for f in docs/yuvfps.1 ; do @@ -183,6 +179,10 @@ rm $RPM_BUILD_ROOT%{_bindir}/mpegtranscode %changelog +* Thu Nov 07 2013 Sérgio Basto - 2.1.0-1 +- Update to 2.1.0 +- Drop upstreamed patches. + * Wed Nov 06 2013 Sérgio Basto - 2.0.0-9 - Rebuilt for x264/FFmpeg diff --git a/mjpegtools_gcc470.patch b/mjpegtools_gcc470.patch deleted file mode 100644 index 050b33f..0000000 --- a/mjpegtools_gcc470.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/y4mdenoise/MotionSearcher.hh -+++ b/y4mdenoise/MotionSearcher.hh -@@ -2196,7 +2196,7 @@ - { - // This region is too small to be bothered with. - // Just get rid of it. -- DeleteRegion (a_pRegion); -+ this->DeleteRegion (a_pRegion); - } - else - { diff --git a/sources b/sources index 80e9c7f..d7256b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -903e1e3b967eebcc5fe5626d7517dc46 mjpegtools-2.0.0.tar.gz +57bf5dd78976ca9bac972a6511b236f3 mjpegtools-2.1.0.tar.gz From 7c8e6ba562db20caed8b7b93da7e04272c71700c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 19 Nov 2013 21:47:09 +0000 Subject: [PATCH 17/50] =?UTF-8?q?*=20Tue=20Nov=2019=202013=20S=C3=A9rgio?= =?UTF-8?q?=20Basto=20=20-=202.1.0-2=20-=20Fix=20rfbz?= =?UTF-8?q?=20#3022,=20Obsoletes:=20y4mscaler,=20because=20already=20integ?= =?UTF-8?q?rate=20into=20=20=20mjpegtools-2.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mjpegtools.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index 7e6c246..da999d1 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -1,6 +1,6 @@ Name: mjpegtools Version: 2.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tools to manipulate MPEG data Group: Applications/Multimedia License: GPLv2 @@ -20,7 +20,7 @@ Requires: %{name}-lav = %{version}-%{release} Requires: mencoder # ffmpeg main package, y4mscaler and which for anytovcd.sh Requires: ffmpeg -Requires: y4mscaler +Obsoletes: y4mscaler Requires: which Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -179,6 +179,10 @@ rm $RPM_BUILD_ROOT%{_bindir}/mpegtranscode %changelog +* Tue Nov 19 2013 Sérgio Basto - 2.1.0-2 +- Fix rfbz #3022, Obsoletes: y4mscaler, because already integrate into + mjpegtools-2.1.0 + * Thu Nov 07 2013 Sérgio Basto - 2.1.0-1 - Update to 2.1.0 - Drop upstreamed patches. From 939100af45eb13ac12030bafab7e3ec8c9c3d9a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 19 Nov 2013 23:43:39 +0000 Subject: [PATCH 18/50] =?UTF-8?q?*=20Tue=20Nov=2019=202013=20S=C3=A9rgio?= =?UTF-8?q?=20Basto=20=20-=202.1.0-3=20-=20Better=20obs?= =?UTF-8?q?oletes/provides=20for=20y4mscaler.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mjpegtools.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index da999d1..e039161 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -1,6 +1,6 @@ Name: mjpegtools Version: 2.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tools to manipulate MPEG data Group: Applications/Multimedia License: GPLv2 @@ -20,7 +20,9 @@ Requires: %{name}-lav = %{version}-%{release} Requires: mencoder # ffmpeg main package, y4mscaler and which for anytovcd.sh Requires: ffmpeg -Obsoletes: y4mscaler +Provides: y4mscaler = 9.0-14 +# Could be dropped on Fedora 22 +Obsoletes: y4mscaler < 9.0-14 Requires: which Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -179,6 +181,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/mpegtranscode %changelog +* Tue Nov 19 2013 Sérgio Basto - 2.1.0-3 +- Better obsoletes/provides for y4mscaler. + * Tue Nov 19 2013 Sérgio Basto - 2.1.0-2 - Fix rfbz #3022, Obsoletes: y4mscaler, because already integrate into mjpegtools-2.1.0 From 8dd0e3eb23fb74f392fc39b09a1cd72538f0f1ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sat, 26 Jul 2014 17:42:24 +0000 Subject: [PATCH 19/50] =?UTF-8?q?*=20Sat=20Jul=2026=202014=20S=C3=A9rgio?= =?UTF-8?q?=20Basto=20=20-=202.1.0-4=20-=20Rebuild=20fo?= =?UTF-8?q?r=20new=20libSDL=5Fgfx,=20need=20by=20mjpegtools-gui?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mjpegtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index e039161..9c5ccf0 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -1,6 +1,6 @@ Name: mjpegtools Version: 2.1.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tools to manipulate MPEG data Group: Applications/Multimedia License: GPLv2 @@ -181,6 +181,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/mpegtranscode %changelog +* Sat Jul 26 2014 Sérgio Basto - 2.1.0-4 +- Rebuild for new libSDL_gfx, need by mjpegtools-gui + * Tue Nov 19 2013 Sérgio Basto - 2.1.0-3 - Better obsoletes/provides for y4mscaler. From 836dd8e587b3f1cc83ad14e9aebbd5c45404f7cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 27 Jul 2014 18:54:37 +0000 Subject: [PATCH 20/50] =?UTF-8?q?*=20Sat=20Jul=2026=202014=20S=C3=A9rgio?= =?UTF-8?q?=20Basto=20=20-=202.1.0-4=20-=20Rebuild=20fo?= =?UTF-8?q?r=20new=20libSDL=5Fgfx,=20need=20by=20mjpegtools-gui=20-=20Fix?= =?UTF-8?q?=20FTBFS=20for=20errors=20"format=20not=20a=20string=20literal?= =?UTF-8?q?=20and=20no=20format=20arguments"=20because=20=20=20=20=20FESCO?= =?UTF-8?q?=20decided=20Enable=20"-Werror=3Dformat-security"=20by=20defaul?= =?UTF-8?q?t=20=20=20=20=20https://fedorahosted.org/fesco/ticket/1185=20-?= =?UTF-8?q?=20Bring=20and=20add=20two=20patches=20from=20Gentoo:=20mjpegto?= =?UTF-8?q?ols-2.1.0-pic.patch=20and=20mjpegtools-2.1.0-sdl-cflags.patch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mjpegtools-2.1.0-no_format.patch | 70 +++++++++++++++++++++++++++++++ mjpegtools-2.1.0-pic.patch | 69 ++++++++++++++++++++++++++++++ mjpegtools-2.1.0-sdl-cflags.patch | 11 +++++ mjpegtools.spec | 12 ++++++ 4 files changed, 162 insertions(+) create mode 100644 mjpegtools-2.1.0-no_format.patch create mode 100644 mjpegtools-2.1.0-pic.patch create mode 100644 mjpegtools-2.1.0-sdl-cflags.patch diff --git a/mjpegtools-2.1.0-no_format.patch b/mjpegtools-2.1.0-no_format.patch new file mode 100644 index 0000000..20ed996 --- /dev/null +++ b/mjpegtools-2.1.0-no_format.patch @@ -0,0 +1,70 @@ +--- ./lavtools/lav_io.c.orig 2014-07-27 17:48:21.474622974 +0100 ++++ ./lavtools/lav_io.c 2014-07-27 17:48:48.838881166 +0100 +@@ -926,7 +926,7 @@ lav_file_t *lav_open_input_file(char *fi + strcat(errmsg, ", quicktime"); + #endif + strcat(errmsg, ").\n"); +- fprintf(stderr, errmsg); ++ fprintf(stderr, "%s", errmsg); + free(lav_fd); + internal_error = ERROR_FORMAT; /* Format not recognized */ + return 0; +--- ./lavtools/lavtrans.c.orig 2014-07-27 17:58:09.410282056 +0100 ++++ ./lavtools/lavtrans.c 2014-07-27 17:59:24.769016140 +0100 +@@ -275,7 +275,7 @@ int main(int argc, char ** argv) + if (process_image_frame != -1) + { + nv = el_get_video_frame(vbuff, process_image_frame, &el); +- sprintf(imgfname,outfile); ++ sprintf(imgfname, "%s", outfile); + imgfd = fopen(imgfname,"wb"); + if (imgfd==0) system_error("opening image file","fopen"); + res = fwrite(vbuff,nv,1,imgfd); +--- ./lavtools/jpeg2yuv.c.orig 2014-07-27 18:00:55.600900476 +0100 ++++ ./lavtools/jpeg2yuv.c 2014-07-27 18:01:36.848301893 +0100 +@@ -451,7 +451,7 @@ static int generate_YUV4MPEG(parameters_ + + if (firstjpeg) { + p = firstjpeg; +- sprintf(jpegname, firstjpeg); ++ sprintf(jpegname, "%s", firstjpeg); + firstjpeg = NULL; + } + else { +--- ./mplex/main.cpp.orig 2014-07-27 18:11:38.282143657 +0100 ++++ ./mplex/main.cpp 2014-07-27 18:06:40.352252415 +0100 +@@ -614,7 +614,7 @@ bool CmdLineMultiplexJob::ParseWorkaroun + if( flag_table[flag].longname != 0 ) + message += sep; + } +- mjpeg_error( message.c_str() ); ++ mjpeg_error( "%s", message.c_str() ); + return false; + } + +--- ./yuvfilters/yuvkineco.c.orig 2014-07-27 18:15:01.476097522 +0100 ++++ ./yuvfilters/yuvkineco.c 2014-07-27 18:15:29.540366245 +0100 +@@ -48,7 +48,7 @@ buf_debug(char *buf, FILE *fp, const cha + } else { + #ifdef MJPEGTOOLS + buf[n] = '\0'; +- mjpeg_debug(buf); ++ mjpeg_debug("%s", buf); + #else + fputs(buf, stderr); + #endif +--- ./yuvfilters/yuvfilters.h.orig 2014-07-27 18:37:02.712645244 +0100 ++++ ./yuvfilters/yuvfilters.h 2014-07-27 19:13:28.156101800 +0100 +@@ -34,9 +34,9 @@ extern "C" { + + #ifdef MJPEGTOOLS + # define perror(MSG) mjpeg_error("%s: %s", MSG, strerror(errno)) +-# define WERROR(MSG) mjpeg_error(MSG) +-# define WERRORL(MSG) mjpeg_error(MSG) +-# define WWARN(MSG) mjpeg_warn(MSG) ++# define WERROR(MSG) mjpeg_error("%s", MSG) ++# define WERRORL(MSG) mjpeg_error("%s", MSG) ++# define WWARN(MSG) mjpeg_warn("%s", MSG) + #else + # define WERROR(MSG) write(2, MSG "\n", sizeof MSG) + # define WERRORL(MSG) do { write(2, MSG, strlen(MSG)); write(2, "\n", 1); } while (0) diff --git a/mjpegtools-2.1.0-pic.patch b/mjpegtools-2.1.0-pic.patch new file mode 100644 index 0000000..7d0d1b6 --- /dev/null +++ b/mjpegtools-2.1.0-pic.patch @@ -0,0 +1,69 @@ +Index: y4mdenoise/Makefile.am +=================================================================== +RCS file: /cvsroot/mjpeg/mjpeg_play/y4mdenoise/Makefile.am,v +retrieving revision 1.12 +retrieving revision 1.13 +diff -u -r1.12 -r1.13 +--- y4mdenoise/Makefile.am 1 Apr 2012 08:44:49 -0000 1.12 ++++ y4mdenoise/Makefile.am 28 Nov 2013 22:39:41 -0000 1.13 +@@ -4,8 +4,8 @@ + + EXTRA_DIST = implementation.html + +-AM_CFLAGS = -DNDEBUG -finline-functions @PROGRAM_NOPIC@ +-AM_CXXFLAGS = -DNDEBUG -finline-functions @PROGRAM_NOPIC@ ++AM_CFLAGS = -DNDEBUG -finline-functions ++AM_CXXFLAGS = -DNDEBUG -finline-functions + + INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/utils + +Index: y4munsharp/Makefile.am +=================================================================== +RCS file: /cvsroot/mjpeg/mjpeg_play/y4munsharp/Makefile.am,v +retrieving revision 1.2 +retrieving revision 1.3 +diff -u -r1.2 -r1.3 +--- y4munsharp/Makefile.am 16 Jun 2005 17:09:38 -0000 1.2 ++++ y4munsharp/Makefile.am 28 Nov 2013 22:39:41 -0000 1.3 +@@ -4,7 +4,7 @@ + + INCLUDES = -I $(top_srcdir)/utils -I $(top_srcdir) + +-y4munharp_CFLAGS=@PROGRAM_NOPIC@ ++y4munharp_CFLAGS= + + bin_PROGRAMS = y4munsharp + +Index: y4mutils/Makefile.am +=================================================================== +RCS file: /cvsroot/mjpeg/mjpeg_play/y4mutils/Makefile.am,v +retrieving revision 1.7 +retrieving revision 1.8 +diff -u -r1.7 -r1.8 +--- y4mutils/Makefile.am 1 Apr 2012 08:44:49 -0000 1.7 ++++ y4mutils/Makefile.am 28 Nov 2013 22:39:41 -0000 1.8 +@@ -2,7 +2,7 @@ + + MAINTAINERCLEANFILES = Makefile.in + +-AM_CFLAGS = @PROGRAM_NOPIC@ ++AM_CFLAGS = + AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/utils + + LIBMJPEGUTILS = $(top_builddir)/utils/libmjpegutils.la +Index: yuvscaler/Makefile.am +=================================================================== +RCS file: /cvsroot/mjpeg/mjpeg_play/yuvscaler/Makefile.am,v +retrieving revision 1.5 +retrieving revision 1.6 +diff -u -r1.5 -r1.6 +--- yuvscaler/Makefile.am 1 Apr 2012 08:44:49 -0000 1.5 ++++ yuvscaler/Makefile.am 28 Nov 2013 22:39:41 -0000 1.6 +@@ -18,6 +18,6 @@ + + EXTRA_DIST = yuvscaler_implementation.txt + +-yuvscaler_CFLAGS=@PROGRAM_NOPIC@ ++yuvscaler_CFLAGS= + yuvscaler_SOURCES = yuvscaler.c yuvscaler_resample.c yuvscaler_bicubic.c + yuvscaler_LDADD = $(LIBMJPEGUTILS) $(LIBM_LIBS) diff --git a/mjpegtools-2.1.0-sdl-cflags.patch b/mjpegtools-2.1.0-sdl-cflags.patch new file mode 100644 index 0000000..3bb7563 --- /dev/null +++ b/mjpegtools-2.1.0-sdl-cflags.patch @@ -0,0 +1,11 @@ +diff a/y4mutils/Makefile.am b/y4mutils/Makefile.am +--- a/y4mutils/Makefile.am ++++ b/y4mutils/Makefile.am +@@ -44,6 +44,7 @@ y4mspatialfilter_LDADD = $(LIBMJPEGUTILS) $(LIBM_LIBS) + + y4mhist_SOURCES = y4mhist.c + y4mhist_LDADD = $(SDL_LIBS) $(SDLgfx_LIBS) $(LIBMJPEGUTILS) ++y4mhist_CPPFLAGS = $(AM_CPPFLAGS) $(SDL_CFLAGS) + + y4mblack_SOURCES = y4mblack.c + y4mblack_LDADD = $(LIBMJPEGUTILS) diff --git a/mjpegtools.spec b/mjpegtools.spec index 9c5ccf0..7a70401 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -6,6 +6,10 @@ Group: Applications/Multimedia License: GPLv2 URL: http://mjpeg.sourceforge.net/ Source0: http://downloads.sourceforge.net/mjpeg/%{name}-%{version}.tar.gz +Patch0: mjpegtools-2.1.0-sdl-cflags.patch +Patch1: mjpegtools-2.1.0-no_format.patch +Patch2: mjpegtools-2.1.0-pic.patch + BuildRequires: libjpeg-devel BuildRequires: nasm BuildRequires: libdv-devel @@ -96,6 +100,10 @@ for building applications that use mjpegtools lavpipe libraries. %prep %setup -q +%patch0 -p1 -b .sdl +%patch1 -p1 -b .format +%patch2 -p0 -b .fpic + sed -i -e 's/ARCHFLAGS=.*/ARCHFLAGS=/' configure* sed -i -e 's|/lib /usr/lib|/%{_lib} %{_libdir}|' configure # lib64 rpaths for f in docs/yuvfps.1 ; do @@ -183,6 +191,10 @@ rm $RPM_BUILD_ROOT%{_bindir}/mpegtranscode %changelog * Sat Jul 26 2014 Sérgio Basto - 2.1.0-4 - Rebuild for new libSDL_gfx, need by mjpegtools-gui +- Fix FTBFS for errors "format not a string literal and no format arguments" because + FESCO decided Enable "-Werror=format-security" by default + https://fedorahosted.org/fesco/ticket/1185 +- Bring and add two patches from Gentoo: mjpegtools-2.1.0-pic.patch and mjpegtools-2.1.0-sdl-cflags.patch * Tue Nov 19 2013 Sérgio Basto - 2.1.0-3 - Better obsoletes/provides for y4mscaler. From 0bd954ee1d4d809c8c908ddc13f43c9ac205d1fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 19 Oct 2014 21:46:08 +0000 Subject: [PATCH 21/50] Rebuilt for FFmpeg 2.4.3 --- mjpegtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index 7a70401..73ee9c7 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -1,6 +1,6 @@ Name: mjpegtools Version: 2.1.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tools to manipulate MPEG data Group: Applications/Multimedia License: GPLv2 @@ -189,6 +189,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/mpegtranscode %changelog +* Sun Oct 19 2014 Sérgio Basto - 2.1.0-5 +- Rebuilt for FFmpeg 2.4.3 + * Sat Jul 26 2014 Sérgio Basto - 2.1.0-4 - Rebuild for new libSDL_gfx, need by mjpegtools-gui - Fix FTBFS for errors "format not a string literal and no format arguments" because From 0399ef9f45b6f13ea797345430d48133527fc8c4 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 20 Mar 2017 14:01:14 +0100 Subject: [PATCH 22/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- mjpegtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index 73ee9c7..d2074fc 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -1,6 +1,6 @@ Name: mjpegtools Version: 2.1.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Tools to manipulate MPEG data Group: Applications/Multimedia License: GPLv2 @@ -189,6 +189,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/mpegtranscode %changelog +* Mon Mar 20 2017 RPM Fusion Release Engineering - 2.1.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Sun Oct 19 2014 Sérgio Basto - 2.1.0-5 - Rebuilt for FFmpeg 2.4.3 From d425d3a08682dc2f0806a361a61bf6693015d0cd Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 31 Aug 2017 16:30:40 +0200 Subject: [PATCH 23/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- mjpegtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index d2074fc..574280f 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -1,6 +1,6 @@ Name: mjpegtools Version: 2.1.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Tools to manipulate MPEG data Group: Applications/Multimedia License: GPLv2 @@ -189,6 +189,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/mpegtranscode %changelog +* Thu Aug 31 2017 RPM Fusion Release Engineering - 2.1.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Mon Mar 20 2017 RPM Fusion Release Engineering - 2.1.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 365e1e109211ea96bd07473c9097ecde2febdc6c Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Thu, 25 Jan 2018 11:17:43 +0000 Subject: [PATCH 24/50] Build without libquicktime for F28 --- mjpegtools.spec | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index 574280f..b0ed192 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -1,6 +1,6 @@ Name: mjpegtools Version: 2.1.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Tools to manipulate MPEG data Group: Applications/Multimedia License: GPLv2 @@ -15,7 +15,10 @@ BuildRequires: nasm BuildRequires: libdv-devel BuildRequires: SDL-devel >= 1.1.3 BuildRequires: SDL_gfx-devel +# libquicktime is FTBFS in F28 +%if 0%{?fedora} <= 27 BuildRequires: libquicktime-devel >= 0.9.8 +%endif BuildRequires: libpng-devel BuildRequires: gtk2-devel >= 2.4.0 Requires: %{name}-libs = %{version}-%{release} @@ -113,11 +116,11 @@ done %build %configure --disable-dependency-tracking --disable-static -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=$RPM_BUILD_ROOT +%make_install rm -f $RPM_BUILD_ROOT{%{_infodir}/dir,%{_libdir}/lib*.la} # too broken/outdated to be useful in 1.[89].0 (and would come with dep chain) rm $RPM_BUILD_ROOT%{_bindir}/mpegtranscode @@ -140,7 +143,6 @@ rm $RPM_BUILD_ROOT%{_bindir}/mpegtranscode %files -%defattr(-,root,root,-) %doc CHANGES ChangeLog AUTHORS BUGS README.lavpipe NEWS TODO %{_bindir}/* %exclude %{_bindir}/glav @@ -154,7 +156,6 @@ rm $RPM_BUILD_ROOT%{_bindir}/mpegtranscode %{_infodir}/mjpeg-howto.info* %files gui -%defattr(-,root,root,-) %doc README.glav %{_bindir}/glav # lavplay and yuvplay won't save console util users from X11 and SDL @@ -167,28 +168,27 @@ rm $RPM_BUILD_ROOT%{_bindir}/mpegtranscode %{_mandir}/man1/yuvplay.1* %files libs -%defattr(-,root,root,-) -%doc COPYING +%license COPYING %{_libdir}/libm*.so.* %files lav -%defattr(-,root,root,-) %{_libdir}/liblav*.so.* %files devel -%defattr(-,root,root,-) %{_includedir}/%{name} %exclude %{_includedir}/%{name}/*lav*.h %{_libdir}/libm*.so %{_libdir}/pkgconfig/%{name}.pc %files lav-devel -%defattr(-,root,root,-) %{_includedir}/%{name}/*lav*.h %{_libdir}/liblav*.so %changelog +* Thu Jan 25 2018 Leigh Scott - 2.1.0-8 +- Build without libquicktime for F28 + * Thu Aug 31 2017 RPM Fusion Release Engineering - 2.1.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 90fe88486024bdfe36c85962f1809aaa720717c3 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Thu, 25 Jan 2018 13:56:04 +0000 Subject: [PATCH 25/50] Disable AltiVec for ppc64 --- mjpegtools.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index b0ed192..6a61dce 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -115,7 +115,12 @@ done %build -%configure --disable-dependency-tracking --disable-static +%configure LIBS="-lpthread" \ + --disable-dependency-tracking \ +%ifarch ppc64 + --enable-simd-accel=no \ +%endif + --disable-static %make_build @@ -188,6 +193,7 @@ rm $RPM_BUILD_ROOT%{_bindir}/mpegtranscode %changelog * Thu Jan 25 2018 Leigh Scott - 2.1.0-8 - Build without libquicktime for F28 +- Disable AltiVec for ppc64 * Thu Aug 31 2017 RPM Fusion Release Engineering - 2.1.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 3897ba3f2e93dc835c36cc58b0aa277cf3a1656c Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Thu, 1 Mar 2018 09:16:01 +0000 Subject: [PATCH 26/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: leigh123linux --- mjpegtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index 6a61dce..b3e8035 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -1,6 +1,6 @@ Name: mjpegtools Version: 2.1.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Tools to manipulate MPEG data Group: Applications/Multimedia License: GPLv2 @@ -191,6 +191,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/mpegtranscode %changelog +* Thu Mar 01 2018 RPM Fusion Release Engineering - 2.1.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Jan 25 2018 Leigh Scott - 2.1.0-8 - Build without libquicktime for F28 - Disable AltiVec for ppc64 From a38e72989f39ca649231e07e560f68e4e2080ba9 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 27 Jul 2018 04:43:58 +0100 Subject: [PATCH 27/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: leigh123linux --- mjpegtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index b3e8035..0db09bc 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -1,6 +1,6 @@ Name: mjpegtools Version: 2.1.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Tools to manipulate MPEG data Group: Applications/Multimedia License: GPLv2 @@ -191,6 +191,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/mpegtranscode %changelog +* Fri Jul 27 2018 RPM Fusion Release Engineering - 2.1.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Mar 01 2018 RPM Fusion Release Engineering - 2.1.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 70a9a7f8a663270fe04d4e5cb410e3341955033c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Fri, 12 Oct 2018 02:05:55 +0100 Subject: [PATCH 28/50] Build with libquicktime again --- mjpegtools.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index 0db09bc..dba0af8 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -1,6 +1,6 @@ Name: mjpegtools Version: 2.1.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Tools to manipulate MPEG data Group: Applications/Multimedia License: GPLv2 @@ -15,10 +15,7 @@ BuildRequires: nasm BuildRequires: libdv-devel BuildRequires: SDL-devel >= 1.1.3 BuildRequires: SDL_gfx-devel -# libquicktime is FTBFS in F28 -%if 0%{?fedora} <= 27 BuildRequires: libquicktime-devel >= 0.9.8 -%endif BuildRequires: libpng-devel BuildRequires: gtk2-devel >= 2.4.0 Requires: %{name}-libs = %{version}-%{release} @@ -191,6 +188,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/mpegtranscode %changelog +* Fri Oct 12 2018 Sérgio Basto - 2.1.0-11 +- Build with libquicktime again + * Fri Jul 27 2018 RPM Fusion Release Engineering - 2.1.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 967ca94de2a69136aa1d3390457d2a258d436bfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Fri, 12 Oct 2018 02:41:35 +0100 Subject: [PATCH 29/50] Add BuildRequires: gcc-c++ --- mjpegtools.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index dba0af8..f6faa01 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -1,6 +1,6 @@ Name: mjpegtools Version: 2.1.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Tools to manipulate MPEG data Group: Applications/Multimedia License: GPLv2 @@ -10,6 +10,7 @@ Patch0: mjpegtools-2.1.0-sdl-cflags.patch Patch1: mjpegtools-2.1.0-no_format.patch Patch2: mjpegtools-2.1.0-pic.patch +BuildRequires: gcc-c++ BuildRequires: libjpeg-devel BuildRequires: nasm BuildRequires: libdv-devel @@ -188,6 +189,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/mpegtranscode %changelog +* Fri Oct 12 2018 Sérgio Basto - 2.1.0-12 +- Add BuildRequires: gcc-c++ + * Fri Oct 12 2018 Sérgio Basto - 2.1.0-11 - Build with libquicktime again From 508168e74a1cf5180b44819b6ff4ea461dc0b064 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 12 Oct 2018 10:24:25 +0100 Subject: [PATCH 30/50] Remove Group tag --- mjpegtools.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index f6faa01..fe9ca9c 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -2,7 +2,6 @@ Name: mjpegtools Version: 2.1.0 Release: 12%{?dist} Summary: Tools to manipulate MPEG data -Group: Applications/Multimedia License: GPLv2 URL: http://mjpeg.sourceforge.net/ Source0: http://downloads.sourceforge.net/mjpeg/%{name}-%{version}.tar.gz @@ -41,7 +40,6 @@ utilities. %package gui Summary: GUI tools to manipulate MPEG data -Group: Applications/Multimedia Requires: %{name} = %{version}-%{release} %description gui @@ -53,7 +51,6 @@ utilities. %package libs Summary: MJPEGtools libraries -Group: System Environment/Libraries %description libs The mjpeg programs are a set of tools that can do recording of videos @@ -64,7 +61,6 @@ used by mjpegtools and also by several other projects. %package lav Summary: MJPEGtools lavpipe libraries -Group: System Environment/Libraries Requires: %{name}-libs = %{version}-%{release} %description lav @@ -76,7 +72,6 @@ mjpegtools. %package devel Summary: Development files for mjpegtools libraries -Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} %description devel @@ -88,7 +83,6 @@ for building applications that use mjpegtools libraries. %package lav-devel Summary: Development files for mjpegtools lavpipe libraries -Group: Development/Libraries Requires: %{name}-lav = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} From 11664d19544a0669a222615d5b897964f267eb56 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 12 Oct 2018 10:28:17 +0100 Subject: [PATCH 31/50] Add missing isa on Requires --- mjpegtools.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index fe9ca9c..4c2a962 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -18,8 +18,8 @@ BuildRequires: SDL_gfx-devel BuildRequires: libquicktime-devel >= 0.9.8 BuildRequires: libpng-devel BuildRequires: gtk2-devel >= 2.4.0 -Requires: %{name}-libs = %{version}-%{release} -Requires: %{name}-lav = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-lav%{?_isa} = %{version}-%{release} # mencoder for lav2avi.sh Requires: mencoder # ffmpeg main package, y4mscaler and which for anytovcd.sh @@ -40,7 +40,7 @@ utilities. %package gui Summary: GUI tools to manipulate MPEG data -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description gui The mjpeg programs are a set of tools that can do recording of videos @@ -61,7 +61,7 @@ used by mjpegtools and also by several other projects. %package lav Summary: MJPEGtools lavpipe libraries -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description lav The mjpeg programs are a set of tools that can do recording of videos @@ -72,7 +72,7 @@ mjpegtools. %package devel Summary: Development files for mjpegtools libraries -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description devel The mjpeg programs are a set of tools that can do recording of videos @@ -83,8 +83,8 @@ for building applications that use mjpegtools libraries. %package lav-devel Summary: Development files for mjpegtools lavpipe libraries -Requires: %{name}-lav = %{version}-%{release} -Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-lav%{?_isa} = %{version}-%{release} +Requires: %{name}-devel%{?_isa} = %{version}-%{release} %description lav-devel The mjpeg programs are a set of tools that can do recording of videos From d0e14198b562d6cfc96d94b809863578094ef945 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 12 Oct 2018 10:33:59 +0100 Subject: [PATCH 32/50] Update scriptlets and buildroot macro --- mjpegtools.spec | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index 4c2a962..ff0d30c 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -118,9 +118,9 @@ done %install %make_install -rm -f $RPM_BUILD_ROOT{%{_infodir}/dir,%{_libdir}/lib*.la} +rm -f %buildroot{%{_infodir}/dir,%{_libdir}/lib*.la} # too broken/outdated to be useful in 1.[89].0 (and would come with dep chain) -rm $RPM_BUILD_ROOT%{_bindir}/mpegtranscode +rm %buildroot%{_bindir}/mpegtranscode %post @@ -130,13 +130,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/mpegtranscode [ $1 -eq 0 ] && \ /sbin/install-info --delete %{_infodir}/mjpeg-howto.info %{_infodir}/dir || : -%post libs -p /sbin/ldconfig +%ldconfig_scriptlets libs -%postun libs -p /sbin/ldconfig - -%post lav -p /sbin/ldconfig - -%postun lav -p /sbin/ldconfig +%ldconfig_scriptlets lav %files From 47a07bc3e020f41498a4e12d1aa386e7f1d469d4 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 12 Oct 2018 10:38:48 +0100 Subject: [PATCH 33/50] Update changelog --- mjpegtools.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index ff0d30c..15e55ae 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -1,6 +1,6 @@ Name: mjpegtools Version: 2.1.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Tools to manipulate MPEG data License: GPLv2 URL: http://mjpeg.sourceforge.net/ @@ -179,6 +179,11 @@ rm %buildroot%{_bindir}/mpegtranscode %changelog +* Fri Oct 12 2018 Leigh Scott - 2.1.0-13 +- Remove Group tag +- Add missing isa on Requires +- Update scriptlets and buildroot macro + * Fri Oct 12 2018 Sérgio Basto - 2.1.0-12 - Add BuildRequires: gcc-c++ From 302de0359e76900d2de508b0078993e26933d7a5 Mon Sep 17 00:00:00 2001 From: sagitter Date: Thu, 6 Dec 2018 16:27:37 +0100 Subject: [PATCH 34/50] Rebuild for ffmpeg-3.* on el7 --- mjpegtools.spec | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index 15e55ae..c5f0b40 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -1,6 +1,6 @@ Name: mjpegtools Version: 2.1.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Tools to manipulate MPEG data License: GPLv2 URL: http://mjpeg.sourceforge.net/ @@ -9,7 +9,8 @@ Patch0: mjpegtools-2.1.0-sdl-cflags.patch Patch1: mjpegtools-2.1.0-no_format.patch Patch2: mjpegtools-2.1.0-pic.patch -BuildRequires: gcc-c++ +BuildRequires: gcc-c++, gcc +%{?el7:BuildRequires: epel-rpm-macros} BuildRequires: libjpeg-devel BuildRequires: nasm BuildRequires: libdv-devel @@ -21,15 +22,13 @@ BuildRequires: gtk2-devel >= 2.4.0 Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}-lav%{?_isa} = %{version}-%{release} # mencoder for lav2avi.sh -Requires: mencoder +Requires: mencoder%{?_isa} # ffmpeg main package, y4mscaler and which for anytovcd.sh -Requires: ffmpeg +Requires: ffmpeg%{?_isa} Provides: y4mscaler = 9.0-14 # Could be dropped on Fedora 22 Obsoletes: y4mscaler < 9.0-14 Requires: which -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info %description The mjpeg programs are a set of tools that can do recording of videos @@ -94,10 +93,7 @@ for building applications that use mjpegtools lavpipe libraries. %prep -%setup -q -%patch0 -p1 -b .sdl -%patch1 -p1 -b .format -%patch2 -p0 -b .fpic +%autosetup -p1 sed -i -e 's/ARCHFLAGS=.*/ARCHFLAGS=/' configure* sed -i -e 's|/lib /usr/lib|/%{_lib} %{_libdir}|' configure # lib64 rpaths @@ -122,14 +118,6 @@ rm -f %buildroot{%{_infodir}/dir,%{_libdir}/lib*.la} # too broken/outdated to be useful in 1.[89].0 (and would come with dep chain) rm %buildroot%{_bindir}/mpegtranscode - -%post -/sbin/install-info %{_infodir}/mjpeg-howto.info %{_infodir}/dir || : - -%preun -[ $1 -eq 0 ] && \ -/sbin/install-info --delete %{_infodir}/mjpeg-howto.info %{_infodir}/dir || : - %ldconfig_scriptlets libs %ldconfig_scriptlets lav @@ -179,6 +167,10 @@ rm %buildroot%{_bindir}/mpegtranscode %changelog +* Mon Nov 12 2018 Antonio Trande - 2.1.0-14 +- Rebuild for ffmpeg-3.4.5 on el7 +- infodir scriptlets deprecated + * Fri Oct 12 2018 Leigh Scott - 2.1.0-13 - Remove Group tag - Add missing isa on Requires From 1cffb576e936d862ada5f876f87bddf4769fa29b Mon Sep 17 00:00:00 2001 From: sagitter Date: Thu, 6 Dec 2018 16:38:11 +0100 Subject: [PATCH 35/50] Fix Patch2 --- mjpegtools-2.1.0-pic.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mjpegtools-2.1.0-pic.patch b/mjpegtools-2.1.0-pic.patch index 7d0d1b6..0fda6c7 100644 --- a/mjpegtools-2.1.0-pic.patch +++ b/mjpegtools-2.1.0-pic.patch @@ -4,8 +4,8 @@ RCS file: /cvsroot/mjpeg/mjpeg_play/y4mdenoise/Makefile.am,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 ---- y4mdenoise/Makefile.am 1 Apr 2012 08:44:49 -0000 1.12 -+++ y4mdenoise/Makefile.am 28 Nov 2013 22:39:41 -0000 1.13 +--- a/y4mdenoise/Makefile.am 1 Apr 2012 08:44:49 -0000 1.12 ++++ b/y4mdenoise/Makefile.am 28 Nov 2013 22:39:41 -0000 1.13 @@ -4,8 +4,8 @@ EXTRA_DIST = implementation.html @@ -23,8 +23,8 @@ RCS file: /cvsroot/mjpeg/mjpeg_play/y4munsharp/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 ---- y4munsharp/Makefile.am 16 Jun 2005 17:09:38 -0000 1.2 -+++ y4munsharp/Makefile.am 28 Nov 2013 22:39:41 -0000 1.3 +--- a/y4munsharp/Makefile.am 16 Jun 2005 17:09:38 -0000 1.2 ++++ b/y4munsharp/Makefile.am 28 Nov 2013 22:39:41 -0000 1.3 @@ -4,7 +4,7 @@ INCLUDES = -I $(top_srcdir)/utils -I $(top_srcdir) @@ -40,8 +40,8 @@ RCS file: /cvsroot/mjpeg/mjpeg_play/y4mutils/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 ---- y4mutils/Makefile.am 1 Apr 2012 08:44:49 -0000 1.7 -+++ y4mutils/Makefile.am 28 Nov 2013 22:39:41 -0000 1.8 +--- a/y4mutils/Makefile.am 1 Apr 2012 08:44:49 -0000 1.7 ++++ b/y4mutils/Makefile.am 28 Nov 2013 22:39:41 -0000 1.8 @@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in @@ -57,8 +57,8 @@ RCS file: /cvsroot/mjpeg/mjpeg_play/yuvscaler/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 ---- yuvscaler/Makefile.am 1 Apr 2012 08:44:49 -0000 1.5 -+++ yuvscaler/Makefile.am 28 Nov 2013 22:39:41 -0000 1.6 +--- a/yuvscaler/Makefile.am 1 Apr 2012 08:44:49 -0000 1.5 ++++ b/yuvscaler/Makefile.am 28 Nov 2013 22:39:41 -0000 1.6 @@ -18,6 +18,6 @@ EXTRA_DIST = yuvscaler_implementation.txt From 11ab4c54c647b8cb5caa5d1d074928d803c5ac61 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Mon, 4 Mar 2019 15:58:46 +0000 Subject: [PATCH 36/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Leigh Scott --- mjpegtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index c5f0b40..952e586 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -1,6 +1,6 @@ Name: mjpegtools Version: 2.1.0 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Tools to manipulate MPEG data License: GPLv2 URL: http://mjpeg.sourceforge.net/ @@ -167,6 +167,9 @@ rm %buildroot%{_bindir}/mpegtranscode %changelog +* Mon Mar 04 2019 RPM Fusion Release Engineering - 2.1.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Nov 12 2018 Antonio Trande - 2.1.0-14 - Rebuild for ffmpeg-3.4.5 on el7 - infodir scriptlets deprecated From 203299a2720c261c6be9765e3108db88cca3bab8 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Fri, 9 Aug 2019 19:38:14 +0100 Subject: [PATCH 37/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Leigh Scott --- mjpegtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index 952e586..229150e 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -1,6 +1,6 @@ Name: mjpegtools Version: 2.1.0 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Tools to manipulate MPEG data License: GPLv2 URL: http://mjpeg.sourceforge.net/ @@ -167,6 +167,9 @@ rm %buildroot%{_bindir}/mpegtranscode %changelog +* Fri Aug 09 2019 RPM Fusion Release Engineering - 2.1.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Mon Mar 04 2019 RPM Fusion Release Engineering - 2.1.0-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From b90b72150039f53d8b5c9260408731e874cf6d24 Mon Sep 17 00:00:00 2001 From: Xavier Bachelot Date: Tue, 10 Sep 2019 17:30:03 +0200 Subject: [PATCH 38/50] Disable use of SDL_gfx on EL8 --- mjpegtools.spec | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index 229150e..cd9a432 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -1,6 +1,10 @@ +%if 0%{?el8} +%global _without_sdlgfx 1 +%endif + Name: mjpegtools Version: 2.1.0 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Tools to manipulate MPEG data License: GPLv2 URL: http://mjpeg.sourceforge.net/ @@ -9,13 +13,12 @@ Patch0: mjpegtools-2.1.0-sdl-cflags.patch Patch1: mjpegtools-2.1.0-no_format.patch Patch2: mjpegtools-2.1.0-pic.patch -BuildRequires: gcc-c++, gcc -%{?el7:BuildRequires: epel-rpm-macros} +BuildRequires: gcc-c++ BuildRequires: libjpeg-devel BuildRequires: nasm BuildRequires: libdv-devel BuildRequires: SDL-devel >= 1.1.3 -BuildRequires: SDL_gfx-devel +%{!?_without_sdlgfx:BuildRequires: SDL_gfx-devel} BuildRequires: libquicktime-devel >= 0.9.8 BuildRequires: libpng-devel BuildRequires: gtk2-devel >= 2.4.0 @@ -108,6 +111,7 @@ done %ifarch ppc64 --enable-simd-accel=no \ %endif +%{?_without_sdlgfx: --without-sdlgfx} \ --disable-static %make_build @@ -167,6 +171,10 @@ rm %buildroot%{_bindir}/mpegtranscode %changelog +* Tue Sep 10 2019 Xavier Bachelot - 2.1.0-17 +- Disable use of SDL_gfx on EL8. +- Minor spec cleanup. + * Fri Aug 09 2019 RPM Fusion Release Engineering - 2.1.0-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 2ffb2d0bbbb460b8834be2f880932747b4596450 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Wed, 5 Feb 2020 00:07:38 +0000 Subject: [PATCH 39/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: leigh123linux --- mjpegtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index cd9a432..6505682 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -4,7 +4,7 @@ Name: mjpegtools Version: 2.1.0 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Tools to manipulate MPEG data License: GPLv2 URL: http://mjpeg.sourceforge.net/ @@ -171,6 +171,9 @@ rm %buildroot%{_bindir}/mpegtranscode %changelog +* Wed Feb 05 2020 RPM Fusion Release Engineering - 2.1.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Sep 10 2019 Xavier Bachelot - 2.1.0-17 - Disable use of SDL_gfx on EL8. - Minor spec cleanup. From da0e68e6de5271990fbe85a0b0e9dfb8f14904a9 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Thu, 12 Mar 2020 18:50:23 +0000 Subject: [PATCH 40/50] Rebuilt for i686 --- mjpegtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index 6505682..85e4c24 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -4,7 +4,7 @@ Name: mjpegtools Version: 2.1.0 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Tools to manipulate MPEG data License: GPLv2 URL: http://mjpeg.sourceforge.net/ @@ -171,6 +171,9 @@ rm %buildroot%{_bindir}/mpegtranscode %changelog +* Thu Mar 12 2020 Leigh Scott - 2.1.0-19 +- Rebuilt for i686 + * Wed Feb 05 2020 RPM Fusion Release Engineering - 2.1.0-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 6411c1e8571a159a78648d42af3c58936e755ad7 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Tue, 18 Aug 2020 16:23:59 +0100 Subject: [PATCH 41/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Leigh Scott --- mjpegtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index 85e4c24..10bb16e 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -4,7 +4,7 @@ Name: mjpegtools Version: 2.1.0 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Tools to manipulate MPEG data License: GPLv2 URL: http://mjpeg.sourceforge.net/ @@ -171,6 +171,9 @@ rm %buildroot%{_bindir}/mpegtranscode %changelog +* Tue Aug 18 2020 RPM Fusion Release Engineering - 2.1.0-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Mar 12 2020 Leigh Scott - 2.1.0-19 - Rebuilt for i686 From cf9b4b5a93a39a34493ba387e78eb9fe8ba49744 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Tue, 18 Aug 2020 17:19:46 +0100 Subject: [PATCH 42/50] autoreconf build files --- mjpegtools.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index 10bb16e..8a7edaf 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -13,8 +13,10 @@ Patch0: mjpegtools-2.1.0-sdl-cflags.patch Patch1: mjpegtools-2.1.0-no_format.patch Patch2: mjpegtools-2.1.0-pic.patch +BuildRequires: automake BuildRequires: gcc-c++ BuildRequires: libjpeg-devel +BuildRequires: libtool BuildRequires: nasm BuildRequires: libdv-devel BuildRequires: SDL-devel >= 1.1.3 @@ -97,7 +99,7 @@ for building applications that use mjpegtools lavpipe libraries. %prep %autosetup -p1 - +autoreconf -iv sed -i -e 's/ARCHFLAGS=.*/ARCHFLAGS=/' configure* sed -i -e 's|/lib /usr/lib|/%{_lib} %{_libdir}|' configure # lib64 rpaths for f in docs/yuvfps.1 ; do From 8f95cecbbb4a3fedaa17a410d619e3b6a723395e Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Wed, 3 Feb 2021 19:53:18 +0000 Subject: [PATCH 43/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Leigh Scott --- mjpegtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index 8a7edaf..a9db493 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -4,7 +4,7 @@ Name: mjpegtools Version: 2.1.0 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Tools to manipulate MPEG data License: GPLv2 URL: http://mjpeg.sourceforge.net/ @@ -173,6 +173,9 @@ rm %buildroot%{_bindir}/mpegtranscode %changelog +* Wed Feb 03 2021 RPM Fusion Release Engineering - 2.1.0-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Aug 18 2020 RPM Fusion Release Engineering - 2.1.0-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From aef132b2a809ebc1dd6b7f15cb9385bb960ad927 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sat, 17 Apr 2021 15:10:30 +0100 Subject: [PATCH 44/50] Update to 2.2.0 --- .gitignore | 1 + mjpegtools-2.1.0-no_format.patch | 70 ------------------------------- mjpegtools-2.1.0-pic.patch | 69 ------------------------------ mjpegtools-2.1.0-sdl-cflags.patch | 11 ----- mjpegtools.spec | 17 ++++---- sources | 2 +- 6 files changed, 10 insertions(+), 160 deletions(-) delete mode 100644 mjpegtools-2.1.0-no_format.patch delete mode 100644 mjpegtools-2.1.0-pic.patch delete mode 100644 mjpegtools-2.1.0-sdl-cflags.patch diff --git a/.gitignore b/.gitignore index 163eb25..1e0d3e5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ mjpegtools-2.1.0.tar.gz +/mjpegtools-2.2.0.tar.bz2 diff --git a/mjpegtools-2.1.0-no_format.patch b/mjpegtools-2.1.0-no_format.patch deleted file mode 100644 index 20ed996..0000000 --- a/mjpegtools-2.1.0-no_format.patch +++ /dev/null @@ -1,70 +0,0 @@ ---- ./lavtools/lav_io.c.orig 2014-07-27 17:48:21.474622974 +0100 -+++ ./lavtools/lav_io.c 2014-07-27 17:48:48.838881166 +0100 -@@ -926,7 +926,7 @@ lav_file_t *lav_open_input_file(char *fi - strcat(errmsg, ", quicktime"); - #endif - strcat(errmsg, ").\n"); -- fprintf(stderr, errmsg); -+ fprintf(stderr, "%s", errmsg); - free(lav_fd); - internal_error = ERROR_FORMAT; /* Format not recognized */ - return 0; ---- ./lavtools/lavtrans.c.orig 2014-07-27 17:58:09.410282056 +0100 -+++ ./lavtools/lavtrans.c 2014-07-27 17:59:24.769016140 +0100 -@@ -275,7 +275,7 @@ int main(int argc, char ** argv) - if (process_image_frame != -1) - { - nv = el_get_video_frame(vbuff, process_image_frame, &el); -- sprintf(imgfname,outfile); -+ sprintf(imgfname, "%s", outfile); - imgfd = fopen(imgfname,"wb"); - if (imgfd==0) system_error("opening image file","fopen"); - res = fwrite(vbuff,nv,1,imgfd); ---- ./lavtools/jpeg2yuv.c.orig 2014-07-27 18:00:55.600900476 +0100 -+++ ./lavtools/jpeg2yuv.c 2014-07-27 18:01:36.848301893 +0100 -@@ -451,7 +451,7 @@ static int generate_YUV4MPEG(parameters_ - - if (firstjpeg) { - p = firstjpeg; -- sprintf(jpegname, firstjpeg); -+ sprintf(jpegname, "%s", firstjpeg); - firstjpeg = NULL; - } - else { ---- ./mplex/main.cpp.orig 2014-07-27 18:11:38.282143657 +0100 -+++ ./mplex/main.cpp 2014-07-27 18:06:40.352252415 +0100 -@@ -614,7 +614,7 @@ bool CmdLineMultiplexJob::ParseWorkaroun - if( flag_table[flag].longname != 0 ) - message += sep; - } -- mjpeg_error( message.c_str() ); -+ mjpeg_error( "%s", message.c_str() ); - return false; - } - ---- ./yuvfilters/yuvkineco.c.orig 2014-07-27 18:15:01.476097522 +0100 -+++ ./yuvfilters/yuvkineco.c 2014-07-27 18:15:29.540366245 +0100 -@@ -48,7 +48,7 @@ buf_debug(char *buf, FILE *fp, const cha - } else { - #ifdef MJPEGTOOLS - buf[n] = '\0'; -- mjpeg_debug(buf); -+ mjpeg_debug("%s", buf); - #else - fputs(buf, stderr); - #endif ---- ./yuvfilters/yuvfilters.h.orig 2014-07-27 18:37:02.712645244 +0100 -+++ ./yuvfilters/yuvfilters.h 2014-07-27 19:13:28.156101800 +0100 -@@ -34,9 +34,9 @@ extern "C" { - - #ifdef MJPEGTOOLS - # define perror(MSG) mjpeg_error("%s: %s", MSG, strerror(errno)) --# define WERROR(MSG) mjpeg_error(MSG) --# define WERRORL(MSG) mjpeg_error(MSG) --# define WWARN(MSG) mjpeg_warn(MSG) -+# define WERROR(MSG) mjpeg_error("%s", MSG) -+# define WERRORL(MSG) mjpeg_error("%s", MSG) -+# define WWARN(MSG) mjpeg_warn("%s", MSG) - #else - # define WERROR(MSG) write(2, MSG "\n", sizeof MSG) - # define WERRORL(MSG) do { write(2, MSG, strlen(MSG)); write(2, "\n", 1); } while (0) diff --git a/mjpegtools-2.1.0-pic.patch b/mjpegtools-2.1.0-pic.patch deleted file mode 100644 index 0fda6c7..0000000 --- a/mjpegtools-2.1.0-pic.patch +++ /dev/null @@ -1,69 +0,0 @@ -Index: y4mdenoise/Makefile.am -=================================================================== -RCS file: /cvsroot/mjpeg/mjpeg_play/y4mdenoise/Makefile.am,v -retrieving revision 1.12 -retrieving revision 1.13 -diff -u -r1.12 -r1.13 ---- a/y4mdenoise/Makefile.am 1 Apr 2012 08:44:49 -0000 1.12 -+++ b/y4mdenoise/Makefile.am 28 Nov 2013 22:39:41 -0000 1.13 -@@ -4,8 +4,8 @@ - - EXTRA_DIST = implementation.html - --AM_CFLAGS = -DNDEBUG -finline-functions @PROGRAM_NOPIC@ --AM_CXXFLAGS = -DNDEBUG -finline-functions @PROGRAM_NOPIC@ -+AM_CFLAGS = -DNDEBUG -finline-functions -+AM_CXXFLAGS = -DNDEBUG -finline-functions - - INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/utils - -Index: y4munsharp/Makefile.am -=================================================================== -RCS file: /cvsroot/mjpeg/mjpeg_play/y4munsharp/Makefile.am,v -retrieving revision 1.2 -retrieving revision 1.3 -diff -u -r1.2 -r1.3 ---- a/y4munsharp/Makefile.am 16 Jun 2005 17:09:38 -0000 1.2 -+++ b/y4munsharp/Makefile.am 28 Nov 2013 22:39:41 -0000 1.3 -@@ -4,7 +4,7 @@ - - INCLUDES = -I $(top_srcdir)/utils -I $(top_srcdir) - --y4munharp_CFLAGS=@PROGRAM_NOPIC@ -+y4munharp_CFLAGS= - - bin_PROGRAMS = y4munsharp - -Index: y4mutils/Makefile.am -=================================================================== -RCS file: /cvsroot/mjpeg/mjpeg_play/y4mutils/Makefile.am,v -retrieving revision 1.7 -retrieving revision 1.8 -diff -u -r1.7 -r1.8 ---- a/y4mutils/Makefile.am 1 Apr 2012 08:44:49 -0000 1.7 -+++ b/y4mutils/Makefile.am 28 Nov 2013 22:39:41 -0000 1.8 -@@ -2,7 +2,7 @@ - - MAINTAINERCLEANFILES = Makefile.in - --AM_CFLAGS = @PROGRAM_NOPIC@ -+AM_CFLAGS = - AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/utils - - LIBMJPEGUTILS = $(top_builddir)/utils/libmjpegutils.la -Index: yuvscaler/Makefile.am -=================================================================== -RCS file: /cvsroot/mjpeg/mjpeg_play/yuvscaler/Makefile.am,v -retrieving revision 1.5 -retrieving revision 1.6 -diff -u -r1.5 -r1.6 ---- a/yuvscaler/Makefile.am 1 Apr 2012 08:44:49 -0000 1.5 -+++ b/yuvscaler/Makefile.am 28 Nov 2013 22:39:41 -0000 1.6 -@@ -18,6 +18,6 @@ - - EXTRA_DIST = yuvscaler_implementation.txt - --yuvscaler_CFLAGS=@PROGRAM_NOPIC@ -+yuvscaler_CFLAGS= - yuvscaler_SOURCES = yuvscaler.c yuvscaler_resample.c yuvscaler_bicubic.c - yuvscaler_LDADD = $(LIBMJPEGUTILS) $(LIBM_LIBS) diff --git a/mjpegtools-2.1.0-sdl-cflags.patch b/mjpegtools-2.1.0-sdl-cflags.patch deleted file mode 100644 index 3bb7563..0000000 --- a/mjpegtools-2.1.0-sdl-cflags.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff a/y4mutils/Makefile.am b/y4mutils/Makefile.am ---- a/y4mutils/Makefile.am -+++ b/y4mutils/Makefile.am -@@ -44,6 +44,7 @@ y4mspatialfilter_LDADD = $(LIBMJPEGUTILS) $(LIBM_LIBS) - - y4mhist_SOURCES = y4mhist.c - y4mhist_LDADD = $(SDL_LIBS) $(SDLgfx_LIBS) $(LIBMJPEGUTILS) -+y4mhist_CPPFLAGS = $(AM_CPPFLAGS) $(SDL_CFLAGS) - - y4mblack_SOURCES = y4mblack.c - y4mblack_LDADD = $(LIBMJPEGUTILS) diff --git a/mjpegtools.spec b/mjpegtools.spec index a9db493..2ea3d09 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -3,15 +3,12 @@ %endif Name: mjpegtools -Version: 2.1.0 -Release: 21%{?dist} +Version: 2.2.0 +Release: 1%{?dist} Summary: Tools to manipulate MPEG data License: GPLv2 -URL: http://mjpeg.sourceforge.net/ -Source0: http://downloads.sourceforge.net/mjpeg/%{name}-%{version}.tar.gz -Patch0: mjpegtools-2.1.0-sdl-cflags.patch -Patch1: mjpegtools-2.1.0-no_format.patch -Patch2: mjpegtools-2.1.0-pic.patch +URL: https://mjpeg.sourceforge.net/ +Source0: https://sourceforge.net/projects/mjpeg/files/%{name}/%{version}/%{name}-%{version}.tar.bz2 BuildRequires: automake BuildRequires: gcc-c++ @@ -99,7 +96,7 @@ for building applications that use mjpegtools lavpipe libraries. %prep %autosetup -p1 -autoreconf -iv + sed -i -e 's/ARCHFLAGS=.*/ARCHFLAGS=/' configure* sed -i -e 's|/lib /usr/lib|/%{_lib} %{_libdir}|' configure # lib64 rpaths for f in docs/yuvfps.1 ; do @@ -143,7 +140,6 @@ rm %buildroot%{_bindir}/mpegtranscode %{_infodir}/mjpeg-howto.info* %files gui -%doc README.glav %{_bindir}/glav # lavplay and yuvplay won't save console util users from X11 and SDL # dependencies as long as liblavplay is in -lav, but they're inherently @@ -173,6 +169,9 @@ rm %buildroot%{_bindir}/mpegtranscode %changelog +* Sat Apr 17 2021 Leigh Scott - 2.2.0-1 +- Update to 2.2.0 + * Wed Feb 03 2021 RPM Fusion Release Engineering - 2.1.0-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index d7256b9..481ac45 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -57bf5dd78976ca9bac972a6511b236f3 mjpegtools-2.1.0.tar.gz +SHA512 (mjpegtools-2.2.0.tar.bz2) = d645c0004bf20cab67d2e09cde709f05e32ab755b773c93f75ab65bf6d4ab23d80addf3f8b98e1ce59cc05efc0776b11ca0c71568acb81fab6a0f15e60bce71f From 170840bf9e931c5ec5a38fd88fe0f9fc60ee06c7 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Tue, 3 Aug 2021 11:34:58 +0100 Subject: [PATCH 45/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Leigh Scott --- mjpegtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index 2ea3d09..b389963 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -4,7 +4,7 @@ Name: mjpegtools Version: 2.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tools to manipulate MPEG data License: GPLv2 URL: https://mjpeg.sourceforge.net/ @@ -169,6 +169,9 @@ rm %buildroot%{_bindir}/mpegtranscode %changelog +* Tue Aug 03 2021 RPM Fusion Release Engineering - 2.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sat Apr 17 2021 Leigh Scott - 2.2.0-1 - Update to 2.2.0 From a09fe786e05d68349034329425116a203eb7d31d Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 19 Dec 2021 10:20:31 +0100 Subject: [PATCH 46/50] Update to 2.2.1 --- .gitignore | 4 ++-- mjpegtools.spec | 9 ++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 1e0d3e5..94c5815 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -mjpegtools-2.1.0.tar.gz -/mjpegtools-2.2.0.tar.bz2 +mjpegtools-*.tar.gz +mjpegtools-*.tar.bz2 diff --git a/mjpegtools.spec b/mjpegtools.spec index b389963..2eed4ef 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -3,12 +3,12 @@ %endif Name: mjpegtools -Version: 2.2.0 -Release: 2%{?dist} +Version: 2.2.1 +Release: 1%{?dist} Summary: Tools to manipulate MPEG data License: GPLv2 URL: https://mjpeg.sourceforge.net/ -Source0: https://sourceforge.net/projects/mjpeg/files/%{name}/%{version}/%{name}-%{version}.tar.bz2 +Source0: https://downloads.sourceforge.net/mjpeg/%{name}/%{version}/%{name}-%{version}.tar.gz BuildRequires: automake BuildRequires: gcc-c++ @@ -169,6 +169,9 @@ rm %buildroot%{_bindir}/mpegtranscode %changelog +* Sun Dec 19 2021 Nicolas Chauvet - 2.2.1-1 +- Update to 2.2.1 + * Tue Aug 03 2021 RPM Fusion Release Engineering - 2.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 481ac45..e4dce7e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mjpegtools-2.2.0.tar.bz2) = d645c0004bf20cab67d2e09cde709f05e32ab755b773c93f75ab65bf6d4ab23d80addf3f8b98e1ce59cc05efc0776b11ca0c71568acb81fab6a0f15e60bce71f +SHA512 (mjpegtools-2.2.1.tar.gz) = 4d7f4dcf56a0e6079025bf0221ee632d91c4cc635a8c7eb9ddf3f7b86ad7250415c6dc4fd4113081920bc9c8fdc2552b8a3aaf896bf5a778acfacb15c7ded830 From e93b0795ab4ce5333f961789f3bd4eee9819ecc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 19 Dec 2021 16:16:41 +0000 Subject: [PATCH 47/50] Fix URL --- mjpegtools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index 2eed4ef..a2bbc56 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -7,7 +7,7 @@ Version: 2.2.1 Release: 1%{?dist} Summary: Tools to manipulate MPEG data License: GPLv2 -URL: https://mjpeg.sourceforge.net/ +URL: https://mjpeg.sourceforge.io/ Source0: https://downloads.sourceforge.net/mjpeg/%{name}/%{version}/%{name}-%{version}.tar.gz BuildRequires: automake From 5317e5647ea52d9ba6e45735374d9b91ce020973 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 9 Feb 2022 16:44:44 +0000 Subject: [PATCH 48/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sérgio M. Basto --- mjpegtools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index a2bbc56..c604e12 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -4,7 +4,7 @@ Name: mjpegtools Version: 2.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tools to manipulate MPEG data License: GPLv2 URL: https://mjpeg.sourceforge.io/ @@ -169,6 +169,9 @@ rm %buildroot%{_bindir}/mpegtranscode %changelog +* Wed Feb 09 2022 RPM Fusion Release Engineering - 2.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sun Dec 19 2021 Nicolas Chauvet - 2.2.1-1 - Update to 2.2.1 From d7869544937a3feb8f6cf6ed5ce95f5944be5695 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 7 Jul 2022 08:56:54 +0200 Subject: [PATCH 49/50] adapt for rhel9 --- mjpegtools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index c604e12..e6f6e96 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -1,4 +1,4 @@ -%if 0%{?el8} +%if 0%{?rhel} >= 8 %global _without_sdlgfx 1 %endif From f0d543efed9764c81658f16c15c042b0cbb19ea9 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 23:30:13 +0300 Subject: [PATCH 50/50] Remove unnecessary files --- sources | 1 - 1 file changed, 1 deletion(-) delete mode 100644 sources diff --git a/sources b/sources deleted file mode 100644 index e4dce7e..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (mjpegtools-2.2.1.tar.gz) = 4d7f4dcf56a0e6079025bf0221ee632d91c4cc635a8c7eb9ddf3f7b86ad7250415c6dc4fd4113081920bc9c8fdc2552b8a3aaf896bf5a778acfacb15c7ded830