vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Fri Jun 10 18:01:21 2011 +0200| [1172b71cfd4a60a94bd529c63f37e0ad10de520a] | committer: Jean-Baptiste Kempf
Contribs: flac building simplification > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1172b71cfd4a60a94bd529c63f37e0ad10de520a --- extras/contrib/src/Patches/libFLAC-pc.patch | 10 ++++++++++ extras/contrib/src/contrib-src.mak | 13 ++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/extras/contrib/src/Patches/libFLAC-pc.patch b/extras/contrib/src/Patches/libFLAC-pc.patch new file mode 100644 index 0000000..1a067ce --- /dev/null +++ b/extras/contrib/src/Patches/libFLAC-pc.patch @@ -0,0 +1,10 @@ +--- flac/src/libFLAC/flac.pc.in 2007-02-07 02:07:32.000000000 +0100 ++++ flac.new/src/libFLAC/flac.pc.in 2011-06-10 17:53:44.337825845 +0200 +@@ -6,5 +6,6 @@ + Name: FLAC + Description: Free Lossless Audio Codec Library + Version: @VERSION@ +-Libs: -L${libdir} -lFLAC -lm ++Libs: -L${libdir} -lFLAC -logg -lm + Cflags: -I${includedir}/FLAC ++Requires.private: ogg diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak index a8d506a..37d278e 100644 --- a/extras/contrib/src/contrib-src.mak +++ b/extras/contrib/src/contrib-src.mak @@ -743,21 +743,16 @@ endif ifdef HAVE_MACOSX ( cd $@; sed -e 's%-dynamiclib%-dynamiclib -arch $(ARCH)%' -i.orig configure ) endif + patch -p0 < Patches/libFLAC-pc.patch FLAC_DISABLE_FLAGS = --disable-oggtest --disable-xmms-plugin --disable-cpplibs .flac: flac .ogg ifdef HAVE_MACOSX_ON_INTEL - cd $< && \ - $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-asm-optimizations $(FLAC_DISABLE_FLAGS) -else - cd $< && \ - $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(FLAC_DISABLE_FLAGS) +FLAC_DISABLE_FLAGS += --disable-asm-optimizations endif - cd $</src && \ - make -C libFLAC && \ - echo 'Requires.private: ogg' >> libFLAC/flac.pc && \ - make -C libFLAC install + cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(FLAC_DISABLE_FLAGS) + cd $</src && make -C libFLAC && make -C libFLAC install cd $< && make -C include install $(INSTALL_NAME) touch $@ _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
