[SCM] gpac packaging branch, master, updated. debian/0.4.5-1-7-g2220fe3

Fri Aug 6 02:14:30 UTC 2010

The following commit has been merged in the master branch:
commit 2220fe31f9e4f826a4548929ac5078bec08fe91e
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Thu Aug 5 22:11:51 2010 -0400

    Refresh gnutls patch.

diff --git a/debian/patches/gnutls-conversion.patch b/debian/patches/gnutls-conversion.patch
index 5ecdc71..e82f9db 100644
--- a/debian/patches/gnutls-conversion.patch
+++ b/debian/patches/gnutls-conversion.patch
@@ -1,10 +1,8 @@
 Patch to convert from OpenSSL to GnuTLS.
 ==========================================================================
-diff --git a/applications/mp4box/Makefile b/applications/mp4box/Makefile
-index d3c03fa..9d1ddfa 100644
 --- a/applications/mp4box/Makefile
 +++ b/applications/mp4box/Makefile
-@@ -36,7 +36,7 @@ else
+@@ -36,7 +36,7 @@
  EXT=
  PROG=MP4Box
  #LINKFLAGS+=-lgpac_static $(EXTRALIBS) $(GPAC_SH_FLAGS) -lz 
@@ -13,11 +11,9 @@ index d3c03fa..9d1ddfa 100644
  endif
  
  
-diff --git a/applications/mp4client/Makefile b/applications/mp4client/Makefile
-index 688d328..67a910c 100644
 --- a/applications/mp4client/Makefile
 +++ b/applications/mp4client/Makefile
-@@ -4,7 +4,7 @@ vpath %.c $(SRC_PATH)/applications/mp4client
+@@ -4,7 +4,7 @@
  
  CFLAGS= $(OPTFLAGS) -I$(SRC_PATH)/include
  
@@ -26,11 +22,9 @@ index 688d328..67a910c 100644
  
  ifeq ($(DEBUGBUILD), yes)
  CFLAGS+=-g
-diff --git a/applications/osmo4_wx/Makefile b/applications/osmo4_wx/Makefile
-index a0841d7..3430c2d 100644
 --- a/applications/osmo4_wx/Makefile
 +++ b/applications/osmo4_wx/Makefile
-@@ -41,7 +41,7 @@ SRCS := $(OBJS:.o=.cpp)
+@@ -41,7 +41,7 @@
  all: $(PROG)
  
  Osmo4$(EXE): $(OBJS)
@@ -39,11 +33,9 @@ index a0841d7..3430c2d 100644
  
  %.o: %.cpp
  	$(CXX) $(CFLAGS) $(INSTALL_FLAGS) $(WX_CFLAGS) -c -o $@ $< 
-diff --git a/applications/testapps/mp42ts/Makefile b/applications/testapps/mp42ts/Makefile
-index 53c5fb1..9b2b9f8 100644
 --- a/applications/testapps/mp42ts/Makefile
 +++ b/applications/testapps/mp42ts/Makefile
-@@ -27,7 +27,7 @@ else
+@@ -27,7 +27,7 @@
  EXT=
  PROG=mp42ts
  #LINKFLAGS+=-lgpac_static $(EXTRALIBS) $(GPAC_SH_FLAGS) -lz $(OGL_LIBS)
@@ -52,11 +44,9 @@ index 53c5fb1..9b2b9f8 100644
  endif
  
  
-diff --git a/applications/testapps/mp4_streamer/Makefile b/applications/testapps/mp4_streamer/Makefile
-index 2628096..25af208 100644
 --- a/applications/testapps/mp4_streamer/Makefile
 +++ b/applications/testapps/mp4_streamer/Makefile
-@@ -27,7 +27,7 @@ else
+@@ -27,7 +27,7 @@
  EXT=
  PROG=mp4_streamer
  #LINKFLAGS+=-lgpac_static $(EXTRALIBS) $(GPAC_SH_FLAGS) -lz $(OGL_LIBS)
@@ -65,11 +55,9 @@ index 2628096..25af208 100644
  endif
  
  
-diff --git a/configure b/configure
-index 3dce906..397e60c 100755
 --- a/configure
 +++ b/configure
-@@ -77,7 +77,7 @@ has_opengl="no"
+@@ -77,7 +77,7 @@
  disable_opengl="no"
  has_tinygl="no"
  enable_tinygl="no"
