From adecc6c7723f3c2b5745ac5c9521a5b93d223343 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 5 Mar 2014 18:15:21 +0000 Subject: [PATCH] =?UTF-8?q?*=20Wed=20Jan=2022=202014=20S=C3=A9rgio=20Basto?= =?UTF-8?q?=20=20-=200.140-1.20140122gitde0bc36=20-=20U?= =?UTF-8?q?pdate=20to=200.140=20git=20de0bc36=20(stable=20branch)=20-=20dr?= =?UTF-8?q?op=20visualize=20options,=20./configure=20doesn't=20have=20--en?= =?UTF-8?q?able-visualize=20or=20--disable-visualize,=20anymore=20-=20boot?= =?UTF-8?q?strap=20to=20avoid:=20=20=20/usr/bin/ld:=20warning:=20libx264.s?= =?UTF-8?q?o.138,=20needed=20by=20=20=20/usr/lib/gcc/x86=5F64-redhat-linux?= =?UTF-8?q?/4.8.2/../../../../lib64/libavcodec.so,=20may=20conflict=20with?= =?UTF-8?q?=20=20=20libx264.so.140?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- x264.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/x264.spec b/x264.spec index b194808..9c9f7eb 100644 --- a/x264.spec +++ b/x264.spec @@ -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 @@ touch -r generic/version.h %{buildroot}%{_includedir}/x264.h %{buildroot}%{_incl - 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.