July 2008 - rpmfusion-commits

rpms/unace/F-8 unace.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by jwrdegoede

Author: jwrdegoede Update of /cvs/nonfree/rpms/unace/F-8 In directory se02.es.rpmfusion.net:/tmp/cvs-serv19682 Modified Files: .cvsignore sources Added Files: unace.spec Log Message: * Fri Jul 25 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.50-3 - Release bump for rpmfusion --- NEW FILE unace.spec --- %define debug_package %{nil} Summary: A tool to extract ace archives Name: unace Version: 2.50 Release: 3%{?dist} License: Redistributable, no modification permitted Group: Applications/Archiving URL: http://www.winace.com/ Source0: http://www.winace.com/files/linunace25.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: i386 %description unace is a command line utility to extract, view, and test the contents of an ACE archive. %prep %setup -q -c sed -i 's/\r//g' licence chmod -x licence %build # nothing to build, upstream distributes prebuild binaries only %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_bindir}/ install -m 0755 %{name} $RPM_BUILD_ROOT/%{_bindir}/ %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc licence %{_bindir}/%{name} %changelog * Fri Jul 25 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.50-3 - Release bump for rpmfusion * Wed Oct 17 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.50-2 - Stop generation of useless debuginfo package (livna 994) - Include licence text in documentation * Sat Apr 8 2006 Dams <anvil[AT]livna.org> - 2.50-1 - Updated to 2.50 * Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - switch to new release field - drop Epoch * Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - add dist * Sun May 18 2003 Dams <anvil[AT]livna.org> 0:2.20-0.fdr.3 - License is now Distributable * Wed May 14 2003 Dams <anvil[AT]livna.org> 0:2.20-0.fdr.2 - Added ExclusiveArch tag * Tue May 13 2003 Dams <anvil[AT]livna.org> - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/unace/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:41:11 -0000 1.1 +++ .cvsignore 25 Jul 2008 19:25:30 -0000 1.2 @@ -0,0 +1 @@ +linunace25.tgz Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/unace/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:41:11 -0000 1.1 +++ sources 25 Jul 2008 19:25:30 -0000 1.2 @@ -0,0 +1 @@ +ad1f8cb7ff3a6c6019da869b72300719 linunace25.tgz

15 years, 9 months

1
0
0 / 0

rpms/unace/F-9 unace.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by jwrdegoede

Author: jwrdegoede Update of /cvs/nonfree/rpms/unace/F-9 In directory se02.es.rpmfusion.net:/tmp/cvs-serv19585 Modified Files: .cvsignore sources Added Files: unace.spec Log Message: * Fri Jul 25 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.50-3 - Release bump for rpmfusion --- NEW FILE unace.spec --- %define debug_package %{nil} Summary: A tool to extract ace archives Name: unace Version: 2.50 Release: 3%{?dist} License: Redistributable, no modification permitted Group: Applications/Archiving URL: http://www.winace.com/ Source0: http://www.winace.com/files/linunace25.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: i386 %description unace is a command line utility to extract, view, and test the contents of an ACE archive. %prep %setup -q -c sed -i 's/\r//g' licence chmod -x licence %build # nothing to build, upstream distributes prebuild binaries only %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_bindir}/ install -m 0755 %{name} $RPM_BUILD_ROOT/%{_bindir}/ %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc licence %{_bindir}/%{name} %changelog * Fri Jul 25 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.50-3 - Release bump for rpmfusion * Wed Oct 17 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.50-2 - Stop generation of useless debuginfo package (livna 994) - Include licence text in documentation * Sat Apr 8 2006 Dams <anvil[AT]livna.org> - 2.50-1 - Updated to 2.50 * Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - switch to new release field - drop Epoch * Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - add dist * Sun May 18 2003 Dams <anvil[AT]livna.org> 0:2.20-0.fdr.3 - License is now Distributable * Wed May 14 2003 Dams <anvil[AT]livna.org> 0:2.20-0.fdr.2 - Added ExclusiveArch tag * Tue May 13 2003 Dams <anvil[AT]livna.org> - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/unace/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:41:11 -0000 1.1 +++ .cvsignore 25 Jul 2008 19:25:12 -0000 1.2 @@ -0,0 +1 @@ +linunace25.tgz Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/unace/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:41:11 -0000 1.1 +++ sources 25 Jul 2008 19:25:12 -0000 1.2 @@ -0,0 +1 @@ +ad1f8cb7ff3a6c6019da869b72300719 linunace25.tgz

15 years, 9 months

1
0
0 / 0

rpms/unace/devel unace.spec,1.1,1.2

by jwrdegoede

