[vlc-commits] contrib: dvdread: fix static linking of dvdcss on osx

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Wed Nov 23 00:28:19 2011 -0500| [ebb35e0156ccb3e34c180f357a71f6433eb142ed] | committer: Rafaël Carré

contrib: dvdread: fix static linking of dvdcss on osx

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

 contrib/src/dvdread/dvdread-css-static-osx.patch |   15 +++++++++++++++
 contrib/src/dvdread/rules.mak                    |    3 +++
 2 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/contrib/src/dvdread/dvdread-css-static-osx.patch b/contrib/src/dvdread/dvdread-css-static-osx.patch
new file mode 100644
index 0000000..d3f27c5
--- /dev/null
+++ b/contrib/src/dvdread/dvdread-css-static-osx.patch
@@ -0,0 +1,15 @@
+--- dvdread/configure.ac.orig	2011-11-23 00:23:45.017580484 -0500
++++ dvdread/configure.ac	2011-11-23 00:24:23.381770721 -0500
+@@ -170,9 +170,10 @@
+     saved_CFLAGS=$CFLAGS
+     CFLAGS="$CFLAGS -L$dvdcss_path/lib"
+     AC_CHECK_LIB(dvdcss, dvdcss_interface_2,
+-      [ CSS_LIBS="-L$dvdcss_path/lib -R$dvdcss_path/lib -ldvdcss"
++      [ CSS_LIBS="-L$dvdcss_path/lib -R$dvdcss_path/lib -ldvdcss -Wl,-framework,CoreFoundation -Wl,-framework,IOKit"
+         CSS_CFLAGS=-I$dvdcss_path/include ],
+-      AC_MSG_ERROR(You need libdvdcss.so.2 or later)
++      AC_MSG_ERROR(You need libdvdcss.so.2 or later),
++      [-Wl,-framework,CoreFoundation -Wl,-framework,IOKit]
+     )
+     CFLAGS=$saved_CFLAGS
+     dnl -w added to shutup GCC3.1's cpp warning about -I/usr/local
diff --git a/contrib/src/dvdread/rules.mak b/contrib/src/dvdread/rules.mak
index 127d91d..a14acee 100644
--- a/contrib/src/dvdread/rules.mak
+++ b/contrib/src/dvdread/rules.mak
@@ -18,6 +18,9 @@ $(TARBALLS)/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2:
 dvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.bz2 .sum-dvdread
 	$(UNPACK)
 	$(APPLY) $(SRC)/dvdread/dvdread-css-static.patch
+ifdef HAVE_MACOSX
+	$(APPLY) $(SRC)/dvdread/dvdread-css-static-osx.patch
+endif
 ifdef HAVE_WIN32
 	$(APPLY) $(SRC)/dvdread/dvdread-win32.patch
 endif