2:42 p.m.
Author: sergiomb
Update of /cvs/free/rpms/x264/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8082
Modified Files:
.cvsignore sources x264-gpac.patch x264.spec
Log Message:
* Wed Jan 22 2014 Sérgio Basto <sergio(a)serjux.com> - 0.140-1.20140122gitde0bc36
- Update to 0.140 git de0bc36 (stable branch)
- drop visualize options, ./configure doesn't have --enable-visualize or
--disable-visualize,
anymore
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/x264/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore 2 Nov 2013 01:36:19 -0000 1.31
+++ .cvsignore 24 Feb 2014 14:42:54 -0000 1.32
@@ -1 +1 @@
-x264-0.138-20131030-c628e3b.tar.bz2
+x264-0.140-20140122-de0bc36.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/x264/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources 2 Nov 2013 01:36:19 -0000 1.31
+++ sources 24 Feb 2014 14:42:54 -0000 1.32
@@ -1 +1 @@
-3949edd82cd13e020112bb04a23646da x264-0.138-20131030-c628e3b.tar.bz2
+50e925c66566e42331fdb9dbff958f7a x264-0.140-20140122-de0bc36.tar.bz2
x264-gpac.patch:
configure | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
Index: x264-gpac.patch
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264-gpac.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- x264-gpac.patch 30 Sep 2013 02:04:56 -0000 1.1
+++ x264-gpac.patch 24 Feb 2014 14:42:54 -0000 1.2
@@ -1,11 +1,13 @@
---- generic10/configure 2013-09-30 01:59:40.537691428 +0100
-+++ generic/configure 2013-09-30 02:24:21.637654522 +0100
-@@ -917,7 +917,7 @@ fi
-
- if [ "$gpac" = "auto" ] ; then
+--- x264-0.140-20140122-de0bc36/configure.orig 2014-01-22 23:26:55.922650888 +0000
++++ x264-0.140-20140122-de0bc36/configure 2014-02-24 02:35:19.263127505 +0000
+@@ -941,7 +941,9 @@
+ if [ "$gpac" = "auto" -a "$lsmash" != "yes" ] ;
then
gpac="no"
-- cc_check "" -lz && GPAC_LIBS="-lgpac_static -lz" ||
GPAC_LIBS="-lgpac_static"
-+ cc_check "" -lz && GPAC_LIBS="-lgpac_static -lz -lssl
-lcrypto -lpng -ljpeg" || GPAC_LIBS="-lgpac_static"
+ GPAC_LIBS="-lgpac_static"
+- cc_check "" -lz && GPAC_LIBS="$GPAC_LIBS -lz"
++ for lib in -lz -lssl -lcrypto -lpng -ljpeg; do
++ cc_check "" $lib && GPAC_LIBS="$GPAC_LIBS $lib"
++ done
if [ "$SYS" = "WINDOWS" ] ; then
- GPAC_LIBS="$GPAC_LIBS -lwinmm"
- fi
+ cc_check "" -lws2_32 && GPAC_LIBS="$GPAC_LIBS
-lws2_32"
+ cc_check "" -lwinmm && GPAC_LIBS="$GPAC_LIBS
-lwinmm"
Index: x264.spec
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- x264.spec 5 Nov 2013 15:04:51 -0000 1.63
+++ x264.spec 24 Feb 2014 14:42:54 -0000 1.64
@@ -1,6 +1,6 @@
-%global api 138
-%global gitdate 20131030
-%global gitversion c628e3b
+%global api 140
+%global gitdate 20140122
+%global gitversion de0bc36
%global snapshot %{gitdate}-%{gitversion}
%global gver .%{gitdate}git%{gitversion}
%global branch stable
@@ -24,7 +24,7 @@
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.%{api}
-Release: 2%{?gver}%{?dist}
+Release: 1%{?gver}%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://developers.videolan.org/x264.html
@@ -39,7 +39,6 @@
%{!?_without_gpac:BuildRequires: gpac-devel-static zlib-devel openssl-devel libpng-devel
libjpeg-devel}
%{!?_without_libavformat:BuildRequires: ffmpeg-devel}
%{?_with_ffmpegsource:BuildRequires: ffmpegsource-devel}
-%{?_with_visualize:BuildRequires: libX11-devel}
%{!?_without_asm:BuildRequires: yasm >= 1.0.0}
Requires: %{name}-libs = %{version}-%{release}
@@ -76,7 +75,6 @@
--bindir=%{_bindir} \\\
--includedir=%{_includedir} \\\
--extra-cflags="$RPM_OPT_FLAGS" \\\
- %{?_with_visualize:--enable-visualize} \\\
%{?_without_libavformat:--disable-lavf} \\\
%{?_without_libswscale:--disable-swscale} \\\
%{!?_with_ffmpegsource:--disable-ffms} \\\
@@ -191,6 +189,11 @@
%{_libdir}/libx26410b.so
%changelog
+* Wed Jan 22 2014 Sérgio Basto <sergio(a)serjux.com> - 0.140-1.20140122gitde0bc36
+- Update to 0.140 git de0bc36 (stable branch)
+- drop visualize options, ./configure doesn't have --enable-visualize or
--disable-visualize,
+anymore
+
* Tue Nov 05 2013 Sérgio Basto <sergio(a)serjux.com> - 0.138-2.20131030-c628e3b
- Unbootstrap.