Author: jwrdegoede Update of /cvs/nonfree/rpms/unace/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv19483 Modified Files: unace.spec Log Message: * Fri Jul 25 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.50-3 - Release bump for rpmfusion Index: unace.spec =================================================================== RCS file: /cvs/nonfree/rpms/unace/devel/unace.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- unace.spec 25 Jul 2008 19:18:56 -0000 1.1 +++ unace.spec 25 Jul 2008 19:24:07 -0000 1.2 @@ -3,7 +3,7 @@ Summary: A tool to extract ace archives Name: unace Version: 2.50 -Release: 2%{?dist} +Release: 3%{?dist} License: Redistributable, no modification permitted Group: Applications/Archiving URL: http://www.winace.com/ @@ -43,6 +43,9 @@ %changelog +* Fri Jul 25 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.50-3 +- Release bump for rpmfusion + * Wed Oct 17 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.50-2 - Stop generation of useless debuginfo package (livna 994) - Include licence text in documentation

15 years, 9 months

1
0
0 / 0

rpms/unace/devel unace.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by jwrdegoede

Author: jwrdegoede Update of /cvs/nonfree/rpms/unace/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv19119/devel Modified Files: .cvsignore sources Added Files: unace.spec Log Message: initial unace import --- NEW FILE unace.spec --- %define debug_package %{nil} Summary: A tool to extract ace archives Name: unace Version: 2.50 Release: 2%{?dist} License: Redistributable, no modification permitted Group: Applications/Archiving URL: http://www.winace.com/ Source0: http://www.winace.com/files/linunace25.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: i386 %description unace is a command line utility to extract, view, and test the contents of an ACE archive. %prep %setup -q -c sed -i 's/\r//g' licence chmod -x licence %build # nothing to build, upstream distributes prebuild binaries only %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_bindir}/ install -m 0755 %{name} $RPM_BUILD_ROOT/%{_bindir}/ %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc licence %{_bindir}/%{name} %changelog * Wed Oct 17 2007 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.50-2 - Stop generation of useless debuginfo package (livna 994) - Include licence text in documentation * Sat Apr 8 2006 Dams <anvil[AT]livna.org> - 2.50-1 - Updated to 2.50 * Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - switch to new release field - drop Epoch * Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - add dist * Sun May 18 2003 Dams <anvil[AT]livna.org> 0:2.20-0.fdr.3 - License is now Distributable * Wed May 14 2003 Dams <anvil[AT]livna.org> 0:2.20-0.fdr.2 - Added ExclusiveArch tag * Tue May 13 2003 Dams <anvil[AT]livna.org> - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/unace/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:41:11 -0000 1.1 +++ .cvsignore 25 Jul 2008 19:18:56 -0000 1.2 @@ -0,0 +1 @@ +linunace25.tgz Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/unace/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:41:11 -0000 1.1 +++ sources 25 Jul 2008 19:18:56 -0000 1.2 @@ -0,0 +1 @@ +ad1f8cb7ff3a6c6019da869b72300719 linunace25.tgz

15 years, 9 months

1
0
0 / 0

rpms/mjpegtools/F-8 mjpegtools-1.9.0_rc3-gcc43.patch, NONE, 1.1 mjpegtools-1.9.0rc1-anytovcd-ffmpegver.patch, NONE, 1.1 mjpegtools.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by jwrdegoede

Author: jwrdegoede Update of /cvs/free/rpms/mjpegtools/F-8 In directory se02.es.rpmfusion.net:/tmp/cvs-serv18891 Modified Files: .cvsignore sources Added Files: mjpegtools-1.9.0_rc3-gcc43.patch mjpegtools-1.9.0rc1-anytovcd-ffmpegver.patch mjpegtools.spec Log Message: * Fri Jul 25 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.9.0-0.6.rc3 - Release bump for rpmfusion - Sync with freshrpms (no changes) mjpegtools-1.9.0_rc3-gcc43.patch: --- NEW FILE mjpegtools-1.9.0_rc3-gcc43.patch --- http://bugs.gentoo.org/200767 http://sourceforge.net/tracker/index.php?func=detail&aid=1947059&group_id... --- mjpegtools-1.9.0rc3/mpeg2enc/encodertypes.h +++ mjpegtools-1.9.0rc3/mpeg2enc/encodertypes.h @@ -25,6 +25,8 @@ */ +#include <stdlib.h> + class Parity { public: --- mjpegtools-1.9.0rc3/mpeg2enc/macroblock.cc +++ mjpegtools-1.9.0rc3/mpeg2enc/macroblock.cc @@ -21,6 +21,7 @@ #include <stdio.h> #include <cassert> +#include <limits.h> #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 <limits.h> //#include <stdio.h> //#include <stdlib.h> //#include <unistd.h> --- mjpegtools-1.9.0rc3/mplex/inputstrm.cpp +++ mjpegtools-1.9.0rc3/mplex/inputstrm.cpp @@ -23,6 +23,7 @@ #include <config.h> #include <assert.h> +#include <limits.h> #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 <string.h> #include "padstrm.hpp" --- mjpegtools-1.9.0rc3/mplex/multiplexor.cpp +++ mjpegtools-1.9.0rc3/mplex/multiplexor.cpp @@ -22,6 +22,7 @@ #include <config.h> #include <math.h> #include <stdlib.h> +#include <string.h> #include <mjpeg_types.h> #include <mjpeg_logging.h> --- mjpegtools-1.9.0rc3/mplex/main.cpp +++ mjpegtools-1.9.0rc3/mplex/main.cpp @@ -31,6 +31,7 @@ #include <getopt.h> #endif #include <string> +#include <string.h> #include <memory> #include <sys/stat.h> #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<Node,HEADERCHUNK> Allocator; + typedef Allocator<Node,HEADERCHUNK> 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 <class KEY, class VALUE, class KEYFN, class PRED> -typename SkipList<KEY,VALUE,KEYFN,PRED>::Allocator +typename SkipList<KEY,VALUE,KEYFN,PRED>::Allocator_t SkipList<KEY,VALUE,KEYFN,PRED>::sm_oNodeAllocator (65536); @@ -345,7 +345,7 @@ // Default constructor. Must be followed by Init(). template <class KEY, class VALUE, class KEYFN, class PRED> SkipList<KEY,VALUE,KEYFN,PRED>::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 <class KEY, class VALUE, class KEYFN, class PRED> SkipList<KEY,VALUE,KEYFN,PRED>::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. mjpegtools-1.9.0rc1-anytovcd-ffmpegver.patch: --- NEW FILE mjpegtools-1.9.0rc1-anytovcd-ffmpegver.patch --- --- 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`" --- NEW FILE mjpegtools.spec --- Name: mjpegtools Version: 1.9.0 Release: 0.6.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/mj... 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 * Fri Jul 25 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.9.0-0.6.rc3 - Release bump for rpmfusion - Sync with freshrpms (no changes) * Tue Apr 22 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.9.0-0.5.rc3 - Apply patch from Gentoo to fix build with GCC 4.3 (#1941). * Tue Dec 4 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.9.0-0.4.rc3 - 1.9.0rc3. * Sat Sep 29 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.9.0-0.4.rc2 - Requires: which * Wed Aug 22 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.9.0-0.3.rc2 - License: GPLv2 * Thu Jun 21 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.9.0-0.2.rc2 - Rebuild. * Fri Jun 8 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.9.0-0.1.rc2 - 1.9.0rc2. * Sat Nov 25 2006 Ville Skyttä <ville.skytta at iki.fi> - 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 <fedora [AT] leemhuis [DOT] info> 1.8.0-6 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 * Sun Sep 24 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.8.0-5 - Specfile cleanup. * Sun Jun 4 2006 Ville Skyttä <ville.skytta at iki.fi> - 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 <andreas.bierfert[AT]lowlatency.de> - switch to new release field * Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - add dist * Sat Jan 21 2006 Ville Skyttä <ville.skytta at iki.fi> - 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 <adrian(a)lisas.de> - 1.8.0-0.lvn.2 - Added patch to compile with gcc 4.1 - Dropped 0 Epoch * Mon Sep 19 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:1.8.0-0.lvn.1 - 1.8.0. * Sat Aug 27 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:1.6.3-0.lvn.0.1.rc3 - 1.6.3-rc3, Altivec fixes applied upstream. * Fri Aug 12 2005 Ville Skyttä <ville.skytta at iki.fi> - 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ä <ville.skytta at iki.fi> - 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ä <ville.skytta at iki.fi> - 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ä <ville.skytta at iki.fi> - 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ä <ville.skytta at iki.fi> - 0:1.6.2-0.lvn.7 - Add corrected -fPIC tweak from Thorsten. * Mon Jan 31 2005 Ville Skyttä <ville.skytta at iki.fi> - 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 <fedora[AT]leemhuis[DOT]info> - 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 <anvil[AT]livna.org> - 0:1.6.2-0.lvn.4 - Disabling static libraries building * Tue Dec 14 2004 Ville Skyttä <ville.skytta at iki.fi> - 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 <anvil[AT]livna.org> 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 <anvil[AT]livna.org> 0:1.6.2-0.lvn.1 - Updated to 1.6.2 * Sun Sep 28 2003 Dams <anvil[AT]livna.org> 0:1.6.1-0.fdr.6 - Removed comment after scriptlets * Fri Aug 22 2003 Dams <anvil[AT]livna.org> 0:1.6.1-0.fdr.5 - buildroot -> RPM_BUILD_ROOT * Sun Aug 10 2003 Dams <anvil[AT]livna.org> 0:1.6.1-0.fdr.4 - Applied upstream patches to fix build on gcc3.3 systems * Tue Apr 29 2003 Dams <anvil[AT]livna.org> 0:1.6.1-0.fdr.3 - Now test arch for configure options (from Ville) - Removed ImageMagick-devel BuildRequires * Sun Apr 27 2003 Dams <anvil[AT]livna.org> 0:1.6.1-0.fdr.2 - Added missing BuildRequires - Added post/postun scriplets for libs package * Wed Apr 23 2003 Dams <anvil[AT]livna.org> - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/mjpegtools/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:53:24 -0000 1.1 +++ .cvsignore 25 Jul 2008 19:17:45 -0000 1.2 @@ -0,0 +1 @@ +mjpegtools-1.9.0rc3.tar.gz Index: sources =================================================================== RCS file: /cvs/free/rpms/mjpegtools/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:53:24 -0000 1.1 +++ sources 25 Jul 2008 19:17:45 -0000 1.2 @@ -0,0 +1 @@ +d38dad44333e3236ccc0dc1efdb27910 mjpegtools-1.9.0rc3.tar.gz

