From d647a6492da15d2ec8e7b69f7c91a8c189d2df2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 5 Mar 2014 18:20:05 +0000 Subject: [PATCH] =?UTF-8?q?*=20Wed=20Mar=2005=202014=20S=C3=A9rgio=20Basto?= =?UTF-8?q?=20=20-=200.140-2.20140122gitde0bc36=20-=20b?= =?UTF-8?q?ootstrap=20x264=20to=20avoid:=20=20=20/usr/bin/ld:=20warning:?= =?UTF-8?q?=20libx264.so.138,=20needed=20by=20=20=20/usr/lib/gcc/x86=5F64-?= =?UTF-8?q?redhat-linux/4.8.2/../../../../lib64/libavcodec.so,=20may=20con?= =?UTF-8?q?flict=20with=20=20=20libx264.so.140?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- x264.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/x264.spec b/x264.spec index 9c9f7eb..eefb175 100644 --- a/x264.spec +++ b/x264.spec @@ -24,7 +24,7 @@ Summary: H264/AVC video streams encoder Name: x264 Version: 0.%{api} -Release: 1%{?gver}%{?dist} +Release: 2%{?gver}%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://developers.videolan.org/x264.html @@ -189,14 +189,16 @@ touch -r generic/version.h %{buildroot}%{_includedir}/x264.h %{buildroot}%{_incl %{_libdir}/libx26410b.so %changelog +* Wed Mar 05 2014 Sérgio Basto - 0.140-2.20140122gitde0bc36 +- bootstrap x264 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 + * Wed Jan 22 2014 Sérgio Basto - 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 * Tue Nov 05 2013 Sérgio Basto - 0.138-2.20131030-c628e3b - Unbootstrap.