Contrib: a bit more cleaning

(cherry picked from commit bc96de5b)
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

extras/contrib/src/Makefile

@@ -563,20 +563,9 @@ DISTCLEAN_PKG += a52dec-$(A52DEC_VERSION).tar.gz
 # mpeg2dec
 # ***************************************************************************
 
-#mpeg2dec:
-#	@echo "*** Please press return here : ***"
-#	cvs -d $(MPEG2DEC_CVSROOT) login
-#	cvs -d $(MPEG2DEC_CVSROOT) co mpeg2dec
-#	(cd $@; ./bootstrap)
-
 libmpeg2-$(LIBMPEG2_VERSION).tar.gz:
 	$(WGET) $(LIBMPEG2_URL)
 
-# It is easier to use bootstrapped versions...
-#mpeg2dec-$(MPEG2DEC_VERSION).tar.gz:
-#	$(WGET) $(MPEG2DEC_SNAPSHOT)
-#	mv mpeg2dec-$(MPEG2DEC_DATE).tar.gz $@
-
 libmpeg2: libmpeg2-$(LIBMPEG2_VERSION).tar.gz
 	$(EXTRACT_GZ)
 
@@ -586,7 +575,6 @@ libmpeg2: libmpeg2-$(LIBMPEG2_VERSION).tar.gz
 
 CLEAN_FILE += .mpeg2
 CLEAN_PKG += libmpeg2
-#DISTCLEAN_PKG += mpeg2dec-$(MPEG2DEC_VERSION)-cvs.tar.gz
 DISTCLEAN_PKG += libmpeg2-$(LIBMPEG2_VERSION).tar.gz
 
 # ***************************************************************************
@@ -721,12 +709,6 @@ DISTCLEAN_PKG += libogg-$(OGG_VERSION).tar.gz
 # vorbis
 # ***************************************************************************
 
-#vorbis:
-#	@echo "*** Please type \"anoncvs\" here : ***"
-#	cvs -d $(OGG_CVSROOT) login
-#	cvs -d $(OGG_CVSROOT) co vorbis
-#	(cd $@; ./autogen.sh)
-
 libvorbis-$(VORBIS_VERSION).tar.gz:
 	$(WGET) $(VORBIS_URL)
 
@@ -1776,23 +1758,11 @@ DISTCLEAN_PKG += zvbi-$(ZVBI_VERSION).tar.bz2
 # libraw1394
 # ***************************************************************************
 
-#ifdef SVN
-#libraw1394:
-#	$(SVN) co -r 325 $(LIBDC1394_SVN)/libraw1394/trunk/libraw1394  libraw1394
-#        (cd $<; libtoolize --copy --force; \
-#                autopoint -f; \
-#                aclocal -I extras/contrib/share/aclocal; \
-#                autoconf; \
-#                autoheader; \
-#                automake --add-missing --copy -Wall)
-#
-#else
 libraw1394-$(LIBRAW1394_VERSION).tar.gz:
 	$(WGET) $(LIBRAW1394_URL)
 
 libraw1394: libraw1394-$(LIBRAW1394_VERSION).tar.gz
 	$(EXTRACT_GZ)
-#endif
 
 .raw1394: libraw1394
 	(cd $<; ./configure --prefix=$(PREFIX) && make && make DESTDIR=$(PREFIX) install)
@@ -1807,23 +1777,11 @@ DISTCLEAN_PKG += libraw1394-$(LIBRAW1394_VERSION).tar.gz
 # libdc1394
 # ***************************************************************************
 
-#ifdef SVN
-#libdc1394:
-#	$(SVN) co -r 325 $(LIBDC1394_SVN)/libdc1394/trunk/libdc1394  libdc1394
-#        (cd $<; libtoolize --copy --force; \
-#                autopoint -f; \
-#                aclocal -I extras/contrib/share/aclocal; \
-#                autoconf; \
-#                autoheader; \
-#                automake --add-missing --copy -Wall)
-#
-#else
 libdc1394-$(LIBDC1394_VERSION).tar.gz:
 	$(WGET) $(LIBDC1394_URL)
 
 libdc1394: libdc1394-$(LIBDC1394_VERSION).tar.gz
 	$(EXTRACT_GZ)
-#endif
 
 .dc1394: libdc1394
 	(cd $<; ./configure --prefix=$(PREFIX) && \
@@ -2353,7 +2311,7 @@ taglib-$(TAGLIB_VERSION).tar.gz:
 taglib: taglib-$(TAGLIB_VERSION).tar.gz
 	$(EXTRACT_GZ)
 ifdef HAVE_WIN32
-	patch -p0 < Patches/taglib.patch
+	patch -p0 < Patches/taglib-static.patch
 endif
 ifdef HAVE_CYGWIN
 	patch -p0 < Patches/taglib-cygwin.patch

extras/contrib/src/Patches/live-win32.patch

-Copyright (C) 2009 Laurent Aimar.
-Licensed under GNU General Public License version 2 or higher.
-diff -ur live/BasicUsageEnvironment/BasicTaskScheduler.cpp live-fix/BasicUsageEnvironment/BasicTaskScheduler.cpp
---- live/BasicUsageEnvironment/BasicTaskScheduler.cpp	2009-04-07 04:18:59.000000000 +0200
-+++ live-fix/BasicUsageEnvironment/BasicTaskScheduler.cpp	2009-04-16 00:33:19.000000000 +0200
-@@ -80,7 +80,7 @@
-       int dummySocketNum = socket(AF_INET, SOCK_DGRAM, 0);
-       FD_SET((unsigned)dummySocketNum, &fReadSet);
-     }
--    if (err != 0) {
-+    if (err != EINTR) {
- #else
-     if (errno != EINTR && errno != EAGAIN) {
- #endif
-diff -ur live/BasicUsageEnvironment/BasicUsageEnvironment.cpp live-fix/BasicUsageEnvironment/BasicUsageEnvironment.cpp
---- live/BasicUsageEnvironment/BasicUsageEnvironment.cpp	2009-04-07 04:18:59.000000000 +0200
-+++ live-fix/BasicUsageEnvironment/BasicUsageEnvironment.cpp	2009-04-16 00:30:33.000000000 +0200
-@@ -61,6 +61,20 @@
- #endif
- }
- 
-+int BasicUsageEnvironment::getNetErrno() const {
-+#if defined(__WIN32__) || defined(_WIN32)
-+#ifndef _WIN32_WCE
-+    errno = WSAGetLastError();
-+#endif
-+#endif
-+#if defined(_WIN32_WCE)
-+  return WSAGetLastError();
-+#else
-+  return errno;
-+#endif
-+}
-+
-+
- UsageEnvironment& BasicUsageEnvironment::operator<<(char const* str) {
- 	fprintf(stderr, "%s", str);
- 	return *this;
-diff -ur live/BasicUsageEnvironment/include/BasicUsageEnvironment.hh live-fix/BasicUsageEnvironment/include/BasicUsageEnvironment.hh
---- live/BasicUsageEnvironment/include/BasicUsageEnvironment.hh	2009-04-07 04:18:59.000000000 +0200
-+++ live-fix/BasicUsageEnvironment/include/BasicUsageEnvironment.hh	2009-04-16 00:30:33.000000000 +0200
-@@ -30,6 +30,7 @@
- 
-   // redefined virtual functions:
-   virtual int getErrno() const;
-+  virtual int getNetErrno() const;
- 
-   virtual UsageEnvironment& operator<<(char const* str);
-   virtual UsageEnvironment& operator<<(int i);
-diff -ur live/groupsock/GroupsockHelper.cpp live-fix/groupsock/GroupsockHelper.cpp
---- live/groupsock/GroupsockHelper.cpp	2009-04-07 04:18:59.000000000 +0200
-+++ live-fix/groupsock/GroupsockHelper.cpp	2009-04-16 00:30:33.000000000 +0200
-@@ -230,10 +230,13 @@
-     if (timeout != NULL && result == 0) {
-       break; // this is OK - timeout occurred
-     } else if (result <= 0) {
-+      if (env.getNetErrno() == EINTR ||
- #if defined(__WIN32__) || defined(_WIN32)
-+          env.getNetErrno() == EWOULDBLOCK
- #else
--      if (errno == EINTR || errno == EAGAIN) continue;
-+          env.getNetErrno() == EAGAIN
- #endif
-+         ) continue;
-       socketErr(env, "select() error: ");
-       break;
-     }
-@@ -271,7 +274,7 @@
- 			 &addressSize);
-     if (bytesRead < 0) {
-       //##### HACK to work around bugs in Linux and Windows:
--      int err = env.getErrno();
-+      int err = env.getNetErrno();
-       if (err == 111 /*ECONNREFUSED (Linux)*/
- #if defined(__WIN32__) || defined(_WIN32)
- 	  // What a piece of crap Windows is.  Sometimes
-@@ -432,7 +435,7 @@
-   if (setsockopt(socket, IPPROTO_IP, IP_ADD_MEMBERSHIP,
- 		 (const char*)&imr, sizeof (struct ip_mreq)) < 0) {
- #if defined(__WIN32__) || defined(_WIN32)
--    if (env.getErrno() != 0) {
-+    if (env.getNetErrno() != 0) {
-       // That piece-of-shit toy operating system (Windows) sometimes lies
-       // about setsockopt() failing!
- #endif
-diff -ur live/groupsock/include/NetCommon.h live-fix/groupsock/include/NetCommon.h
---- live/groupsock/include/NetCommon.h	2009-04-07 04:18:59.000000000 +0200
-+++ live-fix/groupsock/include/NetCommon.h	2009-04-16 00:30:33.000000000 +0200
-@@ -36,6 +36,8 @@
- 
- #define closeSocket closesocket
- #define EWOULDBLOCK WSAEWOULDBLOCK
-+#define EINPROGRESS WSAEWOULDBLOCK
-+#define EINTR WSAEINTR
- 
- #if defined(_WIN32_WCE)
- #define NO_STRSTREAM 1
-diff -ur live/liveMedia/HTTPSink.cpp live-fix/liveMedia/HTTPSink.cpp
---- live/liveMedia/HTTPSink.cpp	2009-04-07 04:19:00.000000000 +0200
-+++ live-fix/liveMedia/HTTPSink.cpp	2009-04-16 00:30:33.000000000 +0200
-@@ -107,7 +107,7 @@
-     fClientSocket = accept(fSocket, (struct sockaddr*)&clientAddr,
- 			   &clientAddrLen);
-     if (fClientSocket < 0) {
--      int err = envir().getErrno();
-+      int err = envir().getNetErrno();
-       if (err != EWOULDBLOCK) {
- 	envir().setResultErrMsg("accept() failed: ");
- 	return False;
-@@ -158,7 +158,7 @@
-     int sendResult
-       = send(fClientSocket, (char*)(&fBuffer[0]), frameSize, 0);
-     if (sendResult < 0) {
--      int err = envir().getErrno();
-+      int err = envir().getNetErrno();
-       if (err != EWOULDBLOCK) {
- 	// The client appears to have gone; close him down,
- 	// and consider ourselves done:
-diff -ur live/liveMedia/RTSPClient.cpp live-fix/liveMedia/RTSPClient.cpp
---- live/liveMedia/RTSPClient.cpp	2009-04-16 00:31:40.000000000 +0200
-+++ live-fix/liveMedia/RTSPClient.cpp	2009-04-16 00:30:33.000000000 +0200
-@@ -1834,11 +1834,7 @@
-         makeSocketNonBlocking(fInputSocketNum);
-       }
-       if (connect(fInputSocketNum, (struct sockaddr*) &remoteName, sizeof remoteName) != 0) {
--#if defined(__WIN32__) || defined(_WIN32)
--        if (errno != WSAEINPROGRESS && errno != WSAEWOULDBLOCK) {
--#else
--        if (errno != EINPROGRESS) {
--#endif
-+        if (envir().getNetErrno() != EINPROGRESS && envir().getNetErrno() != EWOULDBLOCK) {
-           envir().setResultErrMsg("connect() failed: ");
-           break;
-         }
-diff -ur live/liveMedia/RTSPOverHTTPServer.cpp live-fix/liveMedia/RTSPOverHTTPServer.cpp
---- live/liveMedia/RTSPOverHTTPServer.cpp	2009-04-07 04:19:00.000000000 +0200
-+++ live-fix/liveMedia/RTSPOverHTTPServer.cpp	2009-04-16 00:30:33.000000000 +0200
-@@ -119,7 +119,7 @@
-   int clientSocket = accept(fServerSocket, (struct sockaddr*)&clientAddr,
-                             &clientAddrLen);
-   if (clientSocket < 0) {
--    int err = envir().getErrno();
-+    int err = envir().getNetErrno();
-     if (err != EWOULDBLOCK) {
-       envir().setResultErrMsg("accept() failed: ");
-     }
-diff -ur live/liveMedia/RTSPServer.cpp live-fix/liveMedia/RTSPServer.cpp
---- live/liveMedia/RTSPServer.cpp	2009-04-07 04:19:00.000000000 +0200
-+++ live-fix/liveMedia/RTSPServer.cpp	2009-04-16 00:30:33.000000000 +0200
-@@ -226,7 +226,7 @@
-   int clientSocket = accept(fServerSocket, (struct sockaddr*)&clientAddr,
- 			    &clientAddrLen);
-   if (clientSocket < 0) {
--    int err = envir().getErrno();
-+    int err = envir().getNetErrno();
-     if (err != EWOULDBLOCK) {
-         envir().setResultErrMsg("accept() failed: ");
-     }
-diff -ur live/UsageEnvironment/include/UsageEnvironment.hh live-fix/UsageEnvironment/include/UsageEnvironment.hh
---- live/UsageEnvironment/include/UsageEnvironment.hh	2009-04-07 04:18:59.000000000 +0200
-+++ live-fix/UsageEnvironment/include/UsageEnvironment.hh	2009-04-16 00:30:33.000000000 +0200
-@@ -71,6 +71,7 @@
- 
-   // 'errno'
-   virtual int getErrno() const = 0;
-+  virtual int getNetErrno() const = 0;
- 
-   // 'console' output:
-   virtual UsageEnvironment& operator<<(char const* str) = 0;
-