[vlc-commits] contrib: fix static linking of libbluray

Rémi Denis-Courmont git at videolan.org
Sun Nov 27 10:31:15 CET 2011


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Nov 27 11:30:27 2011 +0200| [d8d6bf695ee80c9540bf50ccd6318cd2609a016d] | committer: Rémi Denis-Courmont

contrib: fix static linking of libbluray

Upstream should set Libs.private, but we want Libs.

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

 contrib/src/bluray/pkg-static.patch |   10 ++++++++++
 contrib/src/bluray/rules.mak        |    1 +
 2 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/contrib/src/bluray/pkg-static.patch b/contrib/src/bluray/pkg-static.patch
new file mode 100644
index 0000000..8612148
--- /dev/null
+++ b/contrib/src/bluray/pkg-static.patch
@@ -0,0 +1,10 @@
+diff -ru libbluray/src/libbluray.pc.in libbluray2/src/libbluray.pc.in
+--- libbluray/src/libbluray.pc.in	2011-11-27 10:58:55.000000000 +0200
++++ libbluray2/src/libbluray.pc.in	2011-11-27 11:26:30.000000000 +0200
+@@ -6,5 +6,5 @@
+ Name: libbluray
+ Description: library supporting Blu-ray playback
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -lbluray
++Libs: -L${libdir} -lbluray @DLOPEN_LDFLAGS@
+ Cflags: -I${includedir}
diff --git a/contrib/src/bluray/rules.mak b/contrib/src/bluray/rules.mak
index a5ae24e..ff42ee8 100644
--- a/contrib/src/bluray/rules.mak
+++ b/contrib/src/bluray/rules.mak
@@ -18,6 +18,7 @@ $(TARBALLS)/libbluray-git.tar.xz:
 
 libbluray: libbluray-git.tar.xz .sum-libbluray
 	$(UNPACK)
+	$(APPLY) $(SRC)/bluray/pkg-static.patch
 	$(MOVE)
 
 .libbluray: libbluray 



More information about the vlc-commits mailing list