From: Andres Mejia <mcitadel@gmail.com>
Date: Wed, 27 Jul 2011 02:57:10 +0000 (-0400)
Subject: Update soname-fix.patch.
X-Git-Tag: archive/raspbian/1.0.1+dfsg1-4+rpi1~1^2~288
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=dffad51e8446086fdfed6b5f0104b433f48dec5a;p=gpac.git

Update soname-fix.patch.
---

diff --git a/debian/patches/soname-fix.patch b/debian/patches/soname-fix.patch
index 9041971..a045d79 100644
--- a/debian/patches/soname-fix.patch
+++ b/debian/patches/soname-fix.patch
@@ -3,7 +3,7 @@ Origin: http://git.debian.org/?p=pkg-multimedia/gpac.git;a=blob;f=debian/patches
 Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3295894&group_id=84101&atid=571740
 --- a/configure
 +++ b/configure
-@@ -1743,6 +1743,10 @@
+@@ -1769,6 +1769,10 @@
  
  
  version="`grep '#define GPAC_VERSION ' \"$source_path/include/gpac/tools.h\" | cut -d '"' -f 2`"
@@ -14,7 +14,7 @@ Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3295894&group_id=841
  
  if which svnversion >/dev/null
  then
-@@ -2080,6 +2084,9 @@
+@@ -2107,6 +2111,9 @@
  fi
  echo "EXTRALIBS=$extralibs" >> config.mak
  echo "VERSION=$version" >>config.mak
@@ -23,14 +23,14 @@ Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3295894&group_id=841
 +echo "VERSION_MICRO=$version_micro" >>config.mak
  
  if test "$use_fixed_point" = "yes"; then
- echo "#define GPAC_FIXED_POINT" >> $TMPH
-@@ -2122,6 +2129,7 @@
+     echo "#define GPAC_FIXED_POINT" >> $TMPH
+@@ -2149,6 +2156,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
++    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
@@ -48,7 +48,7 @@ Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3295894&group_id=841
  endif
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -169,7 +169,7 @@
+@@ -168,7 +168,7 @@
  EXTRALIBS+=$(GPAC_SH_FLAGS)
  endif
  
@@ -57,7 +57,7 @@ Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3295894&group_id=841
  ifeq ($(CONFIG_DARWIN), yes)
  LD_SONAME=
  endif
-@@ -210,6 +210,10 @@
+@@ -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)
@@ -68,7 +68,7 @@ Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3295894&group_id=841
  endif
  
  dep: depend
-@@ -220,7 +224,8 @@
+@@ -219,7 +223,8 @@
  
  clean: 
  	rm -f $(OBJS) ../bin/gcc/$(LIB)