rpms/x264/devel x264.spec,1.64,1.65
Author: sergiomb
Update of /cvs/free/rpms/x264/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9562
Modified Files:
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
- bootstrap to avoid:
/usr/bin/ld: warning: libx264.so.138, needed by
/usr/lib/gcc/x86_64-redhat-linux/4.8.2/../../../../lib64/libavcodec.so, may conflict
with
libx264.so.140
Index: x264.spec
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- x264.spec 24 Feb 2014 14:42:54 -0000 1.64
+++ x264.spec 5 Mar 2014 18:15:21 -0000 1.65
@@ -5,7 +5,7 @@
%global gver .%{gitdate}git%{gitversion}
%global branch stable
-#global _with_bootstrap 1
+%global _with_bootstrap 1
%{?_with_bootstrap:
%global _without_gpac 1
@@ -193,6 +193,10 @@
- Update to 0.140 git de0bc36 (stable branch)
- drop visualize options, ./configure doesn't have --enable-visualize or
--disable-visualize,
anymore
+- bootstrap to avoid:
+ /usr/bin/ld: warning: libx264.so.138, needed by
+ /usr/lib/gcc/x86_64-redhat-linux/4.8.2/../../../../lib64/libavcodec.so, may conflict
with
+ libx264.so.140
* Tue Nov 05 2013 Sérgio Basto <sergio(a)serjux.com> - 0.138-2.20131030-c628e3b
- Unbootstrap.