Commit e3edfb6b authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Contribs: remove clinkcc

parent 5d820e55
......@@ -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
......@@ -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
......@@ -2117,31 +2117,6 @@ CLEAN_FILE += .expat
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 -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 -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];
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment