[vlc-devel] commit: (contrib) Fix linking of libpng on MacOS X 10.5 (Jean-Paul Saman )

git version control git at videolan.org
Mon Oct 27 16:23:28 CET 2008


vlc | branch: 0.8.6-bugfix | Jean-Paul Saman <jpsaman at videolan.org> | Tue Oct 21 12:33:33 2008 +0200| [031d3f4b157d34065f17f69bb10ecb3e307ae5f7] | committer: Jean-Paul Saman 

(contrib) Fix linking of libpng on MacOS X 10.5

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=031d3f4b157d34065f17f69bb10ecb3e307ae5f7
---

 extras/contrib/src/Makefile |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 0ef86b0..016cc4a 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1482,6 +1482,7 @@ ifdef HAVE_WIN32
 	(cd $@; cat ../Patches/libpng-win32.patch | sed s,??PREFIX??,$(PREFIX), | patch -p0)
 else
 	(cat Patches/libpng-osx.patch | sed -e 's%??PREFIX??%$(PREFIX)%' -e 's%??EXTRA_CFLAGS??%$(EXTRA_CFLAGS)%' -e 's%??EXTRA_LDFLAGS??%$(EXTRA_LDFLAGS)%' | patch -p0)
+	(cd $@; sed -e 's/PNGVER = \$$(PNGMAJ).\$$(PNGMIN)/PNGVER = 1.2.29/' -i.orig scripts/makefile.darwin)
 endif
 	(patch -p 0 < Patches/libpng-makefile.patch)
 ifeq ($(HOST),i686-apple-darwin8)




More information about the vlc-devel mailing list