12:59 a.m.
Author: sergiomb
Update of /cvs/free/rpms/x264/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv32292
Modified Files:
.cvsignore sources x264-nover.patch x264.spec
Log Message:
* 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.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/x264/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore 25 Jan 2012 11:49:31 -0000 1.19
+++ .cvsignore 12 Mar 2012 00:59:40 -0000 1.20
@@ -1 +1 @@
-x264-stable-20120125.tar.bz2
+x264-stable-20120303.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/x264/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources 25 Jan 2012 11:49:31 -0000 1.19
+++ sources 12 Mar 2012 00:59:40 -0000 1.20
@@ -1 +1 @@
-2770fa3d5b54a54f996eb4064eef2fdf x264-stable-20120125.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/devel/x264-nover.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- x264-nover.patch 24 Aug 2011 15:32:19 -0000 1.5
+++ x264-nover.patch 12 Mar 2012 00:59:40 -0000 1.6
@@ -5,8 +5,8 @@
echo "LDFLAGSCLI = $LDFLAGSCLI" >> config.mak
echo "CLI_LIBX264 = $CLI_LIBX264" >> config.mak
--./version.sh >> x264_config.h
-+cat version.h >> x264_config.h
+-${SRCPATH}/version.sh "${SRCPATH}" >> x264_config.h
++cat ${SRCPATH}/version.h >> ${SRCPATH}/x264_config.h
pclibs="-L$libdir -lx264 $libpthread"
Index: x264.spec
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- x264.spec 22 Feb 2012 21:38:50 -0000 1.31
+++ x264.spec 12 Mar 2012 00:59:40 -0000 1.32
@@ -1,11 +1,11 @@
-%global snapshot 20120125
+%global snapshot 20120303
%global branch stable
-%global _without_gpac 1
+#global _without_gpac 0
Summary: H264/AVC video streams encoder
Name: x264
-Version: 0.0.0
-Release: 0.34.%{snapshot}%{?dist}
+Version: 0.120
+Release: 1.%{snapshot}%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://developers.videolan.org/x264.html
@@ -13,8 +13,7 @@
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}
+%{!?_without_gpac:BuildRequires: gpac-devel-static zlib-devel}
%{?_with_libavformat:BuildRequires: ffmpeg-devel}
%{?_with_ffmpegsource:BuildRequires: ffmpegsource-devel}
%{?_with_visualize:BuildRequires: libX11-devel}
@@ -106,9 +105,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
@@ -137,6 +133,14 @@
%endif
%changelog
+* 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