@@ -78,7 +66,7 @@ index 3dce906..397e60c 100755
  has_ipv6="no"
  has_dvb4linux="no"
  has_xmlrpc="no"
-@@ -162,7 +162,7 @@ echo "  --disable-opengl         disable OpenGL support"
+@@ -162,7 +162,7 @@
  echo "  --enable-tinygl          enable TinyGL support"
  echo "  --enable-joystick        enable joystick support"
  echo "  --enable-renoir          enable renoir 3D support"
@@ -87,7 +75,7 @@ index 3dce906..397e60c 100755
  echo "  --enable-amr-nb-fixed    enable AMR NB fixed-point decoder"
  echo "  --enable-amr-nb          enable AMR NB library"
  echo "  --enable-amr-wb          enable AMR WB library"
-@@ -559,23 +559,18 @@ fi
+@@ -559,23 +559,18 @@
  
  
  
@@ -118,7 +106,7 @@ index 3dce906..397e60c 100755
  fi
  
  
-@@ -1044,7 +1039,7 @@ for opt do
+@@ -1044,7 +1039,7 @@
    ;;
    --enable-tinygl) enable_tinygl="yes"
    ;;
@@ -127,7 +115,7 @@ index 3dce906..397e60c 100755
    ;;
    --use-faad=*) has_faad=${opt#--use-faad=}
    ;;
-@@ -1347,7 +1342,7 @@ echo "SDL Version too old - please upgrade for SDL support"
+@@ -1347,7 +1342,7 @@
  fi
  echo "OpenGL support: $has_opengl"
  echo "TinyGL support: $has_tinygl"
@@ -136,7 +124,7 @@ index 3dce906..397e60c 100755
  
  echo "Mozilla XUL/GECKO support: $has_xul"
  
-@@ -1598,10 +1593,10 @@ if test "$has_tinygl" = "yes" ; then
+@@ -1598,10 +1593,10 @@
  echo "#define GPAC_USE_TINYGL" >> $TMPH
  fi
  
@@ -151,8 +139,6 @@ index 3dce906..397e60c 100755
  fi
  
  echo "CONFIG_SDL=$has_sdl" >> config.mak
-diff --git a/include/gpac/download.h b/include/gpac/download.h
-index 89ccf6e..cb4dd76 100644
 --- a/include/gpac/download.h
 +++ b/include/gpac/download.h
 @@ -36,7 +36,7 @@
@@ -164,11 +150,9 @@ index 89ccf6e..cb4dd76 100644
   *
   *	@{
   */
-diff --git a/include/gpac/network.h b/include/gpac/network.h
-index 0e2bb23..65c6765 100644
 --- a/include/gpac/network.h
 +++ b/include/gpac/network.h
-@@ -348,7 +348,7 @@ GF_Err gf_sk_receive_wait(GF_Socket *sock, char *buffer, u32 length, u32 start_f
+@@ -348,7 +348,7 @@
  /*!
   *\brief gets socket handle
   *
@@ -177,8 +161,6 @@ index 0e2bb23..65c6765 100644
   *\param sock the socket object
   *\return the socket handle
   */
-diff --git a/src/utils/downloader.c b/src/utils/downloader.c
-index dcb8b13..9692853 100644
 --- a/src/utils/downloader.c
 +++ b/src/utils/downloader.c
 @@ -33,11 +33,13 @@
@@ -200,7 +182,7 @@ index dcb8b13..9692853 100644
  #endif
  
  
-@@ -49,7 +51,7 @@ static void gf_dm_connect(GF_DownloadSession *sess);
+@@ -49,7 +51,7 @@
  /*internal flags*/
  enum
  {
@@ -209,7 +191,7 @@ index dcb8b13..9692853 100644
  	GF_DOWNLOAD_SESSION_THREAD_DEAD	=	1<<11,
  	GF_DOWNLOAD_IS_ICY				=	1<<12,
  };
-@@ -99,8 +101,8 @@ struct __gf_download_session
+@@ -99,8 +101,8 @@
  	char *init_data;
  	u32 init_data_size;
  
@@ -220,7 +202,7 @@ index dcb8b13..9692853 100644
  #endif
  
  	void (*do_requests)(struct __gf_download_session *);
-@@ -124,86 +126,29 @@ struct __gf_download_manager
+@@ -124,86 +126,29 @@
  	GF_Config *cfg;
  	GF_List *sessions;
  
@@ -319,7 +301,7 @@ index dcb8b13..9692853 100644
  }
  
  #endif
-@@ -220,7 +165,7 @@ static Bool gf_dm_is_local(GF_DownloadManager *dm, const char *url)
+@@ -220,7 +165,7 @@
  static Bool gf_dm_can_handle_url(GF_DownloadManager *dm, const char *url)
  {
  	if (!strnicmp(url, "http://", 7)) return 1;
@@ -328,7 +310,7 @@ index dcb8b13..9692853 100644
  	if (!strnicmp(url, "https://", 8)) return 1;
  #endif
  	return 0;
-@@ -292,11 +237,10 @@ void gf_dm_configure_cache(GF_DownloadSession *sess)
+@@ -292,11 +237,10 @@
  
  static void gf_dm_disconnect(GF_DownloadSession *sess)
  {
@@ -344,7 +326,7 @@ index dcb8b13..9692853 100644
  	}
  #endif
  	if (sess->sock) {
-@@ -385,10 +329,10 @@ static GF_Err gf_dm_setup_from_url(GF_DownloadSession *sess, char *url)
+@@ -385,10 +329,10 @@
  	else if (!strnicmp(url, "https://", 8)) {
  		url += 8;
  		sess->port = 443;
@@ -357,7 +339,7 @@ index dcb8b13..9692853 100644
  		sess->do_requests = http_do_requests;
  	}
  	else if (!strnicmp(url, "ftp://", 6)) {
-@@ -539,9 +483,9 @@ static GF_Err gf_dm_read_data(GF_DownloadSession *sess, char *data, u32 data_siz
+@@ -539,9 +483,9 @@
  {
  	GF_Err e;
  	
@@ -370,7 +352,7 @@ index dcb8b13..9692853 100644
  		e = GF_OK;
  		data[size] = 0;
  		if (!size) e = GF_IP_NETWORK_EMPTY;
-@@ -554,7 +498,7 @@ static GF_Err gf_dm_read_data(GF_DownloadSession *sess, char *data, u32 data_siz
+@@ -554,7 +498,7 @@
  }
  
  
@@ -379,7 +361,7 @@ index dcb8b13..9692853 100644
  /*pattern comp taken from wget*/
  #define ASTERISK_EXCLUDES_DOT	/* mandated by rfc2818 */
  
-@@ -650,32 +594,30 @@ static void gf_dm_connect(GF_DownloadSession *sess)
+@@ -650,32 +594,30 @@
  	gf_sk_set_buffer_size(sess->sock, 0, GF_DOWNLOAD_BUFFER_SIZE);
  	gf_dm_configure_cache(sess);
  
@@ -429,7 +411,7 @@ index dcb8b13..9692853 100644
  
  			if (!success) {
  				gf_dm_disconnect(sess);
-@@ -741,8 +683,8 @@ GF_DownloadManager *gf_dm_new(GF_Config *cfg)
+@@ -741,8 +683,8 @@
  			dm->cache_directory = strdup(opt);
  		}
  	}
@@ -440,7 +422,7 @@ index dcb8b13..9692853 100644
  #endif
  	return dm;
  }
-@@ -768,8 +710,11 @@ void gf_dm_del(GF_DownloadManager *dm)
+@@ -768,8 +710,11 @@
  
  	free(dm->cache_directory);
  
@@ -454,7 +436,7 @@ index dcb8b13..9692853 100644
  #endif
  
  	free(dm);
-@@ -1162,10 +1107,10 @@ void http_do_requests(GF_DownloadSession *sess)
+@@ -1162,10 +1107,10 @@
  				fclose(profile);
  			}
  
@@ -468,7 +450,7 @@ index dcb8b13..9692853 100644
  			} else 
  #endif
  				e = gf_sk_send(sess->sock, tmp_buf, len+par.size);
-@@ -1174,10 +1119,10 @@ void http_do_requests(GF_DownloadSession *sess)
+@@ -1174,10 +1119,10 @@
  			free(tmp_buf);
  		} else {
  

-- 
gpac packaging