15 years, 9 months

1
0
0 / 0

rpms/mjpegtools/F-9 mjpegtools-1.9.0_rc3-gcc43.patch, NONE, 1.1 mjpegtools-1.9.0rc1-anytovcd-ffmpegver.patch, NONE, 1.1 mjpegtools.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by jwrdegoede

Author: jwrdegoede Update of /cvs/free/rpms/mjpegtools/F-9 In directory se02.es.rpmfusion.net:/tmp/cvs-serv18790 Modified Files: .cvsignore sources Added Files: mjpegtools-1.9.0_rc3-gcc43.patch mjpegtools-1.9.0rc1-anytovcd-ffmpegver.patch mjpegtools.spec Log Message: * Fri Jul 25 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.9.0-0.6.rc3 - Release bump for rpmfusion - Sync with freshrpms (no changes) mjpegtools-1.9.0_rc3-gcc43.patch: --- NEW FILE mjpegtools-1.9.0_rc3-gcc43.patch --- http://bugs.gentoo.org/200767 http://sourceforge.net/tracker/index.php?func=detail&aid=1947059&group_id... --- mjpegtools-1.9.0rc3/mpeg2enc/encodertypes.h +++ mjpegtools-1.9.0rc3/mpeg2enc/encodertypes.h @@ -25,6 +25,8 @@ */ +#include <stdlib.h> + class Parity { public: --- mjpegtools-1.9.0rc3/mpeg2enc/macroblock.cc +++ mjpegtools-1.9.0rc3/mpeg2enc/macroblock.cc @@ -21,6 +21,7 @@ #include <stdio.h> #include <cassert> +#include <limits.h> #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 <limits.h> //#include <stdio.h> //#include <stdlib.h> //#include <unistd.h> --- mjpegtools-1.9.0rc3/mplex/inputstrm.cpp +++ mjpegtools-1.9.0rc3/mplex/inputstrm.cpp @@ -23,6 +23,7 @@ #include <config.h> #include <assert.h> +#include <limits.h> #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 <string.h> #include "padstrm.hpp" --- mjpegtools-1.9.0rc3/mplex/multiplexor.cpp +++ mjpegtools-1.9.0rc3/mplex/multiplexor.cpp @@ -22,6 +22,7 @@ #include <config.h> #include <math.h> #include <stdlib.h> +#include <string.h> #include <mjpeg_types.h> #include <mjpeg_logging.h> --- mjpegtools-1.9.0rc3/mplex/main.cpp +++ mjpegtools-1.9.0rc3/mplex/main.cpp @@ -31,6 +31,7 @@ #include <getopt.h> #endif #include <string> +#include <string.h> #include <memory> #include <sys/stat.h> #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<Node,HEADERCHUNK> Allocator; + typedef Allocator<Node,HEADERCHUNK> 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 <class KEY, class VALUE, class KEYFN, class PRED> -typename SkipList<KEY,VALUE,KEYFN,PRED>::Allocator +typename SkipList<KEY,VALUE,KEYFN,PRED>::Allocator_t SkipList<KEY,VALUE,KEYFN,PRED>::sm_oNodeAllocator (65536); @@ -345,7 +345,7 @@ // Default constructor. Must be followed by Init(). template <class KEY, class VALUE, class KEYFN, class PRED> SkipList<KEY,VALUE,KEYFN,PRED>::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 <class KEY, class VALUE, class KEYFN, class PRED> SkipList<KEY,VALUE,KEYFN,PRED>::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. mjpegtools-1.9.0rc1-anytovcd-ffmpegver.patch: --- NEW FILE mjpegtools-1.9.0rc1-anytovcd-ffmpegver.patch --- --- 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`" --- NEW FILE mjpegtools.spec --- Name: mjpegtools Version: 1.9.0 Release: 0.6.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/mj... 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 * Fri Jul 25 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.9.0-0.6.rc3 - Release bump for rpmfusion - Sync with freshrpms (no changes) * Tue Apr 22 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.9.0-0.5.rc3 - Apply patch from Gentoo to fix build with GCC 4.3 (#1941). * Tue Dec 4 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.9.0-0.4.rc3 - 1.9.0rc3. * Sat Sep 29 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.9.0-0.4.rc2 - Requires: which * Wed Aug 22 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.9.0-0.3.rc2 - License: GPLv2 * Thu Jun 21 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.9.0-0.2.rc2 - Rebuild. * Fri Jun 8 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.9.0-0.1.rc2 - 1.9.0rc2. * Sat Nov 25 2006 Ville Skyttä <ville.skytta at iki.fi> - 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 <fedora [AT] leemhuis [DOT] info> 1.8.0-6 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 * Sun Sep 24 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.8.0-5 - Specfile cleanup. * Sun Jun 4 2006 Ville Skyttä <ville.skytta at iki.fi> - 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 <andreas.bierfert[AT]lowlatency.de> - switch to new release field * Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - add dist * Sat Jan 21 2006 Ville Skyttä <ville.skytta at iki.fi> - 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 <adrian(a)lisas.de> - 1.8.0-0.lvn.2 - Added patch to compile with gcc 4.1 - Dropped 0 Epoch * Mon Sep 19 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:1.8.0-0.lvn.1 - 1.8.0. * Sat Aug 27 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:1.6.3-0.lvn.0.1.rc3 - 1.6.3-rc3, Altivec fixes applied upstream. * Fri Aug 12 2005 Ville Skyttä <ville.skytta at iki.fi> - 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ä <ville.skytta at iki.fi> - 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ä <ville.skytta at iki.fi> - 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ä <ville.skytta at iki.fi> - 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ä <ville.skytta at iki.fi> - 0:1.6.2-0.lvn.7 - Add corrected -fPIC tweak from Thorsten. * Mon Jan 31 2005 Ville Skyttä <ville.skytta at iki.fi> - 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 <fedora[AT]leemhuis[DOT]info> - 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 <anvil[AT]livna.org> - 0:1.6.2-0.lvn.4 - Disabling static libraries building * Tue Dec 14 2004 Ville Skyttä <ville.skytta at iki.fi> - 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 <anvil[AT]livna.org> 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 <anvil[AT]livna.org> 0:1.6.2-0.lvn.1 - Updated to 1.6.2 * Sun Sep 28 2003 Dams <anvil[AT]livna.org> 0:1.6.1-0.fdr.6 - Removed comment after scriptlets * Fri Aug 22 2003 Dams <anvil[AT]livna.org> 0:1.6.1-0.fdr.5 - buildroot -> RPM_BUILD_ROOT * Sun Aug 10 2003 Dams <anvil[AT]livna.org> 0:1.6.1-0.fdr.4 - Applied upstream patches to fix build on gcc3.3 systems * Tue Apr 29 2003 Dams <anvil[AT]livna.org> 0:1.6.1-0.fdr.3 - Now test arch for configure options (from Ville) - Removed ImageMagick-devel BuildRequires * Sun Apr 27 2003 Dams <anvil[AT]livna.org> 0:1.6.1-0.fdr.2 - Added missing BuildRequires - Added post/postun scriplets for libs package * Wed Apr 23 2003 Dams <anvil[AT]livna.org> - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/mjpegtools/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:53:24 -0000 1.1 +++ .cvsignore 25 Jul 2008 19:17:31 -0000 1.2 @@ -0,0 +1 @@ +mjpegtools-1.9.0rc3.tar.gz Index: sources =================================================================== RCS file: /cvs/free/rpms/mjpegtools/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:53:24 -0000 1.1 +++ sources 25 Jul 2008 19:17:31 -0000 1.2 @@ -0,0 +1 @@ +d38dad44333e3236ccc0dc1efdb27910 mjpegtools-1.9.0rc3.tar.gz

