6 files changed, 115 insertions, 6 deletions
diff --git a/recipes/libdvdnav.recipe b/recipes/libdvdnav.recipe
index e4d05a0a..75c0ab9d 100644
--- a/recipes/libdvdnav.recipe
+++ b/recipes/libdvdnav.recipe
@@ -10,9 +10,10 @@ class Recipe(recipe.Recipe):
     autoreconf = True
     deps = ['libdvdread']
     configure_options = '--with-dvdread-config=$CERBERO_PREFIX/bin/dvdread-config'
-    patches = ['libdvdnav/0001-Fix-linking-in-windows-compilation.patch']
+    patches = ['libdvdnav/0001-Fix-linking-in-windows-compilation.patch',
+               'libdvdnav/0002-Build-DLLs-on-Windows.patch',
+              ]
 
-    files_libs = ['libdvdnav', 'libdvdnavmini']
-    files_devel = ['include/dvdnav', 'lib/pkgconfig/dvdnav.pc',
-                   'lib/pkgconfig/dvdnavmini.pc', 'bin/dvdnav-config']
+    files_libs = ['libdvdnav']
+    files_devel = ['include/dvdnav', 'lib/pkgconfig/dvdnav.pc', 'bin/dvdnav-config']
 
diff --git a/recipes/libdvdnav/0001-Fix-linking-in-windows-compilation.patch b/recipes/libdvdnav/0001-Fix-linking-in-windows-compilation.patch
index c669cd67..a745c485 100644
--- a/recipes/libdvdnav/0001-Fix-linking-in-windows-compilation.patch
+++ b/recipes/libdvdnav/0001-Fix-linking-in-windows-compilation.patch
@@ -1,7 +1,7 @@
-From f7002dc74731894680eae4d4e2d33fa1588ea184 Mon Sep 17 00:00:00 2001
+From 72c9cf274021a795ee54a8da308eb249126e3b5f Mon Sep 17 00:00:00 2001
 From: Andoni Morales Alastruey <ylatuya@gmail.com>
 Date: Wed, 29 Feb 2012 18:12:14 +0100
-Subject: [PATCH] Fix linking in windows compilation
+Subject: [PATCH 1/2] Fix linking in windows compilation
 
 ---
  Makefile.am | 2 +-
diff --git a/recipes/libdvdnav/0002-Build-DLLs-on-Windows.patch b/recipes/libdvdnav/0002-Build-DLLs-on-Windows.patch
new file mode 100644
index 00000000..c5c3e03f
--- /dev/null
+++ b/recipes/libdvdnav/0002-Build-DLLs-on-Windows.patch
@@ -0,0 +1,39 @@
+From d8917e0719ac5cbb0f29593463e06138c3bead4c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
+Date: Fri, 9 Dec 2016 15:27:14 +0200
+Subject: [PATCH 2/2] Build DLLs on Windows
+
+---
+ Makefile.am  | 2 +-
+ configure.ac | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 555df61..1ebb2d2 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -34,7 +34,7 @@ libdvdnav_la_SOURCES = \
+ 	src/vm/vmcmd.c \
+ 	src/vm/vmcmd.h
+ 
+-libdvdnav_la_LDFLAGS = \
++libdvdnav_la_LDFLAGS = -no-undefined \
+ 	-version-info $(DVDNAV_LT_CURRENT):$(DVDNAV_LT_REVISION):$(DVDNAV_LT_AGE) \
+ 	-export-symbols-regex "^dvdnav" $(DVDREAD_LIBS)
+ libdvdnav_la_LIBADD = $(THREAD_LIBS) $(DVDREAD_LIBS)
+diff --git a/configure.ac b/configure.ac
+index 3eff01a..d64fdfc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,7 +17,7 @@ AC_CANONICAL_HOST
+ AM_INIT_AUTOMAKE([1.6 foreign dist-bzip2 no-dist-gzip subdir-objects])
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ 
+-LT_INIT
++LT_INIT([win32-dll])
+ 
+ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_MACRO_DIR([m4])
+-- 
+2.11.0
+
diff --git a/recipes/libdvdread.recipe b/recipes/libdvdread.recipe
index 4c849581..4615abbf 100644
--- a/recipes/libdvdread.recipe
+++ b/recipes/libdvdread.recipe
@@ -8,6 +8,10 @@ class Recipe(recipe.Recipe):
     url = 'http://www.videolan.org/pub/videolan/libdvdread/5.0.0/libdvdread-5.0.0.tar.bz2'
     licenses = [License.GPLv2Plus]
     autoreconf = True
