From: Derk-Jan Hartman <hartman@videolan.org>
Date: Wed, 14 Sep 2005 11:56:08 +0000 (+0000)
Subject: * remove CDDB patch that is now applied upstream in the new libcddb version that... 
X-Git-Tag: 0.8.4~507
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=ec6dfcfe719f439d577bb08a3cdc47fb47a7412f;p=vlc

* remove CDDB patch that is now applied upstream in the new libcddb version that we use.
---

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 41384d42b5..e3fbc9ef50 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1004,7 +1004,6 @@ libcddb-$(CDDB_VERSION).tar.bz2:
 
 libcddb: libcddb-$(CDDB_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
-	patch -p 0 < Patches/libcddb.patch
 
 .cddb: libcddb
 	(cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" LDFLAGS="$(LDFLAGS) -liconv" && make && make install)
diff --git a/extras/contrib/src/Patches/libcddb.patch b/extras/contrib/src/Patches/libcddb.patch
deleted file mode 100644
index 52bc55955e..0000000000
--- a/extras/contrib/src/Patches/libcddb.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ruN libcddb.orig/include/cddb/cddb_regex.h libcddb/include/cddb/cddb_regex.h
---- libcddb.orig/include/cddb/cddb_regex.h	Fri Oct 15 21:42:08 2004
-+++ libcddb/include/cddb/cddb_regex.h	Tue Jan 18 01:57:50 2005
-@@ -30,9 +30,7 @@
- #include <cddb/cddb_config.h>
- #include <stdlib.h>
- 
--#ifdef CDDB_NEED_UNISTD_H
- #include <unistd.h>
--#endif
- #include <regex.h>
- 
- /**