15 years, 9 months

1
0
0 / 0

rpms/mjpegtools/devel mjpegtools.spec,1.1,1.2

by jwrdegoede

Author: jwrdegoede Update of /cvs/free/rpms/mjpegtools/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv18439 Modified Files: mjpegtools.spec Log Message: * Fri Jul 25 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.9.0-0.6.rc3 - Release bump for rpmfusion - Sync with freshrpms (no changes) Index: mjpegtools.spec =================================================================== RCS file: /cvs/free/rpms/mjpegtools/devel/mjpegtools.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mjpegtools.spec 25 Jul 2008 19:08:52 -0000 1.1 +++ mjpegtools.spec 25 Jul 2008 19:16:49 -0000 1.2 @@ -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 @@ %changelog +* Fri Jul 25 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 1.9.0-0.6.rc3 +- Release bump for rpmfusion +- Sync with freshrpms (no changes) + * Tue Apr 22 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.9.0-0.5.rc3 - Apply patch from Gentoo to fix build with GCC 4.3 (#1941).

15 years, 9 months

1
0
0 / 0

rpms/mjpegtools/devel mjpegtools-1.9.0_rc3-gcc43.patch, NONE, 1.1 mjpegtools-1.9.0rc1-anytovcd-ffmpegver.patch, NONE, 1.1 mjpegtools.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by jwrdegoede

Author: jwrdegoede Update of /cvs/free/rpms/mjpegtools/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv18044/devel Modified Files: .cvsignore sources Added Files: mjpegtools-1.9.0_rc3-gcc43.patch mjpegtools-1.9.0rc1-anytovcd-ffmpegver.patch mjpegtools.spec Log Message: initial mjpegtools import mjpegtools-1.9.0_rc3-gcc43.patch: --- NEW FILE mjpegtools-1.9.0_rc3-gcc43.patch --- http://bugs.gentoo.org/200767 http://sourceforge.net/tracker/index.php?func=detail&aid=1947059&group_id... --- mjpegtools-1.9.0rc3/mpeg2enc/encodertypes.h +++ mjpegtools-1.9.0rc3/mpeg2enc/encodertypes.h @@ -25,6 +25,8 @@ */ +#include <stdlib.h> + class Parity { public: --- mjpegtools-1.9.0rc3/mpeg2enc/macroblock.cc +++ mjpegtools-1.9.0rc3/mpeg2enc/macroblock.cc @@ -21,6 +21,7 @@ #include <stdio.h> #include <cassert> +#include <limits.h> #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 <limits.h> //#include <stdio.h> //#include <stdlib.h> //#include <unistd.h> --- mjpegtools-1.9.0rc3/mplex/inputstrm.cpp +++ mjpegtools-1.9.0rc3/mplex/inputstrm.cpp @@ -23,6 +23,7 @@ #include <config.h> #include <assert.h> +#include <limits.h> #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 <string.h> #include "padstrm.hpp" --- mjpegtools-1.9.0rc3/mplex/multiplexor.cpp +++ mjpegtools-1.9.0rc3/mplex/multiplexor.cpp @@ -22,6 +22,7 @@ #include <config.h> #include <math.h> #include <stdlib.h> +#include <string.h> #include <mjpeg_types.h> #include <mjpeg_logging.h> --- mjpegtools-1.9.0rc3/mplex/main.cpp +++ mjpegtools-1.9.0rc3/mplex/main.cpp @@ -31,6 +31,7 @@ #include <getopt.h> #endif #include <string> +#include <string.h> #include <memory> #include <sys/stat.h> #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<Node,HEADERCHUNK> Allocator; + typedef Allocator<Node,HEADERCHUNK> 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 <class KEY, class VALUE, class KEYFN, class PRED> -typename SkipList<KEY,VALUE,KEYFN,PRED>::Allocator +typename SkipList<KEY,VALUE,KEYFN,PRED>::Allocator_t SkipList<KEY,VALUE,KEYFN,PRED>::sm_oNodeAllocator (65536); @@ -345,7 +345,7 @@ // Default constructor. Must be followed by Init(). template <class KEY, class VALUE, class KEYFN, class PRED> SkipList<KEY,VALUE,KEYFN,PRED>::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 <class KEY, class VALUE, class KEYFN, class PRED> SkipList<KEY,VALUE,KEYFN,PRED>::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. mjpegtools-1.9.0rc1-anytovcd-ffmpegver.patch: --- NEW FILE mjpegtools-1.9.0rc1-anytovcd-ffmpegver.patch --- --- 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`" --- NEW FILE mjpegtools.spec --- 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/mj... 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ä <ville.skytta at iki.fi> - 1.9.0-0.5.rc3 - Apply patch from Gentoo to fix build with GCC 4.3 (#1941). * Tue Dec 4 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.9.0-0.4.rc3 - 1.9.0rc3. * Sat Sep 29 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.9.0-0.4.rc2 - Requires: which * Wed Aug 22 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.9.0-0.3.rc2 - License: GPLv2 * Thu Jun 21 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.9.0-0.2.rc2 - Rebuild. * Fri Jun 8 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.9.0-0.1.rc2 - 1.9.0rc2. * Sat Nov 25 2006 Ville Skyttä <ville.skytta at iki.fi> - 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 <fedora [AT] leemhuis [DOT] info> 1.8.0-6 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 * Sun Sep 24 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.8.0-5 - Specfile cleanup. * Sun Jun 4 2006 Ville Skyttä <ville.skytta at iki.fi> - 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 <andreas.bierfert[AT]lowlatency.de> - switch to new release field * Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> - add dist * Sat Jan 21 2006 Ville Skyttä <ville.skytta at iki.fi> - 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 <adrian(a)lisas.de> - 1.8.0-0.lvn.2 - Added patch to compile with gcc 4.1 - Dropped 0 Epoch * Mon Sep 19 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:1.8.0-0.lvn.1 - 1.8.0. * Sat Aug 27 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:1.6.3-0.lvn.0.1.rc3 - 1.6.3-rc3, Altivec fixes applied upstream. * Fri Aug 12 2005 Ville Skyttä <ville.skytta at iki.fi> - 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ä <ville.skytta at iki.fi> - 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ä <ville.skytta at iki.fi> - 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ä <ville.skytta at iki.fi> - 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ä <ville.skytta at iki.fi> - 0:1.6.2-0.lvn.7 - Add corrected -fPIC tweak from Thorsten. * Mon Jan 31 2005 Ville Skyttä <ville.skytta at iki.fi> - 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 <fedora[AT]leemhuis[DOT]info> - 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 <anvil[AT]livna.org> - 0:1.6.2-0.lvn.4 - Disabling static libraries building * Tue Dec 14 2004 Ville Skyttä <ville.skytta at iki.fi> - 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 <anvil[AT]livna.org> 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 <anvil[AT]livna.org> 0:1.6.2-0.lvn.1 - Updated to 1.6.2 * Sun Sep 28 2003 Dams <anvil[AT]livna.org> 0:1.6.1-0.fdr.6 - Removed comment after scriptlets * Fri Aug 22 2003 Dams <anvil[AT]livna.org> 0:1.6.1-0.fdr.5 - buildroot -> RPM_BUILD_ROOT * Sun Aug 10 2003 Dams <anvil[AT]livna.org> 0:1.6.1-0.fdr.4 - Applied upstream patches to fix build on gcc3.3 systems * Tue Apr 29 2003 Dams <anvil[AT]livna.org> 0:1.6.1-0.fdr.3 - Now test arch for configure options (from Ville) - Removed ImageMagick-devel BuildRequires * Sun Apr 27 2003 Dams <anvil[AT]livna.org> 0:1.6.1-0.fdr.2 - Added missing BuildRequires - Added post/postun scriplets for libs package * Wed Apr 23 2003 Dams <anvil[AT]livna.org> - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/mjpegtools/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:53:24 -0000 1.1 +++ .cvsignore 25 Jul 2008 19:08:52 -0000 1.2 @@ -0,0 +1 @@ +mjpegtools-1.9.0rc3.tar.gz Index: sources =================================================================== RCS file: /cvs/free/rpms/mjpegtools/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:53:24 -0000 1.1 +++ sources 25 Jul 2008 19:08:52 -0000 1.2 @@ -0,0 +1 @@ +d38dad44333e3236ccc0dc1efdb27910 mjpegtools-1.9.0rc3.tar.gz

15 years, 9 months

1
0
0 / 0

rpms/smc-music/F-8 .cvsignore,1.1,1.2 sources,1.1,1.2

by jwrdegoede

Author: jwrdegoede Update of /cvs/free/rpms/smc-music/F-8 In directory se02.es.rpmfusion.net:/tmp/cvs-serv17526 Modified Files: .cvsignore sources Log Message: * Fri Jul 25 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 4.0-2 - Release bump for rpmfusion Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/smc-music/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Jun 2008 13:49:36 -0000 1.1 +++ .cvsignore 25 Jul 2008 19:03:44 -0000 1.2 @@ -0,0 +1 @@ +SMC_music_4.0_high.zip Index: sources =================================================================== RCS file: /cvs/free/rpms/smc-music/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Jun 2008 13:49:36 -0000 1.1 +++ sources 25 Jul 2008 19:03:44 -0000 1.2 @@ -0,0 +1 @@ +bb007603c723eddd6ccb007cc5f01cd6 SMC_music_4.0_high.zip

15 years, 9 months

1
0
0 / 0

rpms/smc-music/F-9 dochelper.pl, NONE, 1.1 smc-music.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

by jwrdegoede

Author: jwrdegoede Update of /cvs/free/rpms/smc-music/F-9 In directory se02.es.rpmfusion.net:/tmp/cvs-serv17450 Modified Files: .cvsignore sources Added Files: dochelper.pl smc-music.spec Log Message: * Fri Jul 25 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 4.0-2 - Release bump for rpmfusion --- NEW FILE dochelper.pl --- #!/usr/bin/perl # # Helper script to cleanup the scattered mess of text files in the SMC data # path - to avoid overloading the spec file making it unreadable. It preserves # the contents of those text files into a single credits file which gets # installed in a sane location # use strict; # File name my $LICFILE = "credits.txt"; # Prefix to installed location my $PREFIX = "/usr/share/smc"; # Starting directory my $STARTDIR = "data"; # Open credits file open (LIC, ">$LICFILE"); print LIC "# Generated automatically by dochelper.pl in the smc RPM.\n\n"; print LIC "Additional licenses and credits for Secret Mayro Chronicles.\n"; print LIC "------------------------------------------------------------\n\n"; close (LIC); &traverse($STARTDIR); exit 0; sub traverse { my $cwd = $_[0]; system("cd $cwd"); opendir(DIR, $cwd); my @entries = readdir(DIR); closedir(DIR); foreach my $entry (@entries) { # Don't recurse current or parent next if $entry eq '.'; next if $entry eq '..'; # If it's a dir, recurse. if (-d "$cwd/$entry") {&traverse("$cwd/$entry");} # Filter out none text files. next if ($entry !~ m/^.*txt/g); # Skip txt files in this dir because they are configs if ($cwd ne 'data/levels') { if ($entry eq 'all.txt') { system("echo \"$PREFIX/$cwd/\*\" >> $LICFILE ; cat $cwd/all.txt >> $LICFILE ; echo \"\n\" >> $LICFILE; rm -f $cwd/all.txt"); } else { my $ext = $entry; my $match = 0; $ext =~ s/\.txt/\.ogg/g; if (-e "$cwd/$ext") { system("echo \"$PREFIX/$cwd/$ext\" >> $LICFILE"); $match = 1;} $ext =~ s/\.ogg/\.ttf/g; if (-e "$cwd/$ext") { system("echo \"$PREFIX/$cwd/$ext\" >> $LICFILE"); $match = 1;} $ext =~ s/\.ttf/\.png/g; if (-e "$cwd/$ext") { system("echo \"$PREFIX/$cwd/$ext\" >> $LICFILE"); $match = 1;} if ($match == 0) { system("echo \"$PREFIX/$cwd/$entry\" >> $LICFILE"); } system("cat $cwd/$entry >> $LICFILE ; echo \"\n\" >> $LICFILE ; rm -f $cwd/$entry"); } } } } --- NEW FILE smc-music.spec --- %define datapath %{_datadir}/smc/ Name: smc-music Version: 4.0 Release: 2%{?dist} Summary: Additional music for Secret Maryo Chronicles Group: Amusements/Games License: GPLv3 URL: http://www.secretmaryo.org Source0: http://dl.sf.net/smclone/SMC_music_%{version}_high.zip Source1: dochelper.pl BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: smc >= 0.99.7 %description Additional music for the game Secret Maryo Chronicles %prep %setup -qc #Fix EOL chars sed -i 's/\r//' docs/license.txt %build # Generate the credit list from lots of little text files scattered around the # installation. Very messy! A helper script is used to avoid over-complicating # the spec. Additional processing is done on the credits to strip 'data/' from # the paths because the installation location is now different and it's far # simpler that altering dochelper.pl cp %{SOURCE1} . && perl dochelper.pl sed -i 's/\r//' credits.txt sed -i 's|data/||g' credits.txt %install rm -rf %{buildroot} mkdir -p %{buildroot}%{datapath}/music/{game,land,overworld,story} install -pm0644 data/music/game/*.ogg %{buildroot}%{datapath}/music/game install -pm0644 data/music/land/*.ogg %{buildroot}%{datapath}/music/land install -pm0644 data/music/overworld/*.ogg %{buildroot}%{datapath}/music/overworld install -pm0644 data/music/story/*.ogg %{buildroot}%{datapath}/music/story %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %{datapath}/music/*/*.ogg # Note this dir is intentionally owned by this rpm and not smc as smc doesn't # have it by default. %dir %{datapath}/music/story %doc credits.txt docs/license.txt %changelog * Fri Jul 25 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 4.0-2 - Release bump for rpmfusion * Wed Aug 08 2007 Ian Chapman <packages(a)amiga-hardware.com> 4.0-1 - Upgrade to 4.0 - Changed license field due to match new guidelines * Sat Jun 02 2007 Ian Chapman <packages(a)amiga-hardware.com> 3.1-2 - Minor changes due to new data location in smc * Fri Oct 06 2006 Ian Chapman <packages(a)amiga-hardware.com> 3.1-1 - Upgrade to 3.1 * Sun Jul 09 2006 Ian Chapman <packages(a)amiga-hardware.com> 3.0-2 - Corrected EOL chars in credits.txt - Removed redundant params from %%setup * Sun Jun 25 2006 Ian Chapman <packages(a)amiga-hardware.com> 3.0-1 - Initial Release Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/smc-music/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Jun 2008 13:49:36 -0000 1.1 +++ .cvsignore 25 Jul 2008 19:03:34 -0000 1.2 @@ -0,0 +1 @@ +SMC_music_4.0_high.zip Index: sources =================================================================== RCS file: /cvs/free/rpms/smc-music/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Jun 2008 13:49:36 -0000 1.1 +++ sources 25 Jul 2008 19:03:34 -0000 1.2 @@ -0,0 +1 @@ +bb007603c723eddd6ccb007cc5f01cd6 SMC_music_4.0_high.zip

15 years, 9 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits July 2008