]> git.sesse.net Git - vlc/commitdiff
* remove CDDB patch that is now applied upstream in the new libcddb version that...
authorDerk-Jan Hartman <hartman@videolan.org>
Wed, 14 Sep 2005 11:56:08 +0000 (11:56 +0000)
committerDerk-Jan Hartman <hartman@videolan.org>
Wed, 14 Sep 2005 11:56:08 +0000 (11:56 +0000)
extras/contrib/src/Makefile
extras/contrib/src/Patches/libcddb.patch [deleted file]

index 41384d42b572bf157cfa8b652ddf35742b2e4ea3..e3fbc9ef50807f322e2cf9d4d3388f026b0af8db 100644 (file)
@@ -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 (file)
index 52bc559..0000000
+++ /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>
- /**