Remove all patches.

amd64.patch no longer is needed with new filesystem layout.
glx-func-def.patch no longer applies because of rewritten code.
soname-fix.patch won't be used.

diff --git a/debian/patches/amd64.patch b/debian/patches/amd64.patch
deleted file mode 100644 (file)
index 3d7da6c..0000000
--- a/debian/patches/amd64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-From: Christian Marillat <marillat@debian.org>
-Subject: Don't install library in /usr/lib64
-
---- a/configure
-+++ b/configure
-@@ -309,7 +309,6 @@
-     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"
-         want_pic="yes"
-       fi
-     fi

diff --git a/debian/patches/glx-func-def.patch b/debian/patches/glx-func-def.patch
deleted file mode 100644 (file)
index 006a462..0000000
--- a/debian/patches/glx-func-def.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-From: Michael Terry <michael.terry@canonical.com> 
-Subject: Define a glXGetProcAddress prototype so that gcc doesn't assume it returns an int.
-Bug-Ubuntu: #402177
-
---- a/src/compositor/visual_manager_3d_gl.c
-+++ b/src/compositor/visual_manager_3d_gl.c
-@@ -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) 
- #endif
- 

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644 (file)
index ff717af..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-amd64.patch
-glx-func-def.patch
-soname-fix.patch

diff --git a/debian/patches/soname-fix.patch b/debian/patches/soname-fix.patch
deleted file mode 100644 (file)
index 564ba18..0000000
--- a/debian/patches/soname-fix.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-Patch to fix SONAME field in library.
-==========================================================================
---- a/configure
-+++ b/configure
-@@ -1714,6 +1714,10 @@
- 
- 
- version=`grep '#define GPAC_VERSION ' $source_path/include/gpac/tools.h | cut -d '"' -f 2`
-+version_major=`grep '#define GPAC_VERSION_MAJOR ' $source_path/include/gpac/tools.h | sed -e 's/.*\([0-9]\)\+$/\1/'`
-+version_minor=`grep '#define GPAC_VERSION_MINOR ' $source_path/include/gpac/tools.h | sed -e 's/.*\([0-9]\)\+$/\1/'`
-+version_micro=`grep '#define GPAC_VERSION_MICRO ' $source_path/include/gpac/tools.h | sed -e 's/.*\([0-9]\)\+$/\1/'`
-+soname_version="${version_major}.${version_minor}.${version_micro}"
- echo ""
- echo "** System Configuration"
- echo "Install prefix: $prefix"
-@@ -2043,6 +2047,9 @@
- fi
- echo "EXTRALIBS=$extralibs" >> config.mak
- echo "VERSION=$version" >>config.mak
-+echo "VERSION_MAJOR=$version_major" >>config.mak
-+echo "VERSION_MINOR=$version_minor" >>config.mak
-+echo "VERSION_MICRO=$version_micro" >>config.mak
- 
- if test "$use_fixed_point" = "yes"; then
- echo "#define GPAC_FIXED_POINT" >> $TMPH
-@@ -2085,6 +2092,7 @@
- fi
- 
- if test "$win32" = "no" ; then
-+      DYN_LIB_SUFFIX="${DYN_LIB_SUFFIX}.${soname_version}"
-       echo "GPAC_SH_FLAGS=$GPAC_SH_FLAGS" >> config.mak
-       echo "DYN_LIB_SUFFIX=$DYN_LIB_SUFFIX" >> config.mak
- else
---- a/Makefile
-+++ b/Makefile
-@@ -92,8 +92,9 @@
-       $(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.$(DYN_LIB_SUFFIX).$(VERSION)
--      ln -sf libgpac.$(DYN_LIB_SUFFIX).$(VERSION) $(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.$(VERSION_MAJOR)
-+      ln -sf libgpac.$(DYN_LIB_SUFFIX) $(DESTDIR)$(prefix)/$(libdir)/libgpac.so
- ifeq ($(DESTDIR)$(prefix),$(prefix))
-       ldconfig || true
- endif
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -168,7 +168,7 @@
- EXTRALIBS+=$(GPAC_SH_FLAGS)
- endif
- 
--LD_SONAME="-Wl,-soname,$(LIB)"
-+LD_SONAME="-Wl,-soname,libgpac.so.$(VERSION_MAJOR)"
- ifeq ($(CONFIG_DARWIN), yes)
- LD_SONAME=
- endif
-@@ -209,6 +209,10 @@
-       ar cr ../bin/gcc/libgpac_static.a $(OBJS)
-       ranlib ../bin/gcc/libgpac_static.a
-       $(CC) $(SHFLAGS) $(LD_SONAME) $(LDFLAGS) -o ../bin/gcc/$@ $(OBJS) $(EXTRALIBS)
-+ifeq (,$(findstring yes, $(CONFIG_DARWIN) $(CONFIG_WIN32)))
-+      ln -sf $@ ../bin/gcc/libgpac.so.$(VERSION_MAJOR)
-+      ln -sf $@ ../bin/gcc/libgpac.so
-+endif
- endif
- 
- dep: depend
-@@ -219,7 +223,8 @@
- 
- clean: 
-       rm -f $(OBJS) ../bin/gcc/$(LIB)
--      rm -rf ../bin/gcc/libgpac_static.a
-+      rm -rf ../bin/gcc/libgpac_static.a ../bin/gcc/libgpac.so \
-+              ../bin/gcc/libgpac.so.$(VERSION_MAJOR)
- 
- distclean: clean
-       rm -f Makefile.bak .depend
---- a/include/gpac/tools.h
-+++ b/include/gpac/tools.h
-@@ -57,8 +57,13 @@
-  *
-  *    Macro giving GPAC version expressed as a printable string
- */
--/*KEEP SPACE SEPARATORS FOR MAKE / GREP (SEE MAIN MAKEFILE)!!!, and NO SPACE in GPAC_VERSION for proper install*/
--#define GPAC_VERSION       "0.4.6-DEV"
-+/* KEEP SPACE SEPARATORS FOR MAKE / GREP (SEE MAIN MAKEFILE)!!!
-+ * SONAME versions must be digits (not strings)
-+ */
-+#define GPAC_VERSION          "0.4.6-DEV"
-+#define GPAC_VERSION_MAJOR    1
-+#define GPAC_VERSION_MINOR    0
-+#define GPAC_VERSION_MICRO    0
- 
- #define GPAC_INTERNAL_REV     "8"
- #define GPAC_FULL_VERSION       GPAC_VERSION" (internal rev. "GPAC_INTERNAL_REV")"