From c38ff0ad84cc6a1a9bb186bfcaf14ad5742c144e Mon Sep 17 00:00:00 2001 From: Alessio Treglia Date: Sat, 11 Feb 2012 09:29:02 +0100 Subject: [PATCH] Refresh soname-fix.patch --- debian/patches/soname-fix.patch | 39 +++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/debian/patches/soname-fix.patch b/debian/patches/soname-fix.patch index a045d79..01f8a37 100644 --- a/debian/patches/soname-fix.patch +++ b/debian/patches/soname-fix.patch @@ -1,9 +1,16 @@ 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 ---- a/configure -+++ b/configure -@@ -1769,6 +1769,10 @@ +--- + Makefile | 5 +++-- + configure | 8 ++++++++ + include/gpac/tools.h | 9 +++++++-- + src/Makefile | 9 +++++++-- + 4 files changed, 25 insertions(+), 6 deletions(-) + +--- gpac.orig/configure ++++ gpac/configure +@@ -1769,6 +1769,10 @@ echo "#define GPAC_CONFIGURATION \"$GPAC version="`grep '#define GPAC_VERSION ' \"$source_path/include/gpac/tools.h\" | cut -d '"' -f 2`" @@ -14,7 +21,7 @@ Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3295894&group_id=841 if which svnversion >/dev/null then -@@ -2107,6 +2111,9 @@ +@@ -2107,6 +2111,9 @@ if test "$bigendian" = "yes" ; then fi echo "EXTRALIBS=$extralibs" >> config.mak echo "VERSION=$version" >>config.mak @@ -24,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 -@@ -2149,6 +2156,7 @@ +@@ -2149,6 +2156,7 @@ else fi if test "$win32" = "no" ; then @@ -32,9 +39,9 @@ Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3295894&group_id=841 echo "GPAC_SH_FLAGS=$GPAC_SH_FLAGS" >> config.mak echo "DYN_LIB_SUFFIX=$DYN_LIB_SUFFIX" >> config.mak else ---- a/Makefile -+++ b/Makefile -@@ -106,8 +106,9 @@ +--- gpac.orig/Makefile ++++ gpac/Makefile +@@ -106,8 +106,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 @@ -46,9 +53,9 @@ Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3295894&group_id=841 ifeq ($(DESTDIR)$(prefix),$(prefix)) ldconfig || true endif ---- a/src/Makefile -+++ b/src/Makefile -@@ -168,7 +168,7 @@ +--- gpac.orig/src/Makefile ++++ gpac/src/Makefile +@@ -168,7 +168,7 @@ endif EXTRALIBS+=$(GPAC_SH_FLAGS) endif @@ -57,7 +64,7 @@ Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3295894&group_id=841 ifeq ($(CONFIG_DARWIN), yes) LD_SONAME= endif -@@ -209,6 +209,10 @@ +@@ -209,6 +209,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) @@ -68,7 +75,7 @@ Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3295894&group_id=841 endif dep: depend -@@ -219,7 +223,8 @@ +@@ -219,7 +223,8 @@ depend: clean: rm -f $(OBJS) ../bin/gcc/$(LIB) @@ -78,9 +85,9 @@ Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3295894&group_id=841 distclean: clean rm -f Makefile.bak .depend ---- a/include/gpac/tools.h -+++ b/include/gpac/tools.h -@@ -57,8 +57,13 @@ +--- 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 */ -- 2.30.2