From 705c1c5c3ea6b9fdfa0c5f98f62230446b731e5506174d15fd2e6a85bc5092f8 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 7 Sep 2013 19:03:09 +0000 Subject: [PATCH] - If we have a smblcient.pc available (meaning, we build against samba 4), we export the output of pkg-config --cflags smbclient into CFLAGS. Fixes build with Samab 4.0. OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=35 --- vlc.changes | 7 +++++++ vlc.spec | 10 ++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/vlc.changes b/vlc.changes index 09ba975..b29212f 100644 --- a/vlc.changes +++ b/vlc.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Sep 7 18:52:22 UTC 2013 - dimstar@opensuse.org + +- If we have a smblcient.pc available (meaning, we build against + samba 4), we export the output of pkg-config --cflags smbclient + into CFLAGS. Fixes build with Samab 4.0. + ------------------------------------------------------------------- Fri Aug 9 14:20:19 UTC 2013 - dvaleev@suse.com diff --git a/vlc.spec b/vlc.spec index e96be07..877682b 100644 --- a/vlc.spec +++ b/vlc.spec @@ -263,12 +263,14 @@ date %build echo '********* BOOTSTRAPPING *********' date +pkg-config --exists smbclient && + smbclient=$(pkg-config --cflags smbclient) %ifarch %{ix86} x86_64 -export CFLAGS="%{optflags} -L%{_libdir}/live -msse" -export CXXFLAGS="%{optflags} -L%{_libdir}/live -msse" +export CFLAGS="%{optflags} -L%{_libdir}/live -msse $smbclient" +export CXXFLAGS="%{optflags} -L%{_libdir}/live -msse $smbclient" %else -export CFLAGS="%{optflags} -L%{_libdir}/live" -export CXXFLAGS="%{optflags} -L%{_libdir}/live" +export CFLAGS="%{optflags} -L%{_libdir}/live $smbclient" +export CXXFLAGS="%{optflags} -L%{_libdir}/live $smbclient" %endif # Needed for patch5