rpms/ffmpeg/EL-6 .cvsignore, 1.24, 1.25 ffmpeg.spec, 1.44, 1.45 sources, 1.24, 1.25
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ffmpeg/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv466/EL-6
Modified Files:
.cvsignore ffmpeg.spec sources
Log Message:
Sync Fedora devel and EL
Introduce FFmpeg in EL6
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/EL-6/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore 12 Jun 2011 21:29:58 -0000 1.24
+++ .cvsignore 1 May 2012 12:48:12 -0000 1.25
@@ -1 +1 @@
-ffmpeg-oldabi-20110612.tar.bz2
+ffmpeg-0.10.2.tar.bz2
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/EL-6/ffmpeg.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ffmpeg.spec 12 Jun 2011 21:29:58 -0000 1.44
+++ ffmpeg.spec 1 May 2012 12:48:12 -0000 1.45
@@ -1,13 +1,18 @@
# TODO: add make test to %%check section
-%global branch oldabi-
-%global date 20110612
+#global branch oldabi-
+#global date 20110612
#global rel rc1
+%if 0%{?rhel}
+%global _without_vpx 1
+%global _without_celt 1
+%endif
+
Summary: Digital VCR and streaming server
Name: ffmpeg
-Version: 0.7
-Release: 0.2.%{?date}%{?date:git}%{?rel}%{?dist}
+Version: 0.10.2
+Release: 3%{?date}%{?date:git}%{?rel}%{?dist}
%if 0%{?_with_amr:1}
License: GPLv3+
%else
@@ -18,31 +23,48 @@
%if 0%{?date}
Source0: ffmpeg-%{?branch}%{date}.tar.bz2
%else
-Source0: http://ffmpeg.org/releases/ffmpeg-%{version}-%{rel}.tar.bz2
+Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.bz2
%endif
Source1: ffmpeg-snapshot-oldabi.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: %{name}-libs = %{version}-%{release}
BuildRequires: bzip2-devel
-BuildRequires: dirac-devel
+%{!?_without_celt:BuildRequires: celt-devel}
+%{?_with_dirac:BuildRequires: dirac-devel}
%{?_with_faac:BuildRequires: faac-devel}
+BuildRequires: freetype-devel
+%{?_with_frei0r:BuildRequires: frei0r-devel}
+BuildRequires: gnutls-devel
BuildRequires: gsm-devel
-BuildRequires: lame-devel
+BuildRequires: lame-devel >= 3.98.3
+%{?_with_jack:BuildRequires: jack-audio-connection-kit-devel}
+BuildRequires: libass-devel
+%{!?_without_cdio:BuildRequires: libcdio-devel}
+#libcrystalhd is currently broken
+%{?_with_crystalhd:BuildRequires: libcrystalhd-devel}
BuildRequires: libdc1394-devel
+Buildrequires: libmodplug-devel
BuildRequires: librtmp-devel
BuildRequires: libtheora-devel
-BuildRequires: libva-devel >= 0.31.0
+BuildRequires: libv4l-devel
+%{?!_without_vaapi:BuildRequires: libva-devel >= 0.31.0}
BuildRequires: libvdpau-devel
BuildRequires: libvorbis-devel
-BuildRequires: libvpx-devel >= 0.9.1
-%{?_with_amr:BuildRequires: opencore-amr-devel}
+%{?!_without_vpx:BuildRequires: libvpx-devel >= 0.9.1}
+%ifarch %{ix86} x86_64
+BuildRequires: libXvMC-devel
+%endif
+%{?_with_amr:BuildRequires: opencore-amr-devel vo-amrwbenc-devel}
+%{!?_without_openal:BuildRequires: openal-soft-devel}
+%{?_with_opencv:BuildRequires: opencv-devel}
BuildRequires: openjpeg-devel
+%{!?_without_pulse:BuildRequires: pulseaudio-libs-devel}
BuildRequires: schroedinger-devel
BuildRequires: SDL-devel
BuildRequires: speex-devel
BuildRequires: subversion
BuildRequires: texi2html
-%{!?_without_x264:BuildRequires: x264-devel >= 0.0.0-0.29}
+%{!?_without_x264:BuildRequires: x264-devel >= 0.0.0-0.31}
BuildRequires: xvidcore-devel
BuildRequires: zlib-devel
%ifarch %{ix86} x86_64
@@ -50,7 +72,7 @@
%endif
%description
-FFMpeg is a complete and free Internet live audio and video
+FFmpeg is a complete and free Internet live audio and video
broadcasting solution for Linux/Unix. It also includes a digital
VCR. It can encode in real time in many formats including MPEG1 audio
and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash.
@@ -60,7 +82,7 @@
Group: System Environment/Libraries
%description libs
-FFMpeg is a complete and free Internet live audio and video
+FFmpeg is a complete and free Internet live audio and video
broadcasting solution for Linux/Unix. It also includes a digital
VCR. It can encode in real time in many formats including MPEG1 audio
and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash.
@@ -69,11 +91,11 @@
%package devel
Summary: Development package for %{name}
Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{_isa} = %{version}-%{release}
Requires: pkgconfig
%description devel
-FFMpeg is a complete and free Internet live audio and video
+FFmpeg is a complete and free Internet live audio and video
broadcasting solution for Linux/Unix. It also includes a digital
VCR. It can encode in real time in many formats including MPEG1 audio
and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash.
@@ -83,26 +105,38 @@
../configure \\\
--prefix=%{_prefix} \\\
--bindir=%{_bindir} \\\
- --datadir=%{_datadir}/ffmpeg \\\
- --incdir=%{_includedir}/ffmpeg \\\
+ --datadir=%{_datadir}/%{name} \\\
+ --incdir=%{_includedir}/%{name} \\\
--libdir=%{_libdir} \\\
--mandir=%{_mandir} \\\
--arch=%{_target_cpu} \\\
--extra-cflags="$RPM_OPT_FLAGS" \\\
- %{?_with_amr:--enable-libopencore-amrnb --enable-libopencore-amrwb --enable-version3} \\\
+ %{?_with_amr:--enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libvo-amrwbenc --enable-version3} \\\
--enable-bzlib \\\
+ %{!?_with_crystalhd:--disable-crystalhd} \\\
+ %{?_with_frei0r:--enable-frei0r} \\\
+ --enable-gnutls \\\
+ --enable-libass \\\
+ %{!?_without_cdio:--enable-libcdio} \\\
+ %{!?_without_celt:--enable-libcelt} \\\
--enable-libdc1394 \\\
- --enable-libdirac \\\
+ %{?_with_dirac:--enable-libdirac} \\\
%{?_with_faac:--enable-libfaac --enable-nonfree} \\\
+ %{!?_with_jack:--disable-indev=jack} \\\
+ --enable-libfreetype \\\
--enable-libgsm \\\
--enable-libmp3lame \\\
+ %{!?_without_openal:--enable-openal} \\\
+ %{?_with_opencv:--enable-libopencv} \\\
--enable-libopenjpeg \\\
+ %{!?_without_pulse:--enable-libpulse} \\\
--enable-librtmp \\\
--enable-libschroedinger \\\
--enable-libspeex \\\
--enable-libtheora \\\
--enable-libvorbis \\\
- --enable-libvpx \\\
+ --enable-libv4l2 \\\
+ %{!?_without_vpx:--enable-libvpx} \\\
%{!?_without_x264:--enable-libx264} \\\
--enable-libxvid \\\
--enable-x11grab \\\
@@ -121,7 +155,7 @@
%setup -q -n ffmpeg-%{?branch}%{date}
echo "git-snapshot-%{?branch}%{date}-RPMFusion" > VERSION
%else
-%setup -q -n ffmpeg-%{version}-%{rel}
+%setup -q -n ffmpeg-%{version}
%endif
%build
@@ -153,6 +187,12 @@
%ifarch sparc sparc64
--disable-vis \
%endif
+%ifarch %{arm}
+ --disable-runtime-cpudetect --arch=arm \
+%ifnarch armv7hnl
+ --disable-neon \
+%endif
+%endif
%endif
make %{?_smp_mflags}
@@ -181,9 +221,9 @@
rm -rf $RPM_BUILD_ROOT
pushd generic
make install DESTDIR=$RPM_BUILD_ROOT
-install -pm755 tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
popd
%if 0%{!?ffmpegsuffix:1}
+install -pm755 generic/tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
pushd simd
%ifarch sparc sparc64
make install DESTDIR=$RPM_BUILD_ROOT
@@ -202,7 +242,7 @@
%if 0%{!?ffmpegsuffix:1}
%files
%defattr(-,root,root,-)
-%doc COPYING.* CREDITS Changelog README doc/ffserver.conf
+%doc COPYING.* CREDITS README doc/ffserver.conf
%{_bindir}/ffmpeg
%{_bindir}/ffplay
%{_bindir}/ffprobe
@@ -226,7 +266,7 @@
%files devel
%defattr(-,root,root,-)
-%doc MAINTAINERS doc/APIchanges doc/TODO doc/*.txt
+%doc MAINTAINERS doc/APIchanges doc/*.txt
%{_includedir}/ffmpeg
%{_libdir}/pkgconfig/lib*.pc
%{_libdir}/lib*.so
@@ -238,6 +278,61 @@
%changelog
+* Tue May 01 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.10.2-3
+- Sync with ffmpeg-compat and EL
+- Add BR libmodplug-devel
+- Enable libass openal-soft
+
+* Tue Apr 10 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.10.2-2
+- Explicitely disable neon unless armv7hnl
+
+* Sun Mar 18 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.10.2-1
+- Updated to 0.10.2
+
+* Mon Mar 12 2012 root - 0.10-2
+- Rebuilt for x264 ABI 0.120
+
+* Sun Feb 19 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.10-1
+- Update to 0.10
+- Disable dirac by default - rfbz#1946
+- Enabled by default: libv4l2 gnutls
+- New RPM Conditionals:
+ --with crystalhd dirac jack frei0r openal opencv
+ --without celt cdio pulse
+
+* Wed Feb 01 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.8.9-1
+- Update to 0.8.9
+- Add BR libass-devel
+- Rebuilt for libvpx
+
+* Mon Jan 09 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.8.8-1
+- Update to 0.8.8
+
+* Wed Dec 21 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.8.7-1
+- Update to 0.8.7
+
+* Fri Oct 28 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.8.5-2
+- Fix for glibc bug rhbz#747377
+
+* Sun Oct 23 2011 Dominik Mierzejewski <rpm at greysector.net> - 0.8.5-1
+- update to 0.8.5
+
+* Fri Sep 23 2011 Dominik Mierzejewski <rpm at greysector.net> - 0.8.4-1
+- update to 0.8.4
+- fix FFmpeg name spelling
+
+* Mon Aug 22 2011 Dominik Mierzejewski <rpm at greysector.net> - 0.8.2-1
+- update to 0.8.2
+- enable CELT decoding via libcelt
+- support AMR WB encoding via libvo-amrwbenc (optional)
+- enable FreeType support
+
+* Thu Jul 14 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.7.1-1
+- Update to 0.7.1
+
+* Fri Jul 01 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.7-0.3.20110612git
+- Add XvMC in ffmpeg
+
* Sun Jun 12 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.7-0.2.20110612git
- Update to 20110612git from oldabi branch
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/EL-6/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources 12 Jun 2011 21:29:58 -0000 1.24
+++ sources 1 May 2012 12:48:12 -0000 1.25
@@ -1 +1 @@
-881aca23a4e13a7eb3207d98a1e38643 ffmpeg-oldabi-20110612.tar.bz2
+de1bd5fc4bbf3ef730a5361ee596fedd ffmpeg-0.10.2.tar.bz2
11 years, 12 months
rpms/minidlna/F-16 minidlna-tmpfiles.conf, NONE, 1.1 .cvsignore, 1.4, 1.5 minidlna.spec, 1.3, 1.4 sources, 1.4, 1.5
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/minidlna/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv29296
Modified Files:
.cvsignore minidlna.spec sources
Added Files:
minidlna-tmpfiles.conf
Log Message:
* Wed Apr 25 2012 Andrea Musuruane <musuruan(a)gmail.com> 1.0.24-2
- Run the daemon with the minidlna user (BZ #2294)
- Updated Debian man pages
--- NEW FILE minidlna-tmpfiles.conf ---
d /var/run/minidlna 755 minidlna minidlna
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/minidlna/F-16/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 19 Feb 2012 12:08:00 -0000 1.4
+++ .cvsignore 1 May 2012 10:41:36 -0000 1.5
@@ -1,2 +1,2 @@
minidlna_1.0.24_src.tar.gz
-minidlna-1.0.21-debian-manpages.tar.gz
+minidlna-1.0.24-debian-manpages.tar.gz
Index: minidlna.spec
===================================================================
RCS file: /cvs/free/rpms/minidlna/F-16/minidlna.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- minidlna.spec 19 Feb 2012 12:08:00 -0000 1.3
+++ minidlna.spec 1 May 2012 10:41:36 -0000 1.4
@@ -1,6 +1,6 @@
Name: minidlna
Version: 1.0.24
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Lightweight DLNA/UPnP-AV server targeted at embedded systems
Group: System Environment/Daemons
@@ -10,7 +10,9 @@
# Systemd unit file
Source1: %{name}.service
# Debian man pages
-Source2: %{name}-1.0.21-debian-manpages.tar.gz
+Source2: %{name}-1.0.24-debian-manpages.tar.gz
+# tmpfiles.d configuration for the /var/run directory
+Source3: %{name}-tmpfiles.conf
BuildRequires: libuuid-devel
BuildRequires: ffmpeg-devel
@@ -47,6 +49,12 @@
# Verbose Makefile
sed -i 's/@$(CC)/$(CC)/' Makefile
+# Edit the default config file to run the daemon with the minidlna user
+sed -i 's/#db_dir=\/var\/cache\/minidlna/db_dir=\/var\/cache\/minidlna/' \
+ %{name}.conf
+sed -i 's/#log_dir=\/var\/log/log_dir=\/var\/log\/minidlna/' \
+ %{name}.conf
+
%build
export CFLAGS="%{optflags}"
@@ -84,6 +92,18 @@
done
popd
+# Install tmpfiles.d
+mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d
+install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
+mkdir -p %{buildroot}%{_localstatedir}/run/
+install -d -m 0755 %{buildroot}%{_localstatedir}/run/%{name}/
+
+# Create cache and log directories
+mkdir -p %{buildroot}%{_localstatedir}/cache
+install -d -m 0755 %{buildroot}%{_localstatedir}/cache/%{name}/
+mkdir -p %{buildroot}%{_localstatedir}/log
+install -d -m 0755 %{buildroot}%{_localstatedir}/log/%{name}/
+
%find_lang %{name}
@@ -119,15 +139,23 @@
%files -f %{name}.lang
-%attr(-,minidlna,minidlna)%config(noreplace) %{_sysconfdir}/minidlna.conf
+%attr(-,minidlna,minidlna) %config(noreplace) %{_sysconfdir}/minidlna.conf
%{_sbindir}/minidlna
%{_unitdir}/minidlna.service
%{_mandir}/man1/%{name}.1*
%{_mandir}/man5/%{name}.conf.5*
+%dir %attr(-,minidlna,minidlna) %{_localstatedir}/run/%{name}
+%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
+%dir %attr(-,minidlna,minidlna) %{_localstatedir}/cache/%{name}/
+%dir %attr(-,minidlna,minidlna) %{_localstatedir}/log/%{name}/
%doc LICENCE LICENCE.miniupnpd NEWS README TODO
%changelog
+* Wed Apr 25 2012 Andrea Musuruane <musuruan(a)gmail.com> 1.0.24-2
+- Run the daemon with the minidlna user (BZ #2294)
+- Updated Debian man pages
+
* Sun Feb 19 2012 Andrea Musuruane <musuruan(a)gmail.com> 1.0.24-1
- Updated to upstream 1.0.24
Index: sources
===================================================================
RCS file: /cvs/free/rpms/minidlna/F-16/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 19 Feb 2012 12:08:00 -0000 1.4
+++ sources 1 May 2012 10:41:36 -0000 1.5
@@ -1,2 +1,2 @@
be9b4c91e3fcde592dc3f9828098ca0f minidlna_1.0.24_src.tar.gz
-34a13ba9d1edf066c1884947633dfa33 minidlna-1.0.21-debian-manpages.tar.gz
+2b0eae77aa45ef7f72d7ead1b45e857f minidlna-1.0.24-debian-manpages.tar.gz
11 years, 12 months
rpms/minidlna/F-17 minidlna-tmpfiles.conf, NONE, 1.1 .cvsignore, 1.4, 1.5 minidlna.spec, 1.3, 1.4 sources, 1.4, 1.5
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/minidlna/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv29152
Modified Files:
.cvsignore minidlna.spec sources
Added Files:
minidlna-tmpfiles.conf
Log Message:
* Wed Apr 25 2012 Andrea Musuruane <musuruan(a)gmail.com> 1.0.24-2
- Run the daemon with the minidlna user (BZ #2294)
- Updated Debian man pages
--- NEW FILE minidlna-tmpfiles.conf ---
d /var/run/minidlna 755 minidlna minidlna
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/minidlna/F-17/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 19 Feb 2012 12:07:30 -0000 1.4
+++ .cvsignore 1 May 2012 10:40:53 -0000 1.5
@@ -1,2 +1,2 @@
minidlna_1.0.24_src.tar.gz
-minidlna-1.0.21-debian-manpages.tar.gz
+minidlna-1.0.24-debian-manpages.tar.gz
Index: minidlna.spec
===================================================================
RCS file: /cvs/free/rpms/minidlna/F-17/minidlna.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- minidlna.spec 19 Feb 2012 12:07:30 -0000 1.3
+++ minidlna.spec 1 May 2012 10:40:55 -0000 1.4
@@ -1,6 +1,6 @@
Name: minidlna
Version: 1.0.24
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Lightweight DLNA/UPnP-AV server targeted at embedded systems
Group: System Environment/Daemons
@@ -10,7 +10,9 @@
# Systemd unit file
Source1: %{name}.service
# Debian man pages
-Source2: %{name}-1.0.21-debian-manpages.tar.gz
+Source2: %{name}-1.0.24-debian-manpages.tar.gz
+# tmpfiles.d configuration for the /var/run directory
+Source3: %{name}-tmpfiles.conf
BuildRequires: libuuid-devel
BuildRequires: ffmpeg-devel
@@ -47,6 +49,12 @@
# Verbose Makefile
sed -i 's/@$(CC)/$(CC)/' Makefile
+# Edit the default config file to run the daemon with the minidlna user
+sed -i 's/#db_dir=\/var\/cache\/minidlna/db_dir=\/var\/cache\/minidlna/' \
+ %{name}.conf
+sed -i 's/#log_dir=\/var\/log/log_dir=\/var\/log\/minidlna/' \
+ %{name}.conf
+
%build
export CFLAGS="%{optflags}"
@@ -84,6 +92,18 @@
done
popd
+# Install tmpfiles.d
+mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d
+install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
+mkdir -p %{buildroot}%{_localstatedir}/run/
+install -d -m 0755 %{buildroot}%{_localstatedir}/run/%{name}/
+
+# Create cache and log directories
+mkdir -p %{buildroot}%{_localstatedir}/cache
+install -d -m 0755 %{buildroot}%{_localstatedir}/cache/%{name}/
+mkdir -p %{buildroot}%{_localstatedir}/log
+install -d -m 0755 %{buildroot}%{_localstatedir}/log/%{name}/
+
%find_lang %{name}
@@ -119,15 +139,23 @@
%files -f %{name}.lang
-%attr(-,minidlna,minidlna)%config(noreplace) %{_sysconfdir}/minidlna.conf
+%attr(-,minidlna,minidlna) %config(noreplace) %{_sysconfdir}/minidlna.conf
%{_sbindir}/minidlna
%{_unitdir}/minidlna.service
%{_mandir}/man1/%{name}.1*
%{_mandir}/man5/%{name}.conf.5*
+%dir %attr(-,minidlna,minidlna) %{_localstatedir}/run/%{name}
+%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
+%dir %attr(-,minidlna,minidlna) %{_localstatedir}/cache/%{name}/
+%dir %attr(-,minidlna,minidlna) %{_localstatedir}/log/%{name}/
%doc LICENCE LICENCE.miniupnpd NEWS README TODO
%changelog
+* Wed Apr 25 2012 Andrea Musuruane <musuruan(a)gmail.com> 1.0.24-2
+- Run the daemon with the minidlna user (BZ #2294)
+- Updated Debian man pages
+
* Sun Feb 19 2012 Andrea Musuruane <musuruan(a)gmail.com> 1.0.24-1
- Updated to upstream 1.0.24
Index: sources
===================================================================
RCS file: /cvs/free/rpms/minidlna/F-17/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 19 Feb 2012 12:07:30 -0000 1.4
+++ sources 1 May 2012 10:40:55 -0000 1.5
@@ -1,2 +1,2 @@
be9b4c91e3fcde592dc3f9828098ca0f minidlna_1.0.24_src.tar.gz
-34a13ba9d1edf066c1884947633dfa33 minidlna-1.0.21-debian-manpages.tar.gz
+2b0eae77aa45ef7f72d7ead1b45e857f minidlna-1.0.24-debian-manpages.tar.gz
11 years, 12 months
rpms/minidlna/devel minidlna-tmpfiles.conf, NONE, 1.1 .cvsignore, 1.4, 1.5 minidlna.spec, 1.3, 1.4 sources, 1.4, 1.5
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/minidlna/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28975
Modified Files:
.cvsignore minidlna.spec sources
Added Files:
minidlna-tmpfiles.conf
Log Message:
* Wed Apr 25 2012 Andrea Musuruane <musuruan(a)gmail.com> 1.0.24-2
- Run the daemon with the minidlna user (BZ #2294)
- Updated Debian man pages
--- NEW FILE minidlna-tmpfiles.conf ---
d /var/run/minidlna 755 minidlna minidlna
Index: minidlna.spec
===================================================================
RCS file: /cvs/free/rpms/minidlna/devel/minidlna.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- minidlna.spec 19 Feb 2012 12:06:48 -0000 1.3
+++ minidlna.spec 1 May 2012 10:39:24 -0000 1.4
@@ -1,6 +1,6 @@
Name: minidlna
Version: 1.0.24
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Lightweight DLNA/UPnP-AV server targeted at embedded systems
Group: System Environment/Daemons
@@ -10,7 +10,9 @@
# Systemd unit file
Source1: %{name}.service
# Debian man pages
-Source2: %{name}-1.0.21-debian-manpages.tar.gz
+Source2: %{name}-1.0.24-debian-manpages.tar.gz
+# tmpfiles.d configuration for the /var/run directory
+Source3: %{name}-tmpfiles.conf
BuildRequires: libuuid-devel
BuildRequires: ffmpeg-devel
@@ -47,6 +49,12 @@
# Verbose Makefile
sed -i 's/@$(CC)/$(CC)/' Makefile
+# Edit the default config file to run the daemon with the minidlna user
+sed -i 's/#db_dir=\/var\/cache\/minidlna/db_dir=\/var\/cache\/minidlna/' \
+ %{name}.conf
+sed -i 's/#log_dir=\/var\/log/log_dir=\/var\/log\/minidlna/' \
+ %{name}.conf
+
%build
export CFLAGS="%{optflags}"
@@ -84,6 +92,18 @@
done
popd
+# Install tmpfiles.d
+mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d
+install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
+mkdir -p %{buildroot}%{_localstatedir}/run/
+install -d -m 0755 %{buildroot}%{_localstatedir}/run/%{name}/
+
+# Create cache and log directories
+mkdir -p %{buildroot}%{_localstatedir}/cache
+install -d -m 0755 %{buildroot}%{_localstatedir}/cache/%{name}/
+mkdir -p %{buildroot}%{_localstatedir}/log
+install -d -m 0755 %{buildroot}%{_localstatedir}/log/%{name}/
+
%find_lang %{name}
@@ -119,15 +139,23 @@
%files -f %{name}.lang
-%attr(-,minidlna,minidlna)%config(noreplace) %{_sysconfdir}/minidlna.conf
+%attr(-,minidlna,minidlna) %config(noreplace) %{_sysconfdir}/minidlna.conf
%{_sbindir}/minidlna
%{_unitdir}/minidlna.service
%{_mandir}/man1/%{name}.1*
%{_mandir}/man5/%{name}.conf.5*
+%dir %attr(-,minidlna,minidlna) %{_localstatedir}/run/%{name}
+%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
+%dir %attr(-,minidlna,minidlna) %{_localstatedir}/cache/%{name}/
+%dir %attr(-,minidlna,minidlna) %{_localstatedir}/log/%{name}/
%doc LICENCE LICENCE.miniupnpd NEWS README TODO
%changelog
+* Wed Apr 25 2012 Andrea Musuruane <musuruan(a)gmail.com> 1.0.24-2
+- Run the daemon with the minidlna user (BZ #2294)
+- Updated Debian man pages
+
* Sun Feb 19 2012 Andrea Musuruane <musuruan(a)gmail.com> 1.0.24-1
- Updated to upstream 1.0.24
Index: sources
===================================================================
RCS file: /cvs/free/rpms/minidlna/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 19 Feb 2012 12:06:48 -0000 1.4
+++ sources 1 May 2012 10:39:24 -0000 1.5
@@ -1,2 +1,2 @@
be9b4c91e3fcde592dc3f9828098ca0f minidlna_1.0.24_src.tar.gz
-34a13ba9d1edf066c1884947633dfa33 minidlna-1.0.21-debian-manpages.tar.gz
+2b0eae77aa45ef7f72d7ead1b45e857f minidlna-1.0.24-debian-manpages.tar.gz
11 years, 12 months
rpms/fceux/F-16 fceux-2.1.5-datatype-gz.patch, NONE, 1.1 fceux-2.1.5-gcc47.patch, NONE, 1.1 fceux-2.1.5-minizip.patch, NONE, 1.1 fceux-2.1.5-underlink.patch, NONE, 1.1 fceux.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/fceux/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27053/F-16
Modified Files:
.cvsignore sources
Added Files:
fceux-2.1.5-datatype-gz.patch fceux-2.1.5-gcc47.patch
fceux-2.1.5-minizip.patch fceux-2.1.5-underlink.patch
fceux.spec
Log Message:
First import
fceux-2.1.5-datatype-gz.patch:
file.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE fceux-2.1.5-datatype-gz.patch ---
diff -Naur a/fceu2.1.5/src/file.cpp b/fceu2.1.5/src/file.cpp
--- a/fceu2.1.5/src/file.cpp 2010-09-19 00:05:09.000000000 +0000
+++ b/fceu2.1.5/src/file.cpp 2012-03-01 19:21:25.856204727 +0000
@@ -310,7 +310,7 @@
if(magic==0x088b1f) {
// maybe gzip...
- void* gzfile = gzopen(fileToOpen.c_str(),"rb");
+ gzFile gzfile = gzopen(fileToOpen.c_str(),"rb");
if(gzfile) {
delete fp;
fceux-2.1.5-gcc47.patch:
endian.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE fceux-2.1.5-gcc47.patch ---
--- fceu/src/utils/endian.h 2010/11/07 23:33:11 2078
+++ fceu/src/utils/endian.h 2012/04/07 18:33:25 2484
@@ -98,10 +98,10 @@
{
CTASSERT(sizeof(T)==1||sizeof(T)==2||sizeof(T)==4||sizeof(T)==8);
switch(sizeof(T)) {
- case 1: return write8le((uint8*)Bufo,os);
- case 2: return write16le((uint16*)Bufo,os);
- case 4: return write32le((uint32*)Bufo,os);
- case 8: return write64le((uint64*)Bufo,os);
+ case 1: return write8le(*(uint8*)Bufo,os);
+ case 2: return write16le(*(uint16*)Bufo,os);
+ case 4: return write32le(*(uint32*)Bufo,os);
+ case 8: return write64le(*(uint64*)Bufo,os);
default:
return 0;
}
fceux-2.1.5-minizip.patch:
SConstruct | 2 +-
src/file.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE fceux-2.1.5-minizip.patch ---
diff -durN fceu2.1.5.orig/SConstruct fceu2.1.5/SConstruct
--- fceu2.1.5.orig/SConstruct 2011-06-04 07:26:55.000000000 +0200
+++ fceu2.1.5/SConstruct 2012-04-22 17:23:42.728386552 +0200
@@ -55,7 +55,7 @@
env.Append(LIBS = ["rpcrt4", "comctl32", "vfw32", "winmm", "ws2_32", "comdlg32", "ole32", "gdi32", "htmlhelp"])
else:
conf = Configure(env)
- assert conf.CheckLibWithHeader('z', 'zlib.h', 'C', 'inflate;', 1), "please install: zlib"
+ assert conf.CheckLibWithHeader('minizip', 'minizip/unzip.h', 'C', 'unzOpen;', 1), "please install: libminizip"
if not conf.CheckLib('SDL'):
print 'Did not find libSDL or SDL.lib, exiting!'
Exit(1)
diff -durN fceu2.1.5.orig/src/file.cpp fceu2.1.5/src/file.cpp
--- fceu2.1.5.orig/src/file.cpp 2010-09-19 02:05:09.000000000 +0200
+++ fceu2.1.5/src/file.cpp 2012-04-22 17:12:06.870780995 +0200
@@ -36,7 +36,7 @@
#include "utils/endian.h"
#include "utils/memory.h"
#include "utils/md5.h"
-#include "utils/unzip.h"
+#include <minizip/unzip.h>
#include "driver.h"
#include "types.h"
#include "fceu.h"
fceux-2.1.5-underlink.patch:
SConstruct | 4 ++++
1 file changed, 4 insertions(+)
--- NEW FILE fceux-2.1.5-underlink.patch ---
--- SConstruct.org 2011-06-07 21:33:28.876609681 +0200
+++ SConstruct 2011-06-07 21:34:11.420368249 +0200
@@ -70,6 +70,10 @@
env.ParseConfig('pkg-config --cflags --libs gtk+-3.0')
env.Append(CPPDEFINES=["_GTK3"])
env.Append(CCFLAGS = ["-D_GTK"])
+ env.Append(LIBS =["-lz"])
+ env.Append(LIBS =["-ldl"])
+ env.Append(LIBS =["-lX11"])
+
### Lua platform defines
### Applies to all files even though only lua needs it, but should be ok
if env['LUA']:
--- NEW FILE fceux.spec ---
Name: fceux
Version: 2.1.5
Release: 2%{?dist}
Summary: A cross platform, NTSC and PAL Famicom/NES emulator
Group: Applications/Emulators
License: GPLv2+
URL: http://fceux.com/
Source: http://downloads.sourceforge.net/fceultra/%{name}-%{version}.src.tar.bz2
# Fix compiling
# https://bugs.gentoo.org/show_bug.cgi?id=406471
# Upstream SVN rev 2395
Patch0: %{name}-2.1.5-datatype-gz.patch
# Fix underlinking
# https://bugs.gentoo.org/show_bug.cgi?id=367675
# http://sourceforge.net/tracker/?func=detail&aid=3522221&group_id=13536&at...
Patch1: %{name}-2.1.5-underlink.patch
# Use system minizip
# https://sourceforge.net/tracker/?func=detail&aid=3520369&group_id=13536&a...
Patch2: %{name}-2.1.5-minizip.patch
# Fix compiling with GCC 4.7
# Upstream SVN rev 2484
Patch3: %{name}-2.1.5-gcc47.patch
BuildRequires: scons
BuildRequires: SDL-devel >= 1.2.14
BuildRequires: gtk2-devel >= 2.18
BuildRequires: gd-devel
BuildRequires: minizip-devel
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
Provides: fceultra = %{version}-%{release}
Obsoletes: fceultra < 2.0.0
Provides: gfceu = %{version}-%{release}
Obsoletes: gfceu <= 0.6.2
%description
FCEUX is a cross platform, NTSC and PAL Famicom/NES emulator that is an
evolution of the original FCE Ultra emulator. Over time FCE Ultra had
separated into many separate branches.
The concept behind FCEUX is to merge elements from FCE Ultra, FCEU
rerecording, FCEUXD, FCEUXDSP, and FCEU-mm into a single branch of FCEU. As
the X implies, it is an all-encompassing FCEU emulator that gives the best
of all worlds for the casual player, the ROM-hacking community, Lua
Scripters, and the Tool-Assisted Speedrun Community.
%prep
%setup -q -n fceu%{version}
%patch0 -p2
%patch1 -p0
%patch2 -p1
%patch3 -p1
# Remove binary files
rm -rf bin/fceux
rm -rf src/fceux
# Remove bundled LUA library
rm -rf src/lua
sed -i 's/^lua//' src/SConscript
# Remove bundled minizip library
rm -rf src/utils/unzip.*
sed -i 's/^unzip.cpp//' src/utils/SConscript
# Remove default CFLAGS
sed -i 's/^env.Append(CCFLAGS/#env.Append(CCFLAGS/' SConstruct
# Fix end-of-line-encoding
sed -i 's/\r//' Authors.txt changelog.txt TODO-PROJECT \
documentation/Videolog.txt
# Fix icon path in desktop file
sed -i 's/\/usr\/share\/pixmaps\/fceux.png/fceux/' fceux.desktop
%build
export CFLAGS="%{optflags}"
# Disable LUA support
# Enable AVI creation
scons %{?_smp_mflags} \
LUA=0 \
CREATE_AVI=1
%install
# Install binary file
install -d %{buildroot}%{_bindir}
install -p -m 755 src/fceux %{buildroot}%{_bindir}
# Install icon
install -d %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 %{name}.png \
%{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
# Install desktop file
desktop-file-install \
--dir %{buildroot}%{_datadir}/applications \
%{name}.desktop
# Install man page
install -d %{buildroot}%{_mandir}/man6
install -p -m 644 documentation/%{name}.6 \
%{buildroot}%{_mandir}/man6/%{name}.6
%post
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
%{_bindir}/fceux
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_mandir}/man6/%{name}.6*
%doc Authors.txt changelog.txt COPYING README-SDL TODO-PROJECT TODO-SDL
%doc documentation/{cheat.html,faq,todo,Videolog.txt}
%changelog
* Sat Apr 28 2012 Andrea Musuruane <musuruan(a)gmail.com> 2.1.5-2
- Obsoleted gfceu too
- Notified upstream about underlinking
* Sun Apr 22 2012 Andrea Musuruane <musuruan(a)gmail.com> 2.1.5-1
- First release for RPM Fusion
- LUA support is disabled because fceux uses a private header file
- Reused Gentoo and upstream patches
- Made a patch not to use the bundled minizip library
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/fceux/F-16/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 30 Apr 2012 17:44:30 -0000 1.1
+++ .cvsignore 1 May 2012 09:48:48 -0000 1.2
@@ -0,0 +1 @@
+fceux-2.1.5.src.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/fceux/F-16/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 30 Apr 2012 17:44:30 -0000 1.1
+++ sources 1 May 2012 09:48:48 -0000 1.2
@@ -0,0 +1 @@
+e8b20e62bbbb061b1a59d51b47c827bd fceux-2.1.5.src.tar.bz2
11 years, 12 months
rpms/fceux/F-17 fceux-2.1.5-datatype-gz.patch, NONE, 1.1 fceux-2.1.5-gcc47.patch, NONE, 1.1 fceux-2.1.5-minizip.patch, NONE, 1.1 fceux-2.1.5-underlink.patch, NONE, 1.1 fceux.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/fceux/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26725/F-17
Modified Files:
.cvsignore sources
Added Files:
fceux-2.1.5-datatype-gz.patch fceux-2.1.5-gcc47.patch
fceux-2.1.5-minizip.patch fceux-2.1.5-underlink.patch
fceux.spec
Log Message:
First import
fceux-2.1.5-datatype-gz.patch:
file.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE fceux-2.1.5-datatype-gz.patch ---
diff -Naur a/fceu2.1.5/src/file.cpp b/fceu2.1.5/src/file.cpp
--- a/fceu2.1.5/src/file.cpp 2010-09-19 00:05:09.000000000 +0000
+++ b/fceu2.1.5/src/file.cpp 2012-03-01 19:21:25.856204727 +0000
@@ -310,7 +310,7 @@
if(magic==0x088b1f) {
// maybe gzip...
- void* gzfile = gzopen(fileToOpen.c_str(),"rb");
+ gzFile gzfile = gzopen(fileToOpen.c_str(),"rb");
if(gzfile) {
delete fp;
fceux-2.1.5-gcc47.patch:
endian.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE fceux-2.1.5-gcc47.patch ---
--- fceu/src/utils/endian.h 2010/11/07 23:33:11 2078
+++ fceu/src/utils/endian.h 2012/04/07 18:33:25 2484
@@ -98,10 +98,10 @@
{
CTASSERT(sizeof(T)==1||sizeof(T)==2||sizeof(T)==4||sizeof(T)==8);
switch(sizeof(T)) {
- case 1: return write8le((uint8*)Bufo,os);
- case 2: return write16le((uint16*)Bufo,os);
- case 4: return write32le((uint32*)Bufo,os);
- case 8: return write64le((uint64*)Bufo,os);
+ case 1: return write8le(*(uint8*)Bufo,os);
+ case 2: return write16le(*(uint16*)Bufo,os);
+ case 4: return write32le(*(uint32*)Bufo,os);
+ case 8: return write64le(*(uint64*)Bufo,os);
default:
return 0;
}
fceux-2.1.5-minizip.patch:
SConstruct | 2 +-
src/file.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE fceux-2.1.5-minizip.patch ---
diff -durN fceu2.1.5.orig/SConstruct fceu2.1.5/SConstruct
--- fceu2.1.5.orig/SConstruct 2011-06-04 07:26:55.000000000 +0200
+++ fceu2.1.5/SConstruct 2012-04-22 17:23:42.728386552 +0200
@@ -55,7 +55,7 @@
env.Append(LIBS = ["rpcrt4", "comctl32", "vfw32", "winmm", "ws2_32", "comdlg32", "ole32", "gdi32", "htmlhelp"])
else:
conf = Configure(env)
- assert conf.CheckLibWithHeader('z', 'zlib.h', 'C', 'inflate;', 1), "please install: zlib"
+ assert conf.CheckLibWithHeader('minizip', 'minizip/unzip.h', 'C', 'unzOpen;', 1), "please install: libminizip"
if not conf.CheckLib('SDL'):
print 'Did not find libSDL or SDL.lib, exiting!'
Exit(1)
diff -durN fceu2.1.5.orig/src/file.cpp fceu2.1.5/src/file.cpp
--- fceu2.1.5.orig/src/file.cpp 2010-09-19 02:05:09.000000000 +0200
+++ fceu2.1.5/src/file.cpp 2012-04-22 17:12:06.870780995 +0200
@@ -36,7 +36,7 @@
#include "utils/endian.h"
#include "utils/memory.h"
#include "utils/md5.h"
-#include "utils/unzip.h"
+#include <minizip/unzip.h>
#include "driver.h"
#include "types.h"
#include "fceu.h"
fceux-2.1.5-underlink.patch:
SConstruct | 4 ++++
1 file changed, 4 insertions(+)
--- NEW FILE fceux-2.1.5-underlink.patch ---
--- SConstruct.org 2011-06-07 21:33:28.876609681 +0200
+++ SConstruct 2011-06-07 21:34:11.420368249 +0200
@@ -70,6 +70,10 @@
env.ParseConfig('pkg-config --cflags --libs gtk+-3.0')
env.Append(CPPDEFINES=["_GTK3"])
env.Append(CCFLAGS = ["-D_GTK"])
+ env.Append(LIBS =["-lz"])
+ env.Append(LIBS =["-ldl"])
+ env.Append(LIBS =["-lX11"])
+
### Lua platform defines
### Applies to all files even though only lua needs it, but should be ok
if env['LUA']:
--- NEW FILE fceux.spec ---
Name: fceux
Version: 2.1.5
Release: 2%{?dist}
Summary: A cross platform, NTSC and PAL Famicom/NES emulator
Group: Applications/Emulators
License: GPLv2+
URL: http://fceux.com/
Source: http://downloads.sourceforge.net/fceultra/%{name}-%{version}.src.tar.bz2
# Fix compiling
# https://bugs.gentoo.org/show_bug.cgi?id=406471
# Upstream SVN rev 2395
Patch0: %{name}-2.1.5-datatype-gz.patch
# Fix underlinking
# https://bugs.gentoo.org/show_bug.cgi?id=367675
# http://sourceforge.net/tracker/?func=detail&aid=3522221&group_id=13536&at...
Patch1: %{name}-2.1.5-underlink.patch
# Use system minizip
# https://sourceforge.net/tracker/?func=detail&aid=3520369&group_id=13536&a...
Patch2: %{name}-2.1.5-minizip.patch
# Fix compiling with GCC 4.7
# Upstream SVN rev 2484
Patch3: %{name}-2.1.5-gcc47.patch
BuildRequires: scons
BuildRequires: SDL-devel >= 1.2.14
BuildRequires: gtk2-devel >= 2.18
BuildRequires: gd-devel
BuildRequires: minizip-devel
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
Provides: fceultra = %{version}-%{release}
Obsoletes: fceultra < 2.0.0
Provides: gfceu = %{version}-%{release}
Obsoletes: gfceu <= 0.6.2
%description
FCEUX is a cross platform, NTSC and PAL Famicom/NES emulator that is an
evolution of the original FCE Ultra emulator. Over time FCE Ultra had
separated into many separate branches.
The concept behind FCEUX is to merge elements from FCE Ultra, FCEU
rerecording, FCEUXD, FCEUXDSP, and FCEU-mm into a single branch of FCEU. As
the X implies, it is an all-encompassing FCEU emulator that gives the best
of all worlds for the casual player, the ROM-hacking community, Lua
Scripters, and the Tool-Assisted Speedrun Community.
%prep
%setup -q -n fceu%{version}
%patch0 -p2
%patch1 -p0
%patch2 -p1
%patch3 -p1
# Remove binary files
rm -rf bin/fceux
rm -rf src/fceux
# Remove bundled LUA library
rm -rf src/lua
sed -i 's/^lua//' src/SConscript
# Remove bundled minizip library
rm -rf src/utils/unzip.*
sed -i 's/^unzip.cpp//' src/utils/SConscript
# Remove default CFLAGS
sed -i 's/^env.Append(CCFLAGS/#env.Append(CCFLAGS/' SConstruct
# Fix end-of-line-encoding
sed -i 's/\r//' Authors.txt changelog.txt TODO-PROJECT \
documentation/Videolog.txt
# Fix icon path in desktop file
sed -i 's/\/usr\/share\/pixmaps\/fceux.png/fceux/' fceux.desktop
%build
export CFLAGS="%{optflags}"
# Disable LUA support
# Enable AVI creation
scons %{?_smp_mflags} \
LUA=0 \
CREATE_AVI=1
%install
# Install binary file
install -d %{buildroot}%{_bindir}
install -p -m 755 src/fceux %{buildroot}%{_bindir}
# Install icon
install -d %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 %{name}.png \
%{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
# Install desktop file
desktop-file-install \
--dir %{buildroot}%{_datadir}/applications \
%{name}.desktop
# Install man page
install -d %{buildroot}%{_mandir}/man6
install -p -m 644 documentation/%{name}.6 \
%{buildroot}%{_mandir}/man6/%{name}.6
%post
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
%{_bindir}/fceux
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_mandir}/man6/%{name}.6*
%doc Authors.txt changelog.txt COPYING README-SDL TODO-PROJECT TODO-SDL
%doc documentation/{cheat.html,faq,todo,Videolog.txt}
%changelog
* Sat Apr 28 2012 Andrea Musuruane <musuruan(a)gmail.com> 2.1.5-2
- Obsoleted gfceu too
- Notified upstream about underlinking
* Sun Apr 22 2012 Andrea Musuruane <musuruan(a)gmail.com> 2.1.5-1
- First release for RPM Fusion
- LUA support is disabled because fceux uses a private header file
- Reused Gentoo and upstream patches
- Made a patch not to use the bundled minizip library
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/fceux/F-17/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 30 Apr 2012 17:44:30 -0000 1.1
+++ .cvsignore 1 May 2012 09:47:08 -0000 1.2
@@ -0,0 +1 @@
+fceux-2.1.5.src.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/fceux/F-17/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 30 Apr 2012 17:44:30 -0000 1.1
+++ sources 1 May 2012 09:47:08 -0000 1.2
@@ -0,0 +1 @@
+e8b20e62bbbb061b1a59d51b47c827bd fceux-2.1.5.src.tar.bz2
11 years, 12 months
rpms/fceux/devel fceux-2.1.5-datatype-gz.patch, NONE, 1.1 fceux-2.1.5-gcc47.patch, NONE, 1.1 fceux-2.1.5-minizip.patch, NONE, 1.1 fceux-2.1.5-underlink.patch, NONE, 1.1 fceux.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/fceux/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26275/devel
Modified Files:
.cvsignore sources
Added Files:
fceux-2.1.5-datatype-gz.patch fceux-2.1.5-gcc47.patch
fceux-2.1.5-minizip.patch fceux-2.1.5-underlink.patch
fceux.spec
Log Message:
First import
fceux-2.1.5-datatype-gz.patch:
file.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE fceux-2.1.5-datatype-gz.patch ---
diff -Naur a/fceu2.1.5/src/file.cpp b/fceu2.1.5/src/file.cpp
--- a/fceu2.1.5/src/file.cpp 2010-09-19 00:05:09.000000000 +0000
+++ b/fceu2.1.5/src/file.cpp 2012-03-01 19:21:25.856204727 +0000
@@ -310,7 +310,7 @@
if(magic==0x088b1f) {
// maybe gzip...
- void* gzfile = gzopen(fileToOpen.c_str(),"rb");
+ gzFile gzfile = gzopen(fileToOpen.c_str(),"rb");
if(gzfile) {
delete fp;
fceux-2.1.5-gcc47.patch:
endian.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE fceux-2.1.5-gcc47.patch ---
--- fceu/src/utils/endian.h 2010/11/07 23:33:11 2078
+++ fceu/src/utils/endian.h 2012/04/07 18:33:25 2484
@@ -98,10 +98,10 @@
{
CTASSERT(sizeof(T)==1||sizeof(T)==2||sizeof(T)==4||sizeof(T)==8);
switch(sizeof(T)) {
- case 1: return write8le((uint8*)Bufo,os);
- case 2: return write16le((uint16*)Bufo,os);
- case 4: return write32le((uint32*)Bufo,os);
- case 8: return write64le((uint64*)Bufo,os);
+ case 1: return write8le(*(uint8*)Bufo,os);
+ case 2: return write16le(*(uint16*)Bufo,os);
+ case 4: return write32le(*(uint32*)Bufo,os);
+ case 8: return write64le(*(uint64*)Bufo,os);
default:
return 0;
}
fceux-2.1.5-minizip.patch:
SConstruct | 2 +-
src/file.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE fceux-2.1.5-minizip.patch ---
diff -durN fceu2.1.5.orig/SConstruct fceu2.1.5/SConstruct
--- fceu2.1.5.orig/SConstruct 2011-06-04 07:26:55.000000000 +0200
+++ fceu2.1.5/SConstruct 2012-04-22 17:23:42.728386552 +0200
@@ -55,7 +55,7 @@
env.Append(LIBS = ["rpcrt4", "comctl32", "vfw32", "winmm", "ws2_32", "comdlg32", "ole32", "gdi32", "htmlhelp"])
else:
conf = Configure(env)
- assert conf.CheckLibWithHeader('z', 'zlib.h', 'C', 'inflate;', 1), "please install: zlib"
+ assert conf.CheckLibWithHeader('minizip', 'minizip/unzip.h', 'C', 'unzOpen;', 1), "please install: libminizip"
if not conf.CheckLib('SDL'):
print 'Did not find libSDL or SDL.lib, exiting!'
Exit(1)
diff -durN fceu2.1.5.orig/src/file.cpp fceu2.1.5/src/file.cpp
--- fceu2.1.5.orig/src/file.cpp 2010-09-19 02:05:09.000000000 +0200
+++ fceu2.1.5/src/file.cpp 2012-04-22 17:12:06.870780995 +0200
@@ -36,7 +36,7 @@
#include "utils/endian.h"
#include "utils/memory.h"
#include "utils/md5.h"
-#include "utils/unzip.h"
+#include <minizip/unzip.h>
#include "driver.h"
#include "types.h"
#include "fceu.h"
fceux-2.1.5-underlink.patch:
SConstruct | 4 ++++
1 file changed, 4 insertions(+)
--- NEW FILE fceux-2.1.5-underlink.patch ---
--- SConstruct.org 2011-06-07 21:33:28.876609681 +0200
+++ SConstruct 2011-06-07 21:34:11.420368249 +0200
@@ -70,6 +70,10 @@
env.ParseConfig('pkg-config --cflags --libs gtk+-3.0')
env.Append(CPPDEFINES=["_GTK3"])
env.Append(CCFLAGS = ["-D_GTK"])
+ env.Append(LIBS =["-lz"])
+ env.Append(LIBS =["-ldl"])
+ env.Append(LIBS =["-lX11"])
+
### Lua platform defines
### Applies to all files even though only lua needs it, but should be ok
if env['LUA']:
--- NEW FILE fceux.spec ---
Name: fceux
Version: 2.1.5
Release: 2%{?dist}
Summary: A cross platform, NTSC and PAL Famicom/NES emulator
Group: Applications/Emulators
License: GPLv2+
URL: http://fceux.com/
Source: http://downloads.sourceforge.net/fceultra/%{name}-%{version}.src.tar.bz2
# Fix compiling
# https://bugs.gentoo.org/show_bug.cgi?id=406471
# Upstream SVN rev 2395
Patch0: %{name}-2.1.5-datatype-gz.patch
# Fix underlinking
# https://bugs.gentoo.org/show_bug.cgi?id=367675
# http://sourceforge.net/tracker/?func=detail&aid=3522221&group_id=13536&at...
Patch1: %{name}-2.1.5-underlink.patch
# Use system minizip
# https://sourceforge.net/tracker/?func=detail&aid=3520369&group_id=13536&a...
Patch2: %{name}-2.1.5-minizip.patch
# Fix compiling with GCC 4.7
# Upstream SVN rev 2484
Patch3: %{name}-2.1.5-gcc47.patch
BuildRequires: scons
BuildRequires: SDL-devel >= 1.2.14
BuildRequires: gtk2-devel >= 2.18
BuildRequires: gd-devel
BuildRequires: minizip-devel
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
Provides: fceultra = %{version}-%{release}
Obsoletes: fceultra < 2.0.0
Provides: gfceu = %{version}-%{release}
Obsoletes: gfceu <= 0.6.2
%description
FCEUX is a cross platform, NTSC and PAL Famicom/NES emulator that is an
evolution of the original FCE Ultra emulator. Over time FCE Ultra had
separated into many separate branches.
The concept behind FCEUX is to merge elements from FCE Ultra, FCEU
rerecording, FCEUXD, FCEUXDSP, and FCEU-mm into a single branch of FCEU. As
the X implies, it is an all-encompassing FCEU emulator that gives the best
of all worlds for the casual player, the ROM-hacking community, Lua
Scripters, and the Tool-Assisted Speedrun Community.
%prep
%setup -q -n fceu%{version}
%patch0 -p2
%patch1 -p0
%patch2 -p1
%patch3 -p1
# Remove binary files
rm -rf bin/fceux
rm -rf src/fceux
# Remove bundled LUA library
rm -rf src/lua
sed -i 's/^lua//' src/SConscript
# Remove bundled minizip library
rm -rf src/utils/unzip.*
sed -i 's/^unzip.cpp//' src/utils/SConscript
# Remove default CFLAGS
sed -i 's/^env.Append(CCFLAGS/#env.Append(CCFLAGS/' SConstruct
# Fix end-of-line-encoding
sed -i 's/\r//' Authors.txt changelog.txt TODO-PROJECT \
documentation/Videolog.txt
# Fix icon path in desktop file
sed -i 's/\/usr\/share\/pixmaps\/fceux.png/fceux/' fceux.desktop
%build
export CFLAGS="%{optflags}"
# Disable LUA support
# Enable AVI creation
scons %{?_smp_mflags} \
LUA=0 \
CREATE_AVI=1
%install
# Install binary file
install -d %{buildroot}%{_bindir}
install -p -m 755 src/fceux %{buildroot}%{_bindir}
# Install icon
install -d %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
install -p -m 644 %{name}.png \
%{buildroot}%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
# Install desktop file
desktop-file-install \
--dir %{buildroot}%{_datadir}/applications \
%{name}.desktop
# Install man page
install -d %{buildroot}%{_mandir}/man6
install -p -m 644 documentation/%{name}.6 \
%{buildroot}%{_mandir}/man6/%{name}.6
%post
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
%{_bindir}/fceux
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_mandir}/man6/%{name}.6*
%doc Authors.txt changelog.txt COPYING README-SDL TODO-PROJECT TODO-SDL
%doc documentation/{cheat.html,faq,todo,Videolog.txt}
%changelog
* Sat Apr 28 2012 Andrea Musuruane <musuruan(a)gmail.com> 2.1.5-2
- Obsoleted gfceu too
- Notified upstream about underlinking
* Sun Apr 22 2012 Andrea Musuruane <musuruan(a)gmail.com> 2.1.5-1
- First release for RPM Fusion
- LUA support is disabled because fceux uses a private header file
- Reused Gentoo and upstream patches
- Made a patch not to use the bundled minizip library
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/fceux/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 30 Apr 2012 17:44:30 -0000 1.1
+++ .cvsignore 1 May 2012 09:41:11 -0000 1.2
@@ -0,0 +1 @@
+fceux-2.1.5.src.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/fceux/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 30 Apr 2012 17:44:30 -0000 1.1
+++ sources 1 May 2012 09:41:11 -0000 1.2
@@ -0,0 +1 @@
+e8b20e62bbbb061b1a59d51b47c827bd fceux-2.1.5.src.tar.bz2
11 years, 12 months
rpms/x264/EL-6 .cvsignore, 1.17, 1.18 sources, 1.17, 1.18 x264-nover.patch, 1.4, 1.5 x264-snapshot.sh, 1.3, 1.4 x264.spec, 1.29, 1.30 x264-nostrip.patch, 1.1, NONE x264-shared.patch, 1.5, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/x264/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25135/EL-6
Modified Files:
.cvsignore sources x264-nover.patch x264-snapshot.sh x264.spec
Removed Files:
x264-nostrip.patch x264-shared.patch
Log Message:
Boostrap a new libx264
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/x264/EL-6/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore 20 Nov 2011 22:07:05 -0000 1.17
+++ .cvsignore 1 May 2012 09:11:39 -0000 1.18
@@ -1 +1 @@
-x264-stable-20110620.tar.bz2
+x264-stable-20120303.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/x264/EL-6/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 20 Nov 2011 22:07:05 -0000 1.17
+++ sources 1 May 2012 09:11:39 -0000 1.18
@@ -1 +1 @@
-b048113f0148b2325fd35b9cd4d32674 x264-stable-20110620.tar.bz2
+096fcd4708acc6e01b8944df73499e59 x264-stable-20120303.tar.bz2
x264-nover.patch:
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: x264-nover.patch
===================================================================
RCS file: /cvs/free/rpms/x264/EL-6/x264-nover.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- x264-nover.patch 20 Nov 2011 22:07:05 -0000 1.4
+++ x264-nover.patch 1 May 2012 09:11:39 -0000 1.5
@@ -1,12 +1,12 @@
-diff -up x264-stable-20110620/configure.nover x264-stable-20110620/configure
---- x264-stable-20110620/configure.nover 2011-08-12 02:04:14.000000000 +0200
-+++ x264-stable-20110620/configure 2011-08-12 02:07:28.000000000 +0200
-@@ -1038,7 +1038,7 @@ fi
+diff -up x264-stable-20110811/configure.nover x264-stable-20110811/configure
+--- x264-stable-20110811/configure.nover 2011-08-11 20:21:38.000000000 +0200
++++ x264-stable-20110811/configure 2011-08-11 20:27:39.000000000 +0200
+@@ -1057,7 +1057,7 @@ fi
echo "LDFLAGSCLI = $LDFLAGSCLI" >> config.mak
echo "CLI_LIBX264 = $CLI_LIBX264" >> config.mak
--./version.sh >> config.h
-+cat version.h >> config.h
+-${SRCPATH}/version.sh "${SRCPATH}" >> x264_config.h
++cat ${SRCPATH}/version.h >> ${SRCPATH}/x264_config.h
pclibs="-L$libdir -lx264 $libpthread"
Index: x264-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/x264/EL-6/x264-snapshot.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- x264-snapshot.sh 20 Nov 2011 22:07:03 -0000 1.3
+++ x264-snapshot.sh 1 May 2012 09:11:39 -0000 1.4
@@ -12,10 +12,10 @@
unset CDPATH
pwd=$(pwd)
-date=20110620
+date=$(date +%Y%m%d)
package=x264
branch=stable
-commit=2809cb6ce63817a58c5639642fe05bc50747e126
+commit=HEAD
pushd "$tmp"
git clone git://git.videolan.org/${package}.git -b ${branch}
Index: x264.spec
===================================================================
RCS file: /cvs/free/rpms/x264/EL-6/x264.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- x264.spec 4 Jan 2012 22:35:01 -0000 1.29
+++ x264.spec 1 May 2012 09:11:39 -0000 1.30
@@ -1,12 +1,23 @@
-%global snapshot 20110620
+%global snapshot 20120303
%global branch stable
-#Defined to bootstrap for EL-6
-%global _without_asm 1
+%global _with_bootstrap 1
+%{?_with_bootstrap:
+%global _without_gpac 1
+%global _without_libavformat 1
+}
+#Whitelist of arches with dedicated ASM code
+%ifnarch x86_64 i686 %{arm} ppc ppc64 %{sparc}
+%global _without_asm 1
+%endif
+
+%if 0%{?rhel}
+%global _without_asm 1
+%endif
Summary: H264/AVC video streams encoder
Name: x264
-Version: 0.0.0
-Release: 0.30.%{snapshot}%{?dist}.2
+Version: 0.120
+Release: 4.%{snapshot}%{?dist}_bootstrap
License: GPLv2+
Group: System Environment/Libraries
URL: http://developers.videolan.org/x264.html
@@ -14,16 +25,11 @@
Source1: x264-snapshot.sh
# don't remove config.h and don't re-run version.sh
Patch0: x264-nover.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
-%{!?_without_gpac:BuildRequires: gpac-devel-static}
-%{?_with_libavformat:BuildRequires: ffmpeg-devel}
+%{!?_without_gpac:BuildRequires: gpac-devel-static zlib-devel}
+%{!?_without_libavformat:BuildRequires: ffmpeg-devel}
%{?_with_ffmpegsource:BuildRequires: ffmpegsource-devel}
%{?_with_visualize:BuildRequires: libX11-devel}
-%{!?_without_asm:
-%ifarch x86_64 i686
-BuildRequires: yasm
-%endif
-}
+%{!?_without_asm:BuildRequires: yasm >= 1.0.0}
Requires: %{name}-libs = %{version}-%{release}
%description
@@ -43,7 +49,7 @@
%package devel
Summary: Development files for the x264 library
Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: pkgconfig
%description devel
@@ -60,13 +66,13 @@
--includedir=%{_includedir} \\\
--extra-cflags="$RPM_OPT_FLAGS" \\\
%{?_with_visualize:--enable-visualize} \\\
- %{!?_with_libavformat:--disable-lavf} \\\
+ %{?_without_libavformat:--disable-lavf} \\\
%{!?_with_ffmpegsource:--disable-ffms} \\\
+ %{?_without_asm:--disable-asm} \\\
--enable-debug \\\
--enable-shared \\\
--system-libx264 \\\
- --enable-pic \\\
- --disable-asm
+ --enable-pic
%prep
@@ -81,7 +87,7 @@
%{x_configure}\
--host=%{_target_platform} \
--libdir=%{_libdir} \
-%ifarch i686
+%ifarch i686 armv5tel armv6l
--disable-asm \
%endif
@@ -110,9 +116,6 @@
touch -r version.h %{buildroot}%{_includedir}/x264.h %{buildroot}%{_includedir}/x264_config.h
-%clean
-%{__rm} -rf %{buildroot}
-
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
@@ -141,17 +144,43 @@
%endif
%changelog
-* Wed Jan 04 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.0-0.30.20110620.2
-- Rebuild for i686
-- Boostrap x264 for EL-6
+* Tue May 01 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.120-5.20120303
+- Forward rhel patch
+- Disable ASM on armv5tel armv6l
+- Add --with bootstrap conditional
+- Use %%{_isa} for devel requires
+
+* Tue Mar 6 2012 Sérgio Basto <sergio(a)serjux.com> - 0.120-2.20120303
+- Enable libavformat , after compile ffmeg with 0.120-1
+
+* Sat Mar 3 2012 Sérgio Basto <sergio(a)serjux.com> - 0.120-1.20120303
+- Change release number, upstream have release numbers at least on stable branch and as ffmpeg
+ reported.
+- Update to 20120303
+- Update x264-nover.patch, as suggest by Joseph D. Wagner <joe(a)josephdwagner.info>
+- Dropped obsolete Buildroot and Clean.
+- add BuildRequires: zlib-devel to enable gpac.
+
+* Wed Feb 22 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.0-0.34.20120125
+- Rebuilt for F-17 inter branch
+
+* Wed Feb 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.0-0.33.20120125
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Wed Jan 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.0-0.32.20120125
+- Update to 20120125
-* Fri Aug 12 2011 Dominik Mierzejewski <rpm(a)greysector.net> - 0.0.0-0.30.20110620
-- Update to 20110620 stable branch (ABI 115)
+* Mon Aug 22 2011 Dominik Mierzejewski <rpm(a)greysector.net> 0.0.0-0.31.20110811
+- 20110811 snapshot (ABI 116)
+- fix snapshot script to include version.h properly
+- link x264 binary to the shared library
+
+* Thu Jul 14 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.0-0.30.20110714
+- Update to 20110714 stable branch (ABI 115)
- Convert x264-snapshot to git (based on ffmpeg script).
- New Build Conditionals --with ffmpegsource libavformat
- Remove shared and strip patches - undeeded anymore
- Remove uneeded convertion of AUTHORS
-- fix snapshot script to include version.h properly
* Mon Jan 10 2011 Dominik Mierzejewski <rpm(a)greysector.net> 0.0.0-0.29.20110227
- 20110227 snapshot (ABI bump)
--- x264-nostrip.patch DELETED ---
--- x264-shared.patch DELETED ---
11 years, 12 months
rpms/x264/devel x264.spec,1.35,1.36
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/x264/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24799/devel
Modified Files:
x264.spec
Log Message:
Update for rhel patches
Index: x264.spec
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- x264.spec 1 May 2012 07:47:27 -0000 1.35
+++ x264.spec 1 May 2012 09:07:51 -0000 1.36
@@ -1,14 +1,22 @@
%global snapshot 20120303
%global branch stable
-%{?_with_bootrap:
+%{?_with_bootstrap:
%global _without_gpac 1
%global _without_libavformat 1
}
+#Whitelist of arches with dedicated ASM code
+%ifnarch x86_64 i686 %{arm} ppc ppc64 %{sparc}
+%global _without_asm 1
+%endif
+
+%if 0%{?rhel}
+%global _without_asm 1
+%endif
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.120
-Release: 4.%{snapshot}%{?dist}
+Release: 5.%{snapshot}%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://developers.videolan.org/x264.html
@@ -20,9 +28,7 @@
%{!?_without_libavformat:BuildRequires: ffmpeg-devel}
%{?_with_ffmpegsource:BuildRequires: ffmpegsource-devel}
%{?_with_visualize:BuildRequires: libX11-devel}
-%ifarch x86_64 i686
-BuildRequires: yasm
-%endif
+%{!?_without_asm:BuildRequires: yasm >= 1.0.0}
Requires: %{name}-libs = %{version}-%{release}
%description
@@ -42,7 +48,7 @@
%package devel
Summary: Development files for the x264 library
Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: pkgconfig
%description devel
@@ -61,6 +67,7 @@
%{?_with_visualize:--enable-visualize} \\\
%{?_without_libavformat:--disable-lavf} \\\
%{!?_with_ffmpegsource:--disable-ffms} \\\
+ %{?_without_asm:--disable-asm} \\\
--enable-debug \\\
--enable-shared \\\
--system-libx264 \\\
@@ -136,9 +143,11 @@
%endif
%changelog
-* Tue May 01 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.120-4.20120303
+* Tue May 01 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.120-5.20120303
+- Forward rhel patch
- Disable ASM on armv5tel armv6l
- Add --with bootstrap conditional
+- Use %%{_isa} for devel requires
* Tue Mar 6 2012 Sérgio Basto <sergio(a)serjux.com> - 0.120-2.20120303
- Enable libavformat , after compile ffmeg with 0.120-1
11 years, 12 months
rpms/x264/F-17 x264.spec,1.36,1.37
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/x264/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24799/F-17
Modified Files:
x264.spec
Log Message:
Update for rhel patches
Index: x264.spec
===================================================================
RCS file: /cvs/free/rpms/x264/F-17/x264.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- x264.spec 1 May 2012 07:47:27 -0000 1.36
+++ x264.spec 1 May 2012 09:07:51 -0000 1.37
@@ -1,14 +1,22 @@
%global snapshot 20120303
%global branch stable
-%{?_with_bootrap:
+%{?_with_bootstrap:
%global _without_gpac 1
%global _without_libavformat 1
}
+#Whitelist of arches with dedicated ASM code
+%ifnarch x86_64 i686 %{arm} ppc ppc64 %{sparc}
+%global _without_asm 1
+%endif
+
+%if 0%{?rhel}
+%global _without_asm 1
+%endif
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.120
-Release: 4.%{snapshot}%{?dist}
+Release: 5.%{snapshot}%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://developers.videolan.org/x264.html
@@ -20,9 +28,7 @@
%{!?_without_libavformat:BuildRequires: ffmpeg-devel}
%{?_with_ffmpegsource:BuildRequires: ffmpegsource-devel}
%{?_with_visualize:BuildRequires: libX11-devel}
-%ifarch x86_64 i686
-BuildRequires: yasm
-%endif
+%{!?_without_asm:BuildRequires: yasm >= 1.0.0}
Requires: %{name}-libs = %{version}-%{release}
%description
@@ -42,7 +48,7 @@
%package devel
Summary: Development files for the x264 library
Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: pkgconfig
%description devel
@@ -61,6 +67,7 @@
%{?_with_visualize:--enable-visualize} \\\
%{?_without_libavformat:--disable-lavf} \\\
%{!?_with_ffmpegsource:--disable-ffms} \\\
+ %{?_without_asm:--disable-asm} \\\
--enable-debug \\\
--enable-shared \\\
--system-libx264 \\\
@@ -136,9 +143,11 @@
%endif
%changelog
-* Tue May 01 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.120-4.20120303
+* Tue May 01 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.120-5.20120303
+- Forward rhel patch
- Disable ASM on armv5tel armv6l
- Add --with bootstrap conditional
+- Use %%{_isa} for devel requires
* Tue Mar 6 2012 Sérgio Basto <sergio(a)serjux.com> - 0.120-2.20120303
- Enable libavformat , after compile ffmeg with 0.120-1
11 years, 12 months