From 6fad7d6404fed810c2410ce60dc69d5c26d68bb5 Mon Sep 17 00:00:00 2001
From: Alessio Treglia <alessio@debian.org>
Date: Wed, 7 Mar 2012 00:43:52 +0100
Subject: [PATCH] Drop soname-fix.patch, not needed anymore.

---
 debian/patches/series           |   1 -
 debian/patches/soname-fix.patch | 105 --------------------------------
 2 files changed, 106 deletions(-)
 delete mode 100644 debian/patches/soname-fix.patch

diff --git a/debian/patches/series b/debian/patches/series
index 0a2c4f7..5f3c756 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-soname-fix.patch
 mp4box-manpage-fix.patch
 gcc-optflags.patch
diff --git a/debian/patches/soname-fix.patch b/debian/patches/soname-fix.patch
deleted file mode 100644
index d6a59cb..0000000
--- a/debian/patches/soname-fix.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-Description: Patch to introduce proper soname versioning for library.
-Origin: http://git.debian.org/?p=pkg-multimedia/gpac.git;a=blob;f=debian/patches/soname-fix.patch
-Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3295894&group_id=84101&atid=571740
----
- Makefile             |    5 +++--
- configure            |    8 ++++++++
- include/gpac/tools.h |    9 +++++++--
- src/Makefile         |    9 +++++++--
- 4 files changed, 25 insertions(+), 6 deletions(-)
-
---- gpac.orig/configure
-+++ gpac/configure
-@@ -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`"
-+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}"
- 
- if which svnversion >/dev/null
- then
-@@ -2349,6 +2353,9 @@ if test "$bigendian" = "yes" ; then
- 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
-@@ -2391,6 +2398,7 @@ else
- 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
---- gpac.orig/Makefile
-+++ gpac/Makefile
-@@ -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
--	$(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
---- gpac.orig/src/Makefile
-+++ gpac/src/Makefile
-@@ -168,7 +168,7 @@ endif
- 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
-@@ -210,6 +210,10 @@ else
- 	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
-@@ -220,7 +224,8 @@ depend:
- 
- 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
---- gpac.orig/include/gpac/tools.h
-+++ gpac/include/gpac/tools.h
-@@ -57,8 +57,13 @@ extern "C" {
-  *
-  *	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
- 
- #include <gpac/version.h>
- #define GPAC_FULL_VERSION       GPAC_VERSION"-rev"GPAC_SVN_REVISION
-- 
2.30.2