From: Alessio Treglia <alessio@debian.org>
Date: Mon, 13 Feb 2012 15:55:54 +0000 (+0100)
Subject: Delete multiarch.patch, applied usptream.
X-Git-Tag: archive/raspbian/1.0.1+dfsg1-4+rpi1~1^2~208^2~26
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1f06c5f75902c6f94f05ae0c0ec86d1ef3b020af;p=gpac.git

Delete multiarch.patch, applied usptream.

Refresh patches.
---

diff --git a/debian/patches/multiarch.patch b/debian/patches/multiarch.patch
deleted file mode 100644
index e633021..0000000
--- a/debian/patches/multiarch.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Author: Alessio Treglia <alessio@debian.org>
-Description: Process configure's --libdir option to set the shared library
- installation path properly.
-Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3486615&group_id=84101&atid=571738
----
- Makefile  |    1 +
- configure |    8 +++-----
- 2 files changed, 4 insertions(+), 5 deletions(-)
-
---- gpac.orig/configure
-+++ gpac/configure
-@@ -292,6 +292,8 @@ for opt do
-     case "$opt" in
-         --prefix=*) prefix=`echo $opt | cut -d '=' -f 2`
-             ;;
-+        --libdir=*) libdir=`echo $opt | cut -d '=' -f 2`
-+            ;;
-         --mandir=*) mandir=`echo $opt | cut -d '=' -f 2`
-             ;;
-         --source-path=*) source_path=`echo $opt | cut -d '=' -f 2`
-@@ -340,9 +342,6 @@ case "$cpu" in
-         if [ x"$canon_arch" = x"x86_64" -o x"$canon_arch" = x"amd64" ]; then
-             if [ -z "`echo $CFLAGS | grep -- -m32`"  ]; then
-                 cpu="x86_64"
--                if test "$linux" = "yes" ; then
--                    libdir="lib64"
--                fi
-                 want_pic="yes"
-             fi
-         fi
-@@ -355,7 +354,6 @@ case "$cpu" in
-         ;;
-     ppc64)
-         cpu="powerpc"
--        libdir="lib64"
-         ;;  
-     "Power Macintosh"|ppc)
-         cpu="powerpc"
-@@ -2310,6 +2308,7 @@ echo "# Automatically generated by confi
- echo "GPAC_CONFIGURATION=$GPAC_CONFIGURATION" >> config.mak
- 
- echo "prefix=$prefix" >> config.mak
-+echo "libdir=$libdir" >> config.mak
- echo "DESTDIR=$DESTDIR" >> config.mak
- echo "moddir=$prefix/$libdir/gpac" >> config.mak
- echo "moddir_path=$prefix/$libdir/gpac" >> config.mak
-@@ -2326,7 +2325,6 @@ echo "OPTFLAGS=$CFLAGS" >> config.mak
- echo "CPPFLAGS=$CPPFLAGS" >> config.mak
- echo "LDFLAGS=$LDFLAGS" >> config.mak
- echo "SHFLAGS=$SHFLAGS" >> config.mak
--echo "libdir=$libdir" >> config.mak
- 
- 
- #for cross-compilation
---- gpac.orig/Makefile
-+++ gpac/Makefile
-@@ -55,6 +55,7 @@ tar:
- 
- install:
- 	$(INSTALL) -d "$(DESTDIR)$(prefix)"
-+	$(INSTALL) -d "$(DESTDIR)$(prefix)/$(libdir)"
- 	$(INSTALL) -d "$(DESTDIR)$(prefix)/bin"
- 	$(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/MP4Box "$(DESTDIR)$(prefix)/bin"
- 	$(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/MP4Client "$(DESTDIR)$(prefix)/bin"
diff --git a/debian/patches/series b/debian/patches/series
index b4608cf..6c94bcc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 soname-fix.patch
 mp4box-manpage-fix.patch
-multiarch.patch
 dfsg.patch
 gcc-optflags.patch
diff --git a/debian/patches/soname-fix.patch b/debian/patches/soname-fix.patch
index e9219e5..d6a59cb 100644
--- a/debian/patches/soname-fix.patch
+++ b/debian/patches/soname-fix.patch
@@ -10,7 +10,7 @@ Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3295894&group_id=841
 
 --- gpac.orig/configure
 +++ gpac/configure
-@@ -2011,6 +2011,10 @@ echo "#define GF_CONFIG_H" >> $TMPH
+@@ -2009,6 +2009,10 @@ echo "#define GF_CONFIG_H" >> $TMPH
  echo "#define GPAC_CONFIGURATION \"$GPAC_CONFIGURATION\"" >> $TMPH
  
  version="`grep '#define GPAC_VERSION ' \"$source_path/include/gpac/tools.h\" | cut -d '"' -f 2`"
@@ -21,7 +21,7 @@ Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3295894&group_id=841
  
  if which svnversion >/dev/null
  then
-@@ -2351,6 +2355,9 @@ if test "$bigendian" = "yes" ; then
+@@ -2349,6 +2353,9 @@ if test "$bigendian" = "yes" ; then
  fi
  echo "EXTRALIBS=$extralibs" >> config.mak
  echo "VERSION=$version" >>config.mak
@@ -31,7 +31,7 @@ Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3295894&group_id=841
  
  if test "$use_fixed_point" = "yes"; then
      echo "#define GPAC_FIXED_POINT" >> $TMPH
-@@ -2393,6 +2400,7 @@ else
+@@ -2391,6 +2398,7 @@ else
  fi
  
  if test "$win32" = "no" ; then
@@ -41,7 +41,7 @@ Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3295894&group_id=841
  else
 --- gpac.orig/Makefile
 +++ gpac/Makefile
-@@ -107,8 +107,9 @@ ifeq ($(CONFIG_DARWIN),yes)
+@@ -112,8 +112,9 @@ ifeq ($(CONFIG_DARWIN),yes)
  	$(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