[SCM] gpac/master: Update patches. Remove unneeded patches.

[ceros-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 749dffe11070684f63ba1cc4929f46bffa724629
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Fri Oct 29 15:31:20 2010 -0400

    Update patches. Remove unneeded patches.

diff --git a/debian/patches/01_soname.patch b/debian/patches/01_soname.patch
deleted file mode 100644
index 72947af..0000000
--- a/debian/patches/01_soname.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Patch to fix soname version.
-==========================================================================
-
---- a/configure
-+++ b/configure
-@@ -1535,6 +1535,7 @@
- fi
- 
- if test "$win32" = "no" ; then
-+	DYN_LIB_SUFFIX="${DYN_LIB_SUFFIX}.${version}"
- 	echo "GPAC_SH_FLAGS=$GPAC_SH_FLAGS" >> config.mak
- 	echo "DYN_LIB_SUFFIX=$DYN_LIB_SUFFIX" >> config.mak
- else
---- a/Makefile
-+++ b/Makefile
-@@ -66,8 +66,8 @@
- 	install -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac-$(VERSION).$(DYN_LIB_SUFFIX)
- 	ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(DYN_LIB_SUFFIX)
- else
--	install $(INSTFLAGS) -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac-$(VERSION).$(DYN_LIB_SUFFIX)
--	ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(DYN_LIB_SUFFIX)
-+	install $(INSTFLAGS) -m 755 bin/gcc/libgpac.$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac.$(DYN_LIB_SUFFIX)
-+	ln -sf libgpac.$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac.so
- 	ldconfig || true
- endif
- endif
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -212,6 +212,9 @@
- 	ar cr ../bin/gcc/libgpac_static.a $(OBJS)
- 	ranlib ../bin/gcc/libgpac_static.a
- 	$(CC) $(SHFLAGS) $(LD_SONAME) $(LDFLAGS) -o ../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS)
-+ifeq (,$(findstring yes, $(CONFIG_DARWIN) $(CONFIG_WIN32)))
-+	ln -sf $@ ../bin/gcc/libgpac.so
-+endif
- 
- dep: depend
- 
-@@ -222,6 +225,7 @@
- clean: 
- 	rm -f $(OBJS) $(LIB)
- 	rm -rf ../bin/gcc/libgpac_static.a
-+	rm -rf ../bin/gcc/libgpac.so
- 
- distclean: clean
- 	rm -f Makefile.bak .depend
diff --git a/debian/patches/02_amd64.diff b/debian/patches/02_amd64.diff
index e85a842..2250073 100644
--- a/debian/patches/02_amd64.diff
+++ b/debian/patches/02_amd64.diff
@@ -3,12 +3,12 @@ Subject: Don't install library in /usr/lib64
 
 --- a/configure
 +++ b/configure
-@@ -222,7 +222,7 @@
+@@ -309,7 +309,7 @@
      if [ x"$canon_arch" = x"x86_64" -o x"$canon_arch" = x"amd64" ]; then
        if [ -z "`echo $CFLAGS | grep -- -m32`"  ]; then
          cpu="x86_64"
--	libdir="lib64"
-+	libdir="lib"
-         #that's a bit crude...
-         PIC_CFLAGS="-fPIC -DPIC"
+-        libdir="lib64"
++        libdir="lib"
          want_pic="yes"
+       fi
+     fi
diff --git a/debian/patches/03_memeset-typo.diff b/debian/patches/03_memeset-typo.diff
deleted file mode 100644
index 052e5b2..0000000
--- a/debian/patches/03_memeset-typo.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Subject: correct the chpl_New function to not overwrite memory during initialization
-Bug-Ubuntu: #273075
-
---- a/src/isomedia/box_code_base.c
-+++ b/src/isomedia/box_code_base.c
-@@ -109,7 +109,7 @@
- 	
- 	tmp = (GF_ChapterListBox *) malloc(sizeof(GF_ChapterListBox));
- 	if (tmp == NULL) return NULL;
--	memset(tmp, 0, sizeof(GF_CopyrightBox));
-+	memset(tmp, 0, sizeof(GF_ChapterListBox));
- 	tmp->list = gf_list_new();
- 	gf_isom_full_box_init((GF_Box *)tmp);
- 	tmp->type = GF_ISOM_BOX_TYPE_CHPL;
diff --git a/debian/patches/04_glx-func-def.diff b/debian/patches/04_glx-func-def.diff
index 9c43846..006a462 100644
--- a/debian/patches/04_glx-func-def.diff
+++ b/debian/patches/04_glx-func-def.diff
@@ -4,9 +4,9 @@ Bug-Ubuntu: #402177
 
 --- a/src/compositor/visual_manager_3d_gl.c
 +++ b/src/compositor/visual_manager_3d_gl.c
-@@ -70,6 +70,7 @@
- #elif defined (WIN32)
- #define GET_GLFUN(__name) (PFNGLARBMULTITEXTUREPROC) wglGetProcAddress(__name) 
+@@ -76,6 +76,7 @@
+ #elif defined(CONFIG_DARWIN_GL)
+ #define GET_GLFUN(__name) (PFNGLARBMULTITEXTUREPROC) glutGetProcAddress(__name)  
  #else
 +extern void (*glXGetProcAddress(const GLubyte *procname))( void );
  #define GET_GLFUN(__name) (PFNGLARBMULTITEXTUREPROC) glXGetProcAddress(__name) 
diff --git a/debian/patches/series b/debian/patches/series
index 2a2620b..3ecbfc6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-01_soname.patch
 02_amd64.diff
-03_memeset-typo.diff
 04_glx-func-def.diff

-- 
gpac packaging