Fixup soname patch so that xvidcore build system generates proper soname via configur...

Needed a minor update in packaging as well for updated patch.

diff --git a/debian/libgpac-dev.install b/debian/libgpac-dev.install
index d2bf24186e2d3246f0a38dcdd08c7e5be6d2db22..8612bf84933cebaf3a51d9f4b9cc2106b1368300 100644 (file)
--- a/debian/libgpac-dev.install
+++ b/debian/libgpac-dev.install
@@ -1,2 +1,3 @@
 usr/include
 usr/lib/libgpac_static.a
+usr/lib/libgpac.so

diff --git a/debian/patches/01_soname.patch b/debian/patches/01_soname.patch
index 82cf27087bb8c0b18f9f16efc3b929f25ee8a1c6..72947afaf8a4ca29224743f61331c8241a8fc2e2 100644 (file)
--- a/debian/patches/01_soname.patch
+++ b/debian/patches/01_soname.patch
@@ -1,11 +1,46 @@
+Patch to fix soname version.
+==========================================================================
+
+--- a/configure
++++ b/configure
+@@ -1535,6 +1535,7 @@
+ fi
+ 
+ if test "$win32" = "no" ; then
++      DYN_LIB_SUFFIX="${DYN_LIB_SUFFIX}.${version}"
+       echo "GPAC_SH_FLAGS=$GPAC_SH_FLAGS" >> config.mak
+       echo "DYN_LIB_SUFFIX=$DYN_LIB_SUFFIX" >> config.mak
+ else
+--- a/Makefile
++++ b/Makefile
+@@ -66,8 +66,8 @@
+       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-$(VERSION).$(DYN_LIB_SUFFIX)
+-      ln -sf libgpac-$(VERSION).$(DYN_LIB_SUFFIX) $(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
+       ldconfig || true
+ endif
+ endif
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -179,7 +179,7 @@
- OBJSPIC=$(OBJS)
- endif
+@@ -212,6 +212,9 @@
+       ar cr ../bin/gcc/libgpac_static.a $(OBJS)
+       ranlib ../bin/gcc/libgpac_static.a
+       $(CC) $(SHFLAGS) $(LD_SONAME) $(LDFLAGS) -o ../bin/gcc/$@ $(OBJSPIC) $(EXTRALIBS)
++ifeq (,$(findstring yes, $(CONFIG_DARWIN) $(CONFIG_WIN32)))
++      ln -sf $@ ../bin/gcc/libgpac.so
++endif
  
--LD_SONAME="-Wl,-soname,$(LIB)"
-+LD_SONAME="-Wl,-soname,libgpac.so.0.4.5"
- ifeq ($(CONFIG_DARWIN), yes)
- LD_SONAME=""
- endif
+ dep: depend
+ 
+@@ -222,6 +225,7 @@
+ clean: 
+       rm -f $(OBJS) $(LIB)
+       rm -rf ../bin/gcc/libgpac_static.a
++      rm -rf ../bin/gcc/libgpac.so
+ 
+ distclean: clean
+       rm -f Makefile.bak .depend

diff --git a/debian/rules b/debian/rules
index 8b914f5fbe24d8d81854f16c6d814c2ae5d1d0e6..a6b9d824c41eac42b949200b5d7d532a6f676b7e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -63,12 +63,6 @@ install: build
 
        $(MAKE) install-lib prefix=$(CURDIR)/debian/tmp/usr
 
-       mv debian/tmp/usr/lib/libgpac-0.4.5.so \
-       debian/tmp/usr/lib/libgpac.so.0.4.5
-
-       rm debian/tmp/usr/lib/libgpac.so
-       dh_link -plibgpac-dev usr/lib/libgpac.so.0.4.5 usr/lib/libgpac.so
-
        dh_install --fail-missing
 
 # Build architecture-independent files here.