[vlc-commits] Contribs: asdcplib, enable freedist and change Win32 flags

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri May 16 14:03:55 2014 +0200| [13c14eea08e8a2ad27b5b037eca29931f6bb6db7] | committer: Jean-Baptiste Kempf

Contribs: asdcplib, enable freedist and change Win32 flags

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

 contrib/src/asdcplib/rules.mak                     |    4 +++-
 contrib/src/asdcplib/win32-cross-compilation.patch |   12 ++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/contrib/src/asdcplib/rules.mak b/contrib/src/asdcplib/rules.mak
index 45af1ba..9285e6f 100644
--- a/contrib/src/asdcplib/rules.mak
+++ b/contrib/src/asdcplib/rules.mak
@@ -16,9 +16,11 @@ $(TARBALLS)/asdcplib-$(ASDCPLIB_VERSION).tar.gz:
 
 asdcplib: asdcplib-$(ASDCPLIB_VERSION).tar.gz .sum-asdcplib
 	$(UNPACK)
+	$(APPLY) $(SRC)/asdcplib/win32-cross-compilation.patch
 	$(MOVE)
 
 .asdcplib: asdcplib
-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
+	$(RECONF)
+	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --enable-freedist
 	cd $< && $(MAKE) install
 	touch $@
diff --git a/contrib/src/asdcplib/win32-cross-compilation.patch b/contrib/src/asdcplib/win32-cross-compilation.patch
new file mode 100644
index 0000000..8bf39a2
--- /dev/null
+++ b/contrib/src/asdcplib/win32-cross-compilation.patch
@@ -0,0 +1,12 @@
+--- asdcplib/configure.ac	2014-01-06 20:08:54.000000000 +0100
++++ asdcplib/configure.ac.new	2014-05-16 13:05:45.689691678 +0200
+@@ -49,6 +49,9 @@
+ AC_CANONICAL_HOST
+ case $host_os in
+        openbsd*) openbsd_host=true ;;
++       cygwin* | mingw32*)
++            openbsd_host=false
++            CPPFLAGS="${CPPFLAGS} -DKM_WIN32" ;;
+        *)        openbsd_host=false ;;
+ esac
+ AM_CONDITIONAL([OPENBSD_HOST], [test x$openbsd_host = xtrue])