From eba866206090d5ffa5d58c5034667233848516cb Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Sun, 26 May 2013 12:08:34 +0200 Subject: [PATCH] Contribs: fix building libbluray 0.3.0 for Windows --- contrib/src/bluray/libbluray-win32.patch | 43 ++++++++++++++++++++++++ contrib/src/bluray/pkg-static.patch | 13 ++++--- contrib/src/bluray/rules.mak | 1 + 3 files changed, 50 insertions(+), 7 deletions(-) create mode 100644 contrib/src/bluray/libbluray-win32.patch diff --git a/contrib/src/bluray/libbluray-win32.patch b/contrib/src/bluray/libbluray-win32.patch new file mode 100644 index 0000000000..5bbd88051f --- /dev/null +++ b/contrib/src/bluray/libbluray-win32.patch @@ -0,0 +1,43 @@ +From 78e2db66ee6b592feaf1d1b4af490f50d164aab7 Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= +Date: Wed, 8 May 2013 09:40:37 -0700 +Subject: [PATCH] build: make sure to add -ldl to Libs.private if needed. +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Diego Elio Pettenò +Signed-off-by: Jean-Baptiste Kempf +--- + configure.ac | 4 ++++ + src/libbluray.pc.in | 1 + + 2 files changed, 5 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 61ff283..c6439bd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -126,6 +126,10 @@ AS_IF([test "${SYS}" != "mingw32"], [ + AC_SEARCH_LIBS([pthread_create], [pthread], , + [AC_MSG_ERROR([pthread required])]) + AC_SEARCH_LIBS([dlopen], [dl]) ++ DLOPEN_LIBS="$ac_cv_search_dlopen" ++ AS_CASE([$DLOPEN_LIBS], ++ [no|none\ required], [DLOPEN_LIBS=""]) ++ AC_SUBST([DLOPEN_LIBS]) + ]) + + dnl libxml2 for metadata parser +diff --git a/src/libbluray.pc.in b/src/libbluray.pc.in +index 4e3fe15..ce256e2 100644 +--- a/src/libbluray.pc.in ++++ b/src/libbluray.pc.in +@@ -7,4 +7,5 @@ Name: libbluray + Description: library supporting Blu-ray playback + Version: @PACKAGE_VERSION@ + Libs: -L${libdir} -lbluray ++Libs.private: @DLOPEN_LIBS@ + Cflags: -I${includedir} +-- +1.7.10.4 + diff --git a/contrib/src/bluray/pkg-static.patch b/contrib/src/bluray/pkg-static.patch index b14ca568a7..c95cf14a81 100644 --- a/contrib/src/bluray/pkg-static.patch +++ b/contrib/src/bluray/pkg-static.patch @@ -1,10 +1,9 @@ -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 +--- libbluray-0.3.0/src/libbluray.pc.in.orig 2013-05-26 12:05:07.233864756 +0200 ++++ libbluray-0.3.0/src/libbluray.pc.in 2013-05-26 12:07:43.552878009 +0200 +@@ -7,5 +7,5 @@ Description: library supporting Blu-ray playback Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -lbluray -+Libs: -L${libdir} -lbluray @DLOPEN_LIBS@ @LIBXML2_LIBS@ + Libs: -L${libdir} -lbluray +-Libs.private: @DLOPEN_LIBS@ ++Libs.private: @DLOPEN_LIBS@ @LIBXML2_LIBS@ Cflags: -I${includedir} diff --git a/contrib/src/bluray/rules.mak b/contrib/src/bluray/rules.mak index 45e41c68d1..645745b610 100644 --- a/contrib/src/bluray/rules.mak +++ b/contrib/src/bluray/rules.mak @@ -19,6 +19,7 @@ $(TARBALLS)/libbluray-$(BLURAY_VERSION).tar.bz2: bluray: libbluray-$(BLURAY_VERSION).tar.bz2 .sum-bluray $(UNPACK) + $(APPLY) $(SRC)/bluray/libbluray-win32.patch $(APPLY) $(SRC)/bluray/pkg-static.patch $(MOVE) -- 2.39.2