vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Tue Aug 24 19:00:34 2010 +0200| [e3edfb6b75ee1af7adacc019907a055102e7c166] | committer: Jean-Baptiste Kempf
Contribs: remove clinkcc > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e3edfb6b75ee1af7adacc019907a055102e7c166 --- extras/contrib/src/Distributions/darwin.mak | 2 +- extras/contrib/src/Distributions/darwin64.mak | 2 +- extras/contrib/src/Makefile | 25 ----------------- extras/contrib/src/Patches/clinkcc.patch | 35 ------------------------- extras/contrib/src/Patches/clinkcc_osx.patch | 21 --------------- 5 files changed, 2 insertions(+), 83 deletions(-) diff --git a/extras/contrib/src/Distributions/darwin.mak b/extras/contrib/src/Distributions/darwin.mak index d093c35..2df0d6a 100644 --- a/extras/contrib/src/Distributions/darwin.mak +++ b/extras/contrib/src/Distributions/darwin.mak @@ -7,7 +7,7 @@ all: .autoconf .gnumake .automake .libtool .intl .pkgcfg .yasm .freetype \ .SDL_image .gecko .mpcdec .dirac_encoder .dirac_decoder \ .dca .tag .x264 .goom2k4 .lua .zvbi .fontconfig .ncurses .liboil \ .schroedinger .libass .libupnp .kate .sqlite3 .Sparkle .aclocal -# .expat .clinkcc don't work with SDK yet +# .expat don't work with SDK yet # .glib .IDL .gecko are required to build the mozilla plugin # .mozilla-macosx will build an entire mozilla. it can be used if we need to create a new .gecko package diff --git a/extras/contrib/src/Distributions/darwin64.mak b/extras/contrib/src/Distributions/darwin64.mak index d147a4f..775df4c 100644 --- a/extras/contrib/src/Distributions/darwin64.mak +++ b/extras/contrib/src/Distributions/darwin64.mak @@ -7,7 +7,7 @@ all: .autoconf .gnumake .automake .libtool .intl .pkgcfg .yasm .freetype \ .gecko .mpcdec .dirac_encoder .dirac_decoder \ .dca .tag .x264 .lua .zvbi .fontconfig .ncurses .liboil \ .schroedinger .libass .libupnp .kate .sqlite3 .Sparkle .aclocal -# .expat .clinkcc don't work with SDK yet +# .expat don't work with SDK yet # .glib .IDL .gecko are required to build the mozilla plugin # .mozilla-macosx will build an entire mozilla. it can be used if we need to create a new .gecko package diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index e7f16b7..61d5ee7 100644 --- a/extras/contrib/src/Makefile +++ b/extras/contrib/src/Makefile @@ -2118,31 +2118,6 @@ CLEAN_PKG += expat DISTCLEAN_PKG += expat-$(EXPAT_VERSION).tar.gz # *************************************************************************** -# CyberLink C++ UPnP library -# *************************************************************************** - -clinkcc$(CLINKCC_VERSION).tar.gz: - $(WGET) $(CLINKCC_URL) - -clinkcc: clinkcc$(CLINKCC_VERSION).tar.gz - tar xzf $< - mv $(patsubst %.tar.gz,Cyberlink,$(patsubst %.tgz,Cyberlink,$(notdir $<))) $@ || true - touch $@ - patch -p0 < Patches/clinkcc.patch -ifdef HAVE_DARWIN_OS - patch -p0 < Patches/clinkcc_osx.patch -endif - (cd $@; ./bootstrap) - -.clinkcc: clinkcc - (cd $<;./configure --prefix=$(PREFIX) --enable-expat && make && chmod 755 config/install-sh && make install ) - touch $@ - -CLEAN_FILE += .clinkcc -CLEAN_PKG += clinkcc -DISTCLEAN_PKG += clinkcc$(CLINKCC_VERSION).tar.gz - -# *************************************************************************** # YASM assembler # *************************************************************************** diff --git a/extras/contrib/src/Patches/clinkcc.patch b/extras/contrib/src/Patches/clinkcc.patch deleted file mode 100644 index 65b99bf..0000000 --- a/extras/contrib/src/Patches/clinkcc.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -ru clinkcc.orig/configure.in clinkcc/configure.in ---- clinkcc.orig/configure.in 2005-11-14 18:08:07.000000000 +0100 -+++ clinkcc/configure.in 2005-11-14 18:08:13.000000000 +0100 -@@ -150,6 +150,7 @@ - AC_CHECK_FUNCS([iconv]) - AC_CHECK_HEADERS([iconv.h]) - AC_CHECK_LIB([iconv],[main]) -+AM_ICONV - - ############################## - # Checks for pthread -diff -ru clinkcc.orig/src/cybergarage/xml/XML.cpp clinkcc/src/cybergarage/xml/XML.cpp ---- clinkcc.orig/src/cybergarage/xml/XML.cpp 2005-11-14 18:08:07.000000000 +0100 -+++ clinkcc/src/cybergarage/xml/XML.cpp 2005-11-14 18:08:13.000000000 +0100 -@@ -123,7 +123,7 @@ - char *cpbuf = strdup(str); - if (cpbuf == NULL) - return NULL; -- const char *inbuf = cpbuf; -+ ICONV_CONST char *inbuf = cpbuf; - size_t inbyteleft = strlen(str); - size_t outbufSize = inbyteleft * sizeof(UnicodeStr) * 4; - UnicodeStr *outbuf = new UnicodeStr[outbufSize + 1]; -diff -ru clinkcc.orig/src/cybergarage/xml/libxml2/Libxml2Parser.cpp clinkcc/src/cybergarage/xml/libxml2/Libxml2Parser.cpp ---- clinkcc.orig/src/cybergarage/xml/libxml2/Libxml2Parser.cpp 2005-11-14 18:08:07.000000000 +0100 -+++ clinkcc/src/cybergarage/xml/libxml2/Libxml2Parser.cpp 2005-11-14 18:08:44.000000000 +0100 -@@ -124,7 +124,7 @@ - xmlNodePtr child = cur->xmlChildrenNode; - while ( child != NULL ) { - -- Node *newChildNode = convertToCLinkFormat( doc, child, depth 1 ); -+ Node *newChildNode = convertToCLinkFormat( doc, child, depth ); - if ( newChildNode ) { - newNode->addNode( newChildNode ); - } diff --git a/extras/contrib/src/Patches/clinkcc_osx.patch b/extras/contrib/src/Patches/clinkcc_osx.patch deleted file mode 100644 index 53ba29e..0000000 --- a/extras/contrib/src/Patches/clinkcc_osx.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ru clinkcc.orig/src/cybergarage/xml/XML.cpp clinkcc/src/cybergarage/xml/XML.cpp ---- clinkcc.orig/src/cybergarage/xml/XML.cpp 2005-11-14 18:11:07.000000000 +0100 -+++ clinkcc/src/cybergarage/xml/XML.cpp 2005-11-14 18:12:27.000000000 +0100 -@@ -117,7 +117,7 @@ - } - utf8str[outLen] = '\0'; - return utf8str; --#elif defined(HAVE_ICONV) || defined(HAVE_ICONV_H) -+/*#elif defined(HAVE_ICONV) || defined(HAVE_ICONV_H) - iconvMutex.lock(); - - char *cpbuf = strdup(str); -@@ -166,7 +166,7 @@ - free(cpbuf); - iconvMutex.unlock(); - -- return unistr; -+ return unistr;*/ - #else - outLen = strlen(str); - UnicodeStr *utf8str = new UnicodeStr[outLen+1]; _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
