[vlc-devel] commit: Contribs: separate win32 from other platform for CDDB ( Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Oct 27 00:34:50 2009 +0100| [b11e9e864eca3f8ec79c0f21c394b22b5ba12a8c] | committer: Jean-Baptiste Kempf 

Contribs: separate win32 from other platform for CDDB

The changes needed are not the same.

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

 extras/contrib/src/Makefile                    |    6 +++++-
 extras/contrib/src/Patches/libcddb-cross.patch |    9 ---------
 extras/contrib/src/Patches/libcddb-win32.patch |    9 +++++++++
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index af4d44e..f8e411e 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1426,7 +1426,11 @@ libcddb-$(CDDB_VERSION).tar.bz2:
 
 libcddb: libcddb-$(CDDB_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
-	(cd $@; patch -p0 < ../Patches/libcddb-cross.patch && autoreconf -fisv)
+	(cd $@; patch -p0 < ../Patches/libcddb-cross.patch )
+ifdef HAVE_WIN32
+	(cd $@; patch -p0 < ../Patches/libcddb-win32.patch )
+endif
+	(cd $@; autoreconf -fisv)
 
 ifdef HAVE_WIN32
 .cddb: libcddb .regex
diff --git a/extras/contrib/src/Patches/libcddb-cross.patch b/extras/contrib/src/Patches/libcddb-cross.patch
index 5c91f01..591c187 100644
--- a/extras/contrib/src/Patches/libcddb-cross.patch
+++ b/extras/contrib/src/Patches/libcddb-cross.patch
@@ -18,15 +18,6 @@
  AC_FUNC_STAT
  AC_FUNC_VPRINTF
  AC_FUNC_SELECT_ARGTYPES
---- libcddb.pc.in.orig	2009-10-25 21:36:57.000000000 +0100
-+++ libcddb.pc.in	2009-10-25 21:36:11.000000000 +0100
-@@ -6,5 +6,5 @@
- Name: libcddb
- Description: CDDB server access library
- Version: @VERSION@
--Libs: -L${libdir} -lcddb @LIBICONV@
-+Libs: -L${libdir} -lcddb ${libdir}/libregex.a @LIBICONV@
- Cflags: -I${includedir}
 --- include/cddb/cddb_ni.h.orig	2009-10-25 21:58:20.000000000 +0100
 +++ include/cddb/cddb_ni.h	2009-10-25 21:58:46.000000000 +0100
 @@ -35,6 +35,7 @@
diff --git a/extras/contrib/src/Patches/libcddb-win32.patch b/extras/contrib/src/Patches/libcddb-win32.patch
new file mode 100644
index 0000000..9808a1c
--- /dev/null
+++ b/extras/contrib/src/Patches/libcddb-win32.patch
@@ -0,0 +1,9 @@
+--- libcddb.pc.in.orig	2009-10-25 21:36:57.000000000 +0100
++++ libcddb.pc.in	2009-10-25 21:36:11.000000000 +0100
+@@ -6,5 +6,5 @@
+ Name: libcddb
+ Description: CDDB server access library
+ Version: @VERSION@
+-Libs: -L${libdir} -lcddb @LIBICONV@
++Libs: -L${libdir} -lcddb -lregex ${libdir}/libregex.a @LIBICONV@ -lws2_32
+ Cflags: -I${includedir}