1.1 --- a/mjpegtools/mjpegtools.spec Fri Mar 11 21:30:26 2011 +0100
1.2 +++ b/mjpegtools/mjpegtools.spec Fri Mar 11 21:36:51 2011 +0100
1.3 @@ -1,29 +1,27 @@
1.4 Name: mjpegtools
1.5 +Summary: Tools to manipulate MPEG data
1.6 +Vendor: Europalab Software
1.7 +Packager: Michael Schloh von Bennewitz
1.8 +Distribution: MeeGo Thirdparty
1.9 Version: 1.9.0
1.10 -Release: 3%{?dist}
1.11 -Summary: Tools to manipulate MPEG data
1.12 -
1.13 +Release: 20101201
1.14 Group: Applications/Multimedia
1.15 License: GPLv2
1.16 URL: http://mjpeg.sourceforge.net/
1.17 -Source0: http://downloads.sourceforge.net/mjpeg/%{name}-%{version}.tar.gz
1.18 +Source0: http://downloads.sourceforge.net/mjpeg/%{version}/%{name}-%{version}.tar.gz
1.19 Patch0: %{name}-1.9.0rc1-anytovcd-ffmpegver.patch
1.20 Patch1: mjpegtools-1.9.0-gcc44.patch
1.21 Patch2: mjpegtools-1.9.0-png-memleak.patch
1.22 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
1.23 -
1.24 -BuildRequires: libjpeg-devel
1.25 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
1.26 BuildRequires: nasm
1.27 BuildRequires: libdv-devel
1.28 -BuildRequires: SDL-devel >= 1.1.3
1.29 +BuildRequires: libjpeg-devel
1.30 +BuildRequires: libquicktime-devel
1.31 +BuildRequires: libpng-devel
1.32 +BuildRequires: SDL-devel
1.33 BuildRequires: SDL_gfx-devel
1.34 -BuildRequires: libquicktime-devel >= 0.9.8
1.35 -BuildRequires: libpng-devel
1.36 -BuildRequires: gtk2-devel >= 2.4.0
1.37 Requires: %{name}-libs = %{version}-%{release}
1.38 -# mencoder for lav2avi.sh
1.39 Requires: mencoder
1.40 -# ffmpeg main package, y4mscaler and which for anytovcd.sh
1.41 Requires: ffmpeg
1.42 Requires: y4mscaler
1.43 Requires: which
1.44 @@ -33,33 +31,28 @@
1.45 %description
1.46 The mjpeg programs are a set of tools that can do recording of videos
1.47 and playback, simple cut-and-paste editing and the MPEG compression of
1.48 -audio and video under Linux. This package contains mjpegtools console
1.49 -utilities.
1.50 -
1.51 -%package gui
1.52 -Summary: GUI tools to manipulate MPEG data
1.53 -Group: Applications/Multimedia
1.54 -Requires: %{name} = %{version}-%{release}
1.55 -
1.56 -%description gui
1.57 -The mjpeg programs are a set of tools that can do recording of videos
1.58 -and playback, simple cut-and-paste editing and the MPEG compression of
1.59 -audio and video under Linux. This package contains mjpegtools GUI
1.60 +audio and video under Linux. This package contains mjpegtools console
1.61 utilities.
1.62
1.63 %package libs
1.64 Summary: Libraries used by mjpegtools
1.65 +Vendor: Europalab Software
1.66 +Packager: Michael Schloh von Bennewitz
1.67 +Distribution: MeeGo Thirdparty
1.68 Group: System Environment/Libraries
1.69 Requires: libquicktime >= 0.9.8
1.70
1.71 %description libs
1.72 The mjpeg programs are a set of tools that can do recording of videos
1.73 and playback, simple cut-and-paste editing and the MPEG compression of
1.74 -audio and video under Linux. This package contains libraries used by
1.75 +audio and video under Linux. This package contains libraries used by
1.76 mjpegtools.
1.77
1.78 %package devel
1.79 Summary: Development files for mjpegtools libraries
1.80 +Vendor: Europalab Software
1.81 +Packager: Michael Schloh von Bennewitz
1.82 +Distribution: MeeGo Thirdparty
1.83 Group: Development/Libraries
1.84 Requires: %{name}-libs = %{version}-%{release}
1.85 Requires: pkgconfig
1.86 @@ -67,77 +60,41 @@
1.87 %description devel
1.88 The mjpeg programs are a set of tools that can do recording of videos
1.89 and playback, simple cut-and-paste editing and the MPEG compression of
1.90 -audio and video under Linux. This package contains development files
1.91 +audio and video under Linux. This package contains development files
1.92 for building applications that use mjpegtools libraries.
1.93
1.94 -
1.95 %prep
1.96 %setup -q
1.97 %patch0 -p1
1.98 %patch1 -p1
1.99 %patch2 -p1
1.100 sed -i -e 's/ARCHFLAGS=.*/ARCHFLAGS=/' configure*
1.101 -sed -i -e 's|/lib /usr/lib|/%{_lib} %{_libdir}|' configure # lib64 rpaths
1.102 -for f in docs/yuvfps.1 ; do
1.103 - iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
1.104 -done
1.105 -
1.106 +sed -i -e 's|/lib /usr/lib|/%{_lib} %{_libdir}|' configure
1.107
1.108 %build
1.109 -%configure --disable-dependency-tracking --disable-static
1.110 -make # %{?_smp_mflags}
1.111 -
1.112 +%configure
1.113 +make %{?_smp_mflags}
1.114
1.115 %install
1.116 rm -rf $RPM_BUILD_ROOT
1.117 make install DESTDIR=$RPM_BUILD_ROOT
1.118 -rm -f $RPM_BUILD_ROOT{%{_infodir}/dir,%{_libdir}/lib*.la}
1.119 -# too broken/outdated to be useful in 1.[89].0 (and would come with dep chain)
1.120 +rm -f $RPM_BUILD_ROOT%{_infodir}/dir
1.121 rm -f $RPM_BUILD_ROOT%{_bindir}/mpegtranscode
1.122
1.123 -
1.124 %clean
1.125 rm -rf $RPM_BUILD_ROOT
1.126
1.127 -
1.128 %post libs -p /sbin/ldconfig
1.129
1.130 %postun libs -p /sbin/ldconfig
1.131
1.132 -%post
1.133 -/sbin/install-info %{_infodir}/mjpeg-howto.info %{_infodir}/dir || :
1.134 -
1.135 -%preun
1.136 -[ $1 -eq 0 ] && \
1.137 -/sbin/install-info --delete %{_infodir}/mjpeg-howto.info %{_infodir}/dir || :
1.138 -
1.139 -
1.140 %files
1.141 %defattr(-,root,root,-)
1.142 %doc COPYING CHANGES ChangeLog AUTHORS BUGS README.lavpipe NEWS TODO
1.143 %{_bindir}/*
1.144 -%exclude %{_bindir}/glav
1.145 -%exclude %{_bindir}/lavplay
1.146 -%exclude %{_bindir}/y4mhist
1.147 -%exclude %{_bindir}/yuvplay
1.148 %{_mandir}/man1/*.1*
1.149 -%exclude %{_mandir}/man1/lavplay.1*
1.150 -%exclude %{_mandir}/man1/yuvplay.1*
1.151 %{_mandir}/man5/yuv4mpeg.5*
1.152 -%{_infodir}/mjpeg-howto.info*
1.153 -
1.154 -%files gui
1.155 -%defattr(-,root,root,-)
1.156 -%doc README.glav
1.157 -%{_bindir}/glav
1.158 -# lavplay and yuvplay won't save -libs/console util users from X11 and SDL
1.159 -# dependencies as long as liblavplay is in -libs, but they're inherently
1.160 -# GUI tools -> include them here
1.161 -%{_bindir}/lavplay
1.162 -%{_bindir}/y4mhist
1.163 -%{_bindir}/yuvplay
1.164 -%{_mandir}/man1/lavplay.1*
1.165 -%{_mandir}/man1/yuvplay.1*
1.166 +%{_infodir}/mjpeg-howto.info.gz
1.167
1.168 %files libs
1.169 %defattr(-,root,root,-)
1.170 @@ -147,13 +104,17 @@
1.171 %files devel
1.172 %defattr(-,root,root,-)
1.173 %{_includedir}/%{name}
1.174 +%{_libdir}/lib*.a
1.175 +%{_libdir}/lib*.la
1.176 %{_libdir}/lib*.so
1.177 %{_libdir}/pkgconfig/%{name}.pc
1.178
1.179 +%changelog
1.180 +* Wed Dec 1 2010 Michael Schloh von Bennewitz <michael@schloh.com> - 1.9.0-20101201
1.181 +- Adjust packaging and patch logic
1.182
1.183 -%changelog
1.184 * Mon Nov 1 2010 Kozinov Ivan <kozinov@gmail.com> - 1.9.0-3
1.185 -- Build for MeeGo 1.1
1.186 +- Package for MeeGo 1.1
1.187
1.188 * Fri Sep 3 2010 Hans de Goede <j.w.r.degoede@hhs.nl> 1.9.0-2
1.189 - Fix a memleak which is causing issues for LiVES