+    patches = ['libdvdread/0001-Fix-compilation-on-Windows-by-including-files-with-t.patch',
+               'libdvdread/0002-Build-DLLs-on-Windows.patch',
+              ]
+    configure_options = ' --enable-static --enable-shared '
 
     files_libs = ['libdvdread']
     files_devel = ['include/dvdread', 'lib/pkgconfig/dvdread.pc',
diff --git a/recipes/libdvdread/0001-Fix-compilation-on-Windows-by-including-files-with-t.patch b/recipes/libdvdread/0001-Fix-compilation-on-Windows-by-including-files-with-t.patch
new file mode 100644
index 00000000..627105cc
--- /dev/null
+++ b/recipes/libdvdread/0001-Fix-compilation-on-Windows-by-including-files-with-t.patch
@@ -0,0 +1,26 @@
+From 7cab33a1cb7a9fe6a5376c6f2f37403a83b21840 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
+Date: Fri, 9 Dec 2016 15:20:35 +0200
+Subject: [PATCH] Fix compilation on Windows by including files with the
+ correct relative path
+
+---
+ src/dvd_input.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/dvd_input.c b/src/dvd_input.c
+index e021098..10f0c5c 100644
+--- a/src/dvd_input.c
++++ b/src/dvd_input.c
+@@ -53,7 +53,7 @@ char *      (*dvdinput_error) (dvd_input_t);
+ # else
+ # if defined(WIN32)
+ /* Only needed on MINGW at the moment */
+-#  include "../msvc/contrib/dlfcn.c"
++#  include "../msvc/msvc/contrib/dlfcn.c"
+ # endif
+ #endif
+ 
+-- 
+2.11.0
+
diff --git a/recipes/libdvdread/0002-Build-DLLs-on-Windows.patch b/recipes/libdvdread/0002-Build-DLLs-on-Windows.patch
new file mode 100644
index 00000000..f3136f83
--- /dev/null
+++ b/recipes/libdvdread/0002-Build-DLLs-on-Windows.patch
@@ -0,0 +1,39 @@
+From c22383a042c424c946d8dfb1843d6dd4135d784f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
+Date: Fri, 9 Dec 2016 15:24:04 +0200
+Subject: [PATCH 2/2] Build DLLs on Windows
+
+---
+ Makefile.am  | 2 +-
+ configure.ac | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index e51764c..f92ae8b 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -33,7 +33,7 @@ libdvdread_la_SOURCES = \
+ 
+ libdvdread_la_LIBADD = $(CSS_LIBS)
+ 
+-libdvdread_la_LDFLAGS = -version-info $(DVDREAD_LTVERSION) \
++libdvdread_la_LDFLAGS = -no-undefined -version-info $(DVDREAD_LTVERSION) \
+ 	-export-symbols-regex "(^dvd.*|^nav.*|^ifo.*|^DVD.*|^UDF.*)"
+ 
+ pkgincludedir = $(includedir)/dvdread
+diff --git a/configure.ac b/configure.ac
+index 7b2dad3..ed91829 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -9,7 +9,7 @@ AM_MAINTAINER_MODE([enable])
+ dnl Enable silent rules only when available (automake 1.11 or later).
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ 
+-LT_INIT
++LT_INIT([win32-dll])
+ 
+ AC_CONFIG_HEADER(config.h)
+ AC_CONFIG_MACRO_DIR([m4])
+-- 
+2.11.